diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt index e98b1ebcc442..3cbf074b2450 100644 --- a/cpp/src/parquet/CMakeLists.txt +++ b/cpp/src/parquet/CMakeLists.txt @@ -238,7 +238,7 @@ endif() if(PARQUET_REQUIRE_ENCRYPTION) list(APPEND PARQUET_SHARED_PRIVATE_LINK_LIBS ${ARROW_OPENSSL_LIBS}) - set(PARQUET_SRCS ${PARQUET_SRCS} encryption/encryption_internal.cc + set(PARQUET_SRCS ${PARQUET_SRCS} encryption/aes_encryption.cc encryption/encryption_utils.cc encryption/openssl_internal.cc) # Encryption key management @@ -255,7 +255,7 @@ if(PARQUET_REQUIRE_ENCRYPTION) encryption/key_toolkit_internal.cc encryption/local_wrap_kms_client.cc) else() - set(PARQUET_SRCS ${PARQUET_SRCS} encryption/encryption_internal_nossl.cc) + set(PARQUET_SRCS ${PARQUET_SRCS} encryption/aes_encryption_nossl.cc) endif() if(NOT PARQUET_MINIMAL_DEPENDENCY) @@ -410,7 +410,7 @@ add_parquet_test(arrow-internals-test SOURCES arrow/path_internal_test.cc if(PARQUET_REQUIRE_ENCRYPTION) add_parquet_test(encryption-test SOURCES - encryption/encryption_internal_test.cc + encryption/aes_encryption_test.cc encryption/write_configurations_test.cc encryption/read_configurations_test.cc encryption/properties_test.cc diff --git a/cpp/src/parquet/encryption/encryption_internal.cc b/cpp/src/parquet/encryption/aes_encryption.cc similarity index 99% rename from cpp/src/parquet/encryption/encryption_internal.cc rename to cpp/src/parquet/encryption/aes_encryption.cc index 364c8ce60d9b..91d4e8f65354 100644 --- a/cpp/src/parquet/encryption/encryption_internal.cc +++ b/cpp/src/parquet/encryption/aes_encryption.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/encryption_internal.h" +#include "parquet/encryption/aes_encryption.h" #include #include diff --git a/cpp/src/parquet/encryption/encryption_internal.h b/cpp/src/parquet/encryption/aes_encryption.h similarity index 98% rename from cpp/src/parquet/encryption/encryption_internal.h rename to cpp/src/parquet/encryption/aes_encryption.h index b804e0a6351b..31d131f4ddd3 100644 --- a/cpp/src/parquet/encryption/encryption_internal.h +++ b/cpp/src/parquet/encryption/aes_encryption.h @@ -18,11 +18,8 @@ #pragma once #include -#include -#include #include "arrow/util/span.h" -#include "parquet/properties.h" #include "parquet/types.h" using parquet::ParquetCipher; diff --git a/cpp/src/parquet/encryption/encryption_internal_nossl.cc b/cpp/src/parquet/encryption/aes_encryption_nossl.cc similarity index 98% rename from cpp/src/parquet/encryption/encryption_internal_nossl.cc rename to cpp/src/parquet/encryption/aes_encryption_nossl.cc index 2448d9efa9a0..00265f0695c5 100644 --- a/cpp/src/parquet/encryption/encryption_internal_nossl.cc +++ b/cpp/src/parquet/encryption/aes_encryption_nossl.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/encryption_internal.h" +#include "parquet/encryption/aes_encryption.h" #include "parquet/exception.h" namespace parquet::encryption { diff --git a/cpp/src/parquet/encryption/encryption_internal_test.cc b/cpp/src/parquet/encryption/aes_encryption_test.cc similarity index 98% rename from cpp/src/parquet/encryption/encryption_internal_test.cc rename to cpp/src/parquet/encryption/aes_encryption_test.cc index bf6607e32877..cfc638581d69 100644 --- a/cpp/src/parquet/encryption/encryption_internal_test.cc +++ b/cpp/src/parquet/encryption/aes_encryption_test.cc @@ -17,7 +17,8 @@ #include -#include "parquet/encryption/encryption_internal.h" +#include "parquet/encryption/aes_encryption.h" +#include "parquet/encryption/encryption.h" namespace parquet::encryption::test { diff --git a/cpp/src/parquet/encryption/internal_file_decryptor.cc b/cpp/src/parquet/encryption/internal_file_decryptor.cc index c0e7a02961d1..417e3905e1eb 100644 --- a/cpp/src/parquet/encryption/internal_file_decryptor.cc +++ b/cpp/src/parquet/encryption/internal_file_decryptor.cc @@ -18,8 +18,8 @@ #include "parquet/encryption/internal_file_decryptor.h" #include "arrow/util/logging.h" +#include "parquet/encryption/aes_encryption.h" #include "parquet/encryption/encryption.h" -#include "parquet/encryption/encryption_internal.h" #include "parquet/encryption/encryption_utils.h" #include "parquet/metadata.h" diff --git a/cpp/src/parquet/encryption/internal_file_encryptor.cc b/cpp/src/parquet/encryption/internal_file_encryptor.cc index 3c6be3f2f7c4..3afe4973ccd6 100644 --- a/cpp/src/parquet/encryption/internal_file_encryptor.cc +++ b/cpp/src/parquet/encryption/internal_file_encryptor.cc @@ -16,8 +16,9 @@ // under the License. #include "parquet/encryption/internal_file_encryptor.h" + +#include "parquet/encryption/aes_encryption.h" #include "parquet/encryption/encryption.h" -#include "parquet/encryption/encryption_internal.h" #include "parquet/encryption/encryption_utils.h" namespace parquet { diff --git a/cpp/src/parquet/encryption/internal_file_encryptor.h b/cpp/src/parquet/encryption/internal_file_encryptor.h index 6505c353bd3b..01392a6e70cf 100644 --- a/cpp/src/parquet/encryption/internal_file_encryptor.h +++ b/cpp/src/parquet/encryption/internal_file_encryptor.h @@ -21,8 +21,8 @@ #include #include +#include "parquet/encryption/aes_encryption.h" #include "parquet/encryption/encryption.h" -#include "parquet/encryption/encryption_internal.h" #include "parquet/metadata.h" namespace parquet { diff --git a/cpp/src/parquet/encryption/key_toolkit_internal.cc b/cpp/src/parquet/encryption/key_toolkit_internal.cc index 89a52a2bcd63..7b068ab8f6ab 100644 --- a/cpp/src/parquet/encryption/key_toolkit_internal.cc +++ b/cpp/src/parquet/encryption/key_toolkit_internal.cc @@ -17,7 +17,8 @@ #include "arrow/util/base64.h" -#include "parquet/encryption/encryption_internal.h" +#include "parquet/encryption/encryption.h" +#include "parquet/encryption/aes_encryption.h" #include "parquet/encryption/key_toolkit_internal.h" namespace parquet::encryption::internal { diff --git a/cpp/src/parquet/metadata.cc b/cpp/src/parquet/metadata.cc index 4556671f47ec..b219c1eb3d0a 100644 --- a/cpp/src/parquet/metadata.cc +++ b/cpp/src/parquet/metadata.cc @@ -32,7 +32,7 @@ #include "arrow/util/key_value_metadata.h" #include "arrow/util/logging_internal.h" #include "arrow/util/pcg_random.h" -#include "parquet/encryption/encryption_internal.h" +#include "parquet/encryption/aes_encryption.h" #include "parquet/encryption/encryption_utils.h" #include "parquet/encryption/internal_file_decryptor.h" #include "parquet/exception.h"