From 6dab5941b72774f7a4cd0997d84d8a9818503ca6 Mon Sep 17 00:00:00 2001 From: mwish Date: Fri, 22 Mar 2024 13:34:53 +0800 Subject: [PATCH] change another null to NULLPTR and nullptr --- cpp/src/parquet/encryption/key_toolkit.cc | 2 +- cpp/src/parquet/encryption/kms_client.cc | 2 +- cpp/src/parquet/encryption/kms_client.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/src/parquet/encryption/key_toolkit.cc b/cpp/src/parquet/encryption/key_toolkit.cc index cb488d3fa23a0..81e102126d14a 100644 --- a/cpp/src/parquet/encryption/key_toolkit.cc +++ b/cpp/src/parquet/encryption/key_toolkit.cc @@ -31,7 +31,7 @@ namespace parquet::encryption { std::shared_ptr KeyToolkit::GetKmsClient( const KmsConnectionConfig& kms_connection_config, double cache_entry_lifetime_ms) { - if (kms_client_factory_ == NULL) { + if (kms_client_factory_ == nullptr) { throw ParquetException("No KmsClientFactory is registered."); } auto kms_client_per_kms_instance_cache = diff --git a/cpp/src/parquet/encryption/kms_client.cc b/cpp/src/parquet/encryption/kms_client.cc index fee03dd3db656..0ce41da177b6b 100644 --- a/cpp/src/parquet/encryption/kms_client.cc +++ b/cpp/src/parquet/encryption/kms_client.cc @@ -34,7 +34,7 @@ void KmsConnectionConfig::SetDefaultIfEmpty() { if (kms_instance_url.empty()) { kms_instance_url = KmsClient::kKmsInstanceUrlDefault; } - if (refreshable_key_access_token == NULL) { + if (refreshable_key_access_token == nullptr) { refreshable_key_access_token = std::make_shared(); } } diff --git a/cpp/src/parquet/encryption/kms_client.h b/cpp/src/parquet/encryption/kms_client.h index a55fd552eed5f..ef363d9c2cda1 100644 --- a/cpp/src/parquet/encryption/kms_client.h +++ b/cpp/src/parquet/encryption/kms_client.h @@ -63,7 +63,7 @@ struct PARQUET_EXPORT KmsConnectionConfig { KmsConnectionConfig(); const std::string& key_access_token() const { - if (refreshable_key_access_token == NULL || + if (refreshable_key_access_token == NULLPTR || refreshable_key_access_token->value().empty()) { throw ParquetException("key access token is not set!"); }