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

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new f7fe95db97 Extend POSSIBLE_QUERY_OPTIONS in PinotConnection to all 
query level options (#15281)
f7fe95db97 is described below

commit f7fe95db97e8162c8be3894c88b79a9557d33527
Author: Rajeshbabu Chintaguntla <[email protected]>
AuthorDate: Tue Apr 8 06:08:38 2025 +0530

    Extend POSSIBLE_QUERY_OPTIONS in PinotConnection to all query level options 
(#15281)
---
 .../org/apache/pinot/client/PinotConnection.java   | 14 +++----
 .../apache/pinot/client/PinotConnectionTest.java   | 49 ++++++++++++++++++++++
 .../common/utils/config/QueryOptionsUtils.java     |  8 ++++
 3 files changed, 62 insertions(+), 9 deletions(-)

diff --git 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
index 48d719babb..54b66f92de 100644
--- 
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
+++ 
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/PinotConnection.java
@@ -32,15 +32,11 @@ import 
org.apache.pinot.client.controller.PinotControllerTransport;
 import org.apache.pinot.client.controller.PinotControllerTransportFactory;
 import 
org.apache.pinot.client.controller.response.ControllerTenantBrokerResponse;
 import org.apache.pinot.client.utils.DriverUtils;
-import 
org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
+import org.apache.pinot.common.utils.config.QueryOptionsUtils;
 
 
 public class PinotConnection extends AbstractBaseConnection {
 
-  protected static final String[] POSSIBLE_QUERY_OPTIONS = {
-    QueryOptionKey.ENABLE_NULL_HANDLING,
-    QueryOptionKey.USE_MULTISTAGE_ENGINE
-  };
   private org.apache.pinot.client.Connection _session;
   private boolean _closed;
   private String _controllerURL;
@@ -71,10 +67,10 @@ public class PinotConnection extends AbstractBaseConnection 
{
     }
     _session = new org.apache.pinot.client.Connection(properties, brokers, 
transport);
 
-    for (String possibleQueryOption: POSSIBLE_QUERY_OPTIONS) {
-      Object property = properties.getProperty(possibleQueryOption);
-      if (property != null) {
-        _queryOptions.put(possibleQueryOption, 
DriverUtils.parseOptionValue(property));
+    for (Map.Entry<Object, Object> property : properties.entrySet()) {
+      String configKey = 
QueryOptionsUtils.resolveCaseInsensitiveKey(property.getKey());
+      if (configKey != null) {
+        _queryOptions.put(configKey, 
DriverUtils.parseOptionValue(property.getValue()));
       }
     }
   }
diff --git 
a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotConnectionTest.java
 
b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotConnectionTest.java
index 5fd2b3ab62..e19e754713 100644
--- 
a/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotConnectionTest.java
+++ 
b/pinot-clients/pinot-jdbc-client/src/test/java/org/apache/pinot/client/PinotConnectionTest.java
@@ -20,6 +20,9 @@ package org.apache.pinot.client;
 
 import java.sql.DatabaseMetaData;
 import java.sql.Statement;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.pinot.spi.utils.CommonConstants;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -96,4 +99,50 @@ public class PinotConnectionTest {
     Statement statement = pinotConnection.createStatement();
     Assert.assertNotNull(statement);
   }
+
+  @Test
+  public void testValidQueryOptions() {
+    Properties props = new Properties();
+    
props.put(CommonConstants.Broker.Request.QueryOptionKey.ENABLE_NULL_HANDLING, 
"true");
+    
props.put(CommonConstants.Broker.Request.QueryOptionKey.USE_MULTISTAGE_ENGINE, 
"true");
+    props.put(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS, 3000);
+    
props.put(CommonConstants.Broker.Request.QueryOptionKey.MAX_EXECUTION_THREADS, 
20);
+    PinotConnection pinotConnection =
+            new PinotConnection(props, "dummy", _dummyPinotClientTransport, 
"dummy",
+                    _dummyPinotControllerTransport);
+    Map<String, Object> queryOptions = pinotConnection.getQueryOptions();
+    Assert.assertEquals(queryOptions.size(), 4);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.ENABLE_NULL_HANDLING),
 true);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.USE_MULTISTAGE_ENGINE),
 true);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS),
 3000);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.MAX_EXECUTION_THREADS),
 20);
+  }
+
+  @Test
+  public void testInvalidQueryOptions() {
+    Properties props = new Properties();
+    props.put("unknown", "true");
+    PinotConnection pinotConnection =
+            new PinotConnection(props, "dummy", _dummyPinotClientTransport, 
"dummy",
+                    _dummyPinotControllerTransport);
+    Map<String, Object> queryOptions = pinotConnection.getQueryOptions();
+    Assert.assertEquals(queryOptions.size(), 0);
+  }
+
+  @Test
+  public void testSomeInvalidSomeValidQueryOptions() {
+    Properties props = new Properties();
+    props.put("unknown", "true");
+    // lower case of property name also should considered as wrong query 
option.
+    props.put("enablenullhandling", "true");
+    props.put(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS, 5000);
+    
props.put(CommonConstants.Broker.Request.QueryOptionKey.MAX_EXECUTION_THREADS, 
30);
+    PinotConnection pinotConnection =
+            new PinotConnection(props, "dummy", _dummyPinotClientTransport, 
"dummy",
+                    _dummyPinotControllerTransport);
+    Map<String, Object> queryOptions = pinotConnection.getQueryOptions();
+    Assert.assertEquals(queryOptions.size(), 3);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.TIMEOUT_MS),
 5000);
+    
Assert.assertEquals(queryOptions.get(CommonConstants.Broker.Request.QueryOptionKey.MAX_EXECUTION_THREADS),
 30);
+  }
 }
diff --git 
a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
 
b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
index 846bbf5d0c..622dff1b8f 100644
--- 
a/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
+++ 
b/pinot-common/src/main/java/org/apache/pinot/common/utils/config/QueryOptionsUtils.java
@@ -95,6 +95,14 @@ public class QueryOptionsUtils {
     return resolved;
   }
 
+  @Nullable
+  public static String resolveCaseInsensitiveKey(Object property) {
+    if (property instanceof String) {
+      return CONFIG_RESOLVER.get(((String) property).toLowerCase());
+    }
+    return null;
+  }
+
   @Nullable
   public static Long getTimeoutMs(Map<String, String> queryOptions) {
     String timeoutMsString = queryOptions.get(QueryOptionKey.TIMEOUT_MS);


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to