[arrow] branch main updated: GH-38346: [C++][Parquet] Use new encrypted files for page index encryption test (#38347)

[maplefu]

This is an automated email from the ASF dual-hosted git repository.

maplefu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new e8360615ad GH-38346: [C++][Parquet] Use new encrypted files for page 
index encryption test (#38347)
e8360615ad is described below

commit e8360615adf6c5a9bb76b81267d08388c7cfc3a9
Author: Gang Wu <ust...@gmail.com>
AuthorDate: Thu Oct 26 03:50:29 2023 +0800

    GH-38346: [C++][Parquet] Use new encrypted files for page index encryption 
test (#38347)
    
    ### Rationale for this change
    
    Encrypted parquet files have been updated to apache/parquet-testing repo. 
We can use the new files to verify encrypted page index.
    
    ### What changes are included in this PR?
    
    Minor refactor read_configurations_test.cc to check page index from all 
parquet files.
    
    ### Are these changes tested?
    
    This is indeed a unit test enhancement.
    
    ### Are there any user-facing changes?
    
    NO.
    * Closes: #38346
    
    Authored-by: Gang Wu <ust...@gmail.com>
    Signed-off-by: mwish <maplewish...@gmail.com>
---
 .../parquet/encryption/read_configurations_test.cc | 24 ++++++++--------------
 cpp/submodules/parquet-testing                     |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/cpp/src/parquet/encryption/read_configurations_test.cc 
b/cpp/src/parquet/encryption/read_configurations_test.cc
index 695696db29..94fb636226 100644
--- a/cpp/src/parquet/encryption/read_configurations_test.cc
+++ b/cpp/src/parquet/encryption/read_configurations_test.cc
@@ -203,17 +203,15 @@ class TestDecryptionConfiguration
 
   // Check that the decryption result is as expected.
   void CheckResults(const std::string& file_name, unsigned 
decryption_config_num,
-                    unsigned encryption_config_num, bool file_has_page_index) {
+                    unsigned encryption_config_num) {
     // Encryption_configuration number five contains aad_prefix and
     // disable_aad_prefix_storage.
     // An exception is expected to be thrown if the file is not decrypted with 
aad_prefix.
     if (encryption_config_num == 5) {
       if (decryption_config_num == 1 || decryption_config_num == 3) {
         EXPECT_THROW(DecryptFile(file_name, decryption_config_num - 1), 
ParquetException);
-        if (file_has_page_index) {
-          EXPECT_THROW(DecryptPageIndex(file_name, decryption_config_num - 1),
-                       ParquetException);
-        }
+        EXPECT_THROW(DecryptPageIndex(file_name, decryption_config_num - 1),
+                     ParquetException);
         return;
       }
     }
@@ -222,10 +220,8 @@ class TestDecryptionConfiguration
     if (decryption_config_num == 2) {
       if (encryption_config_num != 5 && encryption_config_num != 4) {
         EXPECT_THROW(DecryptFile(file_name, decryption_config_num - 1), 
ParquetException);
-        if (file_has_page_index) {
-          EXPECT_THROW(DecryptPageIndex(file_name, decryption_config_num - 1),
-                       ParquetException);
-        }
+        EXPECT_THROW(DecryptPageIndex(file_name, decryption_config_num - 1),
+                     ParquetException);
         return;
       }
     }
@@ -235,9 +231,7 @@ class TestDecryptionConfiguration
       return;
     }
     EXPECT_NO_THROW(DecryptFile(file_name, decryption_config_num - 1));
-    if (file_has_page_index) {
-      EXPECT_NO_THROW(DecryptPageIndex(file_name, decryption_config_num - 1));
-    }
+    EXPECT_NO_THROW(DecryptPageIndex(file_name, decryption_config_num - 1));
   }
 
   // Returns true if file exists. Otherwise returns false.
@@ -269,8 +263,7 @@ TEST_P(TestDecryptionConfiguration, TestDecryption) {
   // parquet file.
   for (unsigned index = 0; index < 
vector_of_decryption_configurations_.size(); ++index) {
     unsigned decryption_config_num = index + 1;
-    CheckResults(file_name, decryption_config_num, encryption_config_num,
-                 /*file_has_page_index=*/true);
+    CheckResults(file_name, decryption_config_num, encryption_config_num);
   }
   // Delete temporary test file.
   ASSERT_EQ(std::remove(file_name.c_str()), 0);
@@ -288,8 +281,7 @@ TEST_P(TestDecryptionConfiguration, TestDecryption) {
   // parquet file.
   for (unsigned index = 0; index < 
vector_of_decryption_configurations_.size(); ++index) {
     unsigned decryption_config_num = index + 1;
-    CheckResults(file_name, decryption_config_num, encryption_config_num,
-                 /*file_has_page_index=*/false);
+    CheckResults(file_name, decryption_config_num, encryption_config_num);
   }
 }
 
diff --git a/cpp/submodules/parquet-testing b/cpp/submodules/parquet-testing
index b2e7cc7551..e45cd23f78 160000
--- a/cpp/submodules/parquet-testing
+++ b/cpp/submodules/parquet-testing
@@ -1 +1 @@
-Subproject commit b2e7cc755159196e3a068c8594f7acbaecfdaaac
+Subproject commit e45cd23f784aab3d6bf0701f8f4e621469ed3be7