bump version to 25.3.21 (#69)

Author: liujoey

httpproxy/cloudsim/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.oracle.nosql</groupId>
     <artifactId>proxy</artifactId>
-    <version>25.1.13</version>
+    <version>25.3.21</version>
   </parent>
 
   <artifactId>cloudsim</artifactId>

httpproxy/cloudsim/src/main/java/oracle/nosql/cloudsim/CloudSim.java

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This file was distributed by Oracle as part of a version of Oracle NoSQL
  * Database made available at:

httpproxy/httpproxy/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.oracle.nosql</groupId>
     <artifactId>proxy</artifactId>
-    <version>25.1.13</version>
+    <version>25.3.21</version>
   </parent>
 
   <artifactId>httpproxy</artifactId>

httpproxy/httpproxy/src/main/java/oracle/nosql/proxy/Config.java

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved.
  *
  * This file was distributed by Oracle as part of a version of Oracle NoSQL
  * Database made available at:
@@ -97,6 +97,17 @@ enum ParamContext {CLOUD, ON_PREM, ALL, HIDDEN}
         new ParamDef("httpPort", "80", ParamType.INT, ParamContext.ALL);
     public static ParamDef HTTPS_PORT =
         new ParamDef("httpsPort", "443", ParamType.INT, ParamContext.ALL);
+
+    /*
+     * This is used to size the number of Netty threads used to handle incoming
+     * requests from the network. If REQUEST_THREAD_POOL_SIZE is 0 these threads
+     * will also be used to handle the requests through sending the request
+     * to KV. In this case the number should be relatively high in order to
+     * keep up with traffic. If REQUEST_THREAD_POOL_SIZE is non-zero
+     * requests are handled using a separate pool. If that is the case this
+     * number can be smaller. If 0 Netty defaults to 2 * nCPUs (maybe 3x,
+     * depending on netty release)
+     */
     public static ParamDef NUM_REQUEST_THREADS =
         new ParamDef("numRequestThreads", "32", ParamType.INT,
                      ParamContext.ALL);
@@ -107,6 +118,20 @@ enum ParamContext {CLOUD, ON_PREM, ALL, HIDDEN}
     public static ParamDef MONITOR_STATS_ENABLED =
         new ParamDef("monitorStatsEnabled", "false",
                      ParamType.BOOL, ParamContext.ALL);
+    /*
+     * Set to non-zero to use a thread pool separate from Netty for handling
+     * requests. The pool is sized based on this parameter
+     */
+    public static ParamDef REQUEST_THREAD_POOL_SIZE =
+        new ParamDef("requestThreadPoolSize", "0", ParamType.INT, ParamContext.ALL);
+    /*
+     * Set to non-zero to use a thread pool to handle async responses from
+     * KV client calls rather than using the KV threads themselves. This
+     * parameter is only used if ASYNC is true
+     */
+    public static ParamDef KV_THREAD_POOL_SIZE =
+        new ParamDef("kvThreadPoolSize", "0",
+                     ParamType.INT, ParamContext.ALL);
 
     /**  Wallet file that holds the salt value for the query cache */
     public static ParamDef SALT_WALLET =
@@ -300,6 +325,7 @@ enum ParamContext {CLOUD, ON_PREM, ALL, HIDDEN}
      *  errorCacheSize: Maximum number of unique IP addresses to track
      *  error rates for.
      */
+    @Deprecated
     public static ParamDef ERROR_CACHE_SIZE =
             new ParamDef("errorCacheSize", "10000",
                          ParamType.INT, ParamContext.CLOUD);
@@ -407,6 +433,14 @@ enum ParamContext {CLOUD, ON_PREM, ALL, HIDDEN}
             new ParamDef("childTableEnabled", "true",
                          ParamType.BOOL, ParamContext.CLOUD);
 
+    /**
+     * Cloud only: true if enabled customer managed encryption key(CMEK), it is
+     * disabled by default.
+     */
+    public static ParamDef CMEK_ENABLED =
+            new ParamDef("cmekEnabled", "false",
+                         ParamType.BOOL, ParamContext.CLOUD);
+
     /* ------- End params ---------*/
 
     /*
@@ -810,7 +844,6 @@ public void setNumRequestThreads(int numRequestThreads) {
                               Integer.toString(numRequestThreads));
     }
 
-
     public int getNumAcceptThreads() {
         return getInt(NUM_ACCEPT_THREADS);
     }
@@ -820,6 +853,24 @@ public void setNumAcceptThreads(int numThreads) {
                               Integer.toString(numThreads));
     }
 
+    public int getRequestThreadPoolSize() {
+        return getInt(REQUEST_THREAD_POOL_SIZE);
+    }
+
+    public void setRequestThreadPoolSize(int size) {
+        paramVals.setProperty(REQUEST_THREAD_POOL_SIZE.paramName,
+                              Integer.toString(size));
+    }
+
+    public int getKVThreadPoolSize() {
+        return getInt(KV_THREAD_POOL_SIZE);
+    }
+
+    public void setKVThreadPoolSize(int size) {
+        paramVals.setProperty(KV_THREAD_POOL_SIZE.paramName,
+                              Integer.toString(size));
+    }
+
     public String getHostname() {
         return paramVals.getProperty(HOSTNAME.paramName);
     }
@@ -1024,10 +1075,6 @@ public int getErrorCreditMs() {
         return getInt(ERROR_CREDIT_MS);
     }
 
-    public int getErrorCacheSize() {
-        return getInt(ERROR_CACHE_SIZE);
-    }
-
     public int getErrorCacheLifetimeMs() {
         return getInt(ERROR_CACHE_LIFETIME_MS);
     }
@@ -1080,6 +1127,10 @@ public int getTableCacheCheckIntervalSec() {
         return getInt(TABLE_CACHE_CHECK_INTERVAL_SEC);
     }
 
+    public boolean isCmekEnabled() {
+        return getBool(CMEK_ENABLED);
+    }
+
     /* Helpers to convert a String property value to a type */
     private boolean getBool(ParamDef def) {
         String val = paramVals.getProperty(def.paramName, def.defaultVal);
@@ -1168,7 +1219,8 @@ KVStoreConfig makeTemplateKVStoreConfig() {
          */
         int requestLimit = getInt(KV_REQUEST_LIMIT);
         if (requestLimit < 0 || getAsync() == false) {
-            requestLimit = getNumRequestThreads();
+            requestLimit = Math.max(getNumRequestThreads(),
+                                    getRequestThreadPoolSize());
         }
         if (requestLimit > RequestLimitConfig.DEFAULT_MAX_ACTIVE_REQUESTS) {
             kvConfig.setRequestLimit(