@@ -29,37 +29,36 @@ FileKeyUnwrapper::FileKeyUnwrapper(
2929 const KmsConnectionConfig& kms_connection_config, double cache_lifetime_seconds,
3030 const std::string& file_path,
3131 const std::shared_ptr<::arrow::fs::FileSystem>& file_system)
32- : key_toolkit_owner_(std::move(key_toolkit)),
33- key_toolkit_ (key_toolkit_owner_.get()),
34- kms_connection_config_(kms_connection_config),
35- cache_entry_lifetime_seconds_(cache_lifetime_seconds),
36- file_path_(file_path),
37- file_system_(file_system) {
38- kek_per_kek_id_ = key_toolkit_->kek_read_cache_per_token ().GetOrCreateInternalCache (
39- kms_connection_config.key_access_token (), cache_entry_lifetime_seconds_);
40- }
32+ : FileKeyUnwrapper(std::move(key_toolkit), /* key_toolkit=*/ nullptr ,
33+ kms_connection_config, cache_lifetime_seconds, file_path,
34+ file_system) {}
4135
4236FileKeyUnwrapper::FileKeyUnwrapper (
4337 KeyToolkit* key_toolkit, const KmsConnectionConfig& kms_connection_config,
4438 double cache_lifetime_seconds, const std::string& file_path,
4539 const std::shared_ptr<::arrow::fs::FileSystem>& file_system)
46- : key_toolkit_(key_toolkit),
47- kms_connection_config_(kms_connection_config),
48- cache_entry_lifetime_seconds_(cache_lifetime_seconds),
49- file_path_(file_path),
50- file_system_(file_system) {
51- kek_per_kek_id_ = key_toolkit_->kek_read_cache_per_token ().GetOrCreateInternalCache (
52- kms_connection_config.key_access_token (), cache_entry_lifetime_seconds_);
53- }
40+ : FileKeyUnwrapper(/* key_toolkit_owner=*/ nullptr , key_toolkit, kms_connection_config,
41+ cache_lifetime_seconds, file_path, file_system) {}
5442
5543FileKeyUnwrapper::FileKeyUnwrapper (
5644 KeyToolkit* key_toolkit, const KmsConnectionConfig& kms_connection_config,
5745 double cache_lifetime_seconds,
5846 std::shared_ptr<FileKeyMaterialStore> key_material_store)
59- : key_toolkit_(key_toolkit),
47+ : FileKeyUnwrapper(/* key_toolkit_owner=*/ nullptr , key_toolkit, kms_connection_config,
48+ cache_lifetime_seconds, /* file_path=*/ " " ,
49+ /* file_system=*/ nullptr ) {}
50+
51+ FileKeyUnwrapper::FileKeyUnwrapper (
52+ std::shared_ptr<KeyToolkit> key_toolkit_owner, KeyToolkit* key_toolkit,
53+ const KmsConnectionConfig& kms_connection_config, double cache_lifetime_seconds,
54+ const std::string& file_path,
55+ const std::shared_ptr<::arrow::fs::FileSystem>& file_system)
56+ : key_toolkit_owner_(std::move(key_toolkit_owner)),
57+ key_toolkit_ (key_toolkit ? key_toolkit : key_toolkit_owner_.get()),
6058 kms_connection_config_(kms_connection_config),
6159 cache_entry_lifetime_seconds_(cache_lifetime_seconds),
62- key_material_store_(std::move(key_material_store)) {
60+ file_path_(file_path),
61+ file_system_(file_system) {
6362 kek_per_kek_id_ = key_toolkit_->kek_read_cache_per_token ().GetOrCreateInternalCache (
6463 kms_connection_config.key_access_token (), cache_entry_lifetime_seconds_);
6564}
0 commit comments