(parquet-mr) branch master updated: PARQUET-2401: Synchronize on final fields (#1224)

[fokko]

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

fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git


The following commit(s) were added to refs/heads/master by this push:
     new 44fa76b0b PARQUET-2401: Synchronize on final fields (#1224)
44fa76b0b is described below

commit 44fa76b0b3732326e42c41887b6e39ac600d00ff
Author: Atour <28668597+amousavigour...@users.noreply.github.com>
AuthorDate: Mon Dec 4 12:03:02 2023 +0100

    PARQUET-2401: Synchronize on final fields (#1224)
---
 .../src/main/java/org/apache/parquet/crypto/keytools/KeyToolkit.java    | 2 +-
 .../java/org/apache/parquet/crypto/TestPropertiesDrivenEncryption.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/parquet-hadoop/src/main/java/org/apache/parquet/crypto/keytools/KeyToolkit.java
 
b/parquet-hadoop/src/main/java/org/apache/parquet/crypto/keytools/KeyToolkit.java
index 16ef1a7b4..c53b65afb 100644
--- 
a/parquet-hadoop/src/main/java/org/apache/parquet/crypto/keytools/KeyToolkit.java
+++ 
b/parquet-hadoop/src/main/java/org/apache/parquet/crypto/keytools/KeyToolkit.java
@@ -90,7 +90,7 @@ public class KeyToolkit {
   public static final int KEK_LENGTH_DEFAULT = 128;
 
   private static long lastCacheCleanForKeyRotationTime = 0;
-  private static Object lastCacheCleanForKeyRotationTimeLock = new Object();
+  private static final Object lastCacheCleanForKeyRotationTimeLock = new 
Object();
   // KMS servers typically allow to run key rotation once in a few hours / a 
day.
   // We clean KEK writer cache (if needed) after 1 hour
   private static final int CACHE_CLEAN_PERIOD_FOR_KEY_ROTATION = 60 * 60 * 
1000; // 1 hour
diff --git 
a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/TestPropertiesDrivenEncryption.java
 
b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/TestPropertiesDrivenEncryption.java
index e396e6943..700cf4b4c 100644
--- 
a/parquet-hadoop/src/test/java/org/apache/parquet/crypto/TestPropertiesDrivenEncryption.java
+++ 
b/parquet-hadoop/src/test/java/org/apache/parquet/crypto/TestPropertiesDrivenEncryption.java
@@ -158,7 +158,7 @@ public class TestPropertiesDrivenEncryption {
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   @Rule
-  public ErrorCollector errorCollector = new ErrorCollector();
+  public final ErrorCollector errorCollector = new ErrorCollector();
 
   private static final Base64.Encoder encoder = Base64.getEncoder();
   private static final String FOOTER_MASTER_KEY =