Skip to content

Commit 7547c79

Browse files
committed
Refactor constructors
1 parent 387e1f2 commit 7547c79

2 files changed

Lines changed: 24 additions & 20 deletions

File tree

‎cpp/src/parquet/encryption/file_key_unwrapper.cc‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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

4236
FileKeyUnwrapper::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

5543
FileKeyUnwrapper::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
}

‎cpp/src/parquet/encryption/file_key_unwrapper.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,17 @@ class PARQUET_EXPORT FileKeyUnwrapper : public DecryptionKeyRetriever {
7171
KeyWithMasterId GetDataEncryptionKey(const KeyMaterial& key_material);
7272

7373
private:
74+
FileKeyUnwrapper(std::shared_ptr<KeyToolkit> key_toolkit_owner, KeyToolkit* key_toolkit,
75+
const KmsConnectionConfig& kms_connection_config,
76+
double cache_lifetime_seconds, const std::string& file_path,
77+
const std::shared_ptr<::arrow::fs::FileSystem>& file_system);
78+
7479
std::shared_ptr<KmsClient> GetKmsClientFromConfigOrKeyMaterial(
7580
const KeyMaterial& key_material);
7681

7782
/// A map of Key Encryption Key (KEK) ID -> KEK bytes, for the current token
7883
std::shared_ptr<::arrow::util::ConcurrentMap<std::string, std::string>> kek_per_kek_id_;
79-
std::shared_ptr<KeyToolkit> key_toolkit_owner_ = NULLPTR;
84+
std::shared_ptr<KeyToolkit> key_toolkit_owner_;
8085
KeyToolkit* key_toolkit_;
8186
KmsConnectionConfig kms_connection_config_;
8287
const double cache_entry_lifetime_seconds_;

0 commit comments

Comments
 (0)