[incubator-pinot] branch master updated: Query options in quickstart (#7042)

[nehapawar]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 214a2c0  Query options in quickstart (#7042)
214a2c0 is described below

commit 214a2c019bb61e6f072691c145aaafd36ecf33a5
Author: Neha Pawar <neha.pawa...@gmail.com>
AuthorDate: Thu Jun 10 14:06:24 2021 -0700

    Query options in quickstart (#7042)
---
 .../src/main/java/org/apache/pinot/tools/Quickstart.java       |  9 ++++++++-
 .../org/apache/pinot/tools/admin/command/QuickstartRunner.java | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java 
b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
index 4907d79..4b7b5d8 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/Quickstart.java
@@ -63,6 +63,13 @@ public class Quickstart extends QuickStartBase {
     return null;
   }
 
+  /**
+   * Set query options which will be appended to end of the query e.g. 
option(timeoutMs=60000)
+   */
+  public String getQueryOptions() {
+    return null;
+  }
+
   public static void printStatus(Color color, String message) {
     System.out.println(color._code + message + Color.RESET._code);
   }
@@ -181,7 +188,7 @@ public class Quickstart extends QuickStartBase {
     QuickstartTableRequest request = new 
QuickstartTableRequest(baseDir.getAbsolutePath());
     QuickstartRunner runner =
         new QuickstartRunner(Lists.newArrayList(request), 1, 1, 1, 
getNumMinions(), dataDir, true, getAuthToken(),
-            getConfigOverrides());
+            getConfigOverrides(), getQueryOptions());
 
     printStatus(Color.CYAN, "***** Starting Zookeeper, controller, broker and 
server *****");
     runner.startAll();
diff --git 
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
 
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
index 8d60244..c0ac5e4 100644
--- 
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
+++ 
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/QuickstartRunner.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pinot.spi.config.table.TableType;
 import org.apache.pinot.spi.config.tenant.TenantRole;
 import org.apache.pinot.spi.env.PinotConfiguration;
@@ -75,6 +76,7 @@ public class QuickstartRunner {
   private final boolean _enableTenantIsolation;
   private final String _authToken;
   private final Map<String, Object> _configOverrides;
+  private final String _queryOptions;
 
   private final List<Integer> _controllerPorts = new ArrayList<>();
   private final List<Integer> _brokerPorts = new ArrayList<>();
@@ -82,7 +84,7 @@ public class QuickstartRunner {
 
   public QuickstartRunner(List<QuickstartTableRequest> tableRequests, int 
numControllers, int numBrokers,
       int numServers, int numMinions, File tempDir, boolean enableIsolation, 
String authToken,
-      Map<String, Object> configOverrides)
+      Map<String, Object> configOverrides, String queryOptions)
       throws Exception {
     _tableRequests = tableRequests;
     _numControllers = numControllers;
@@ -93,13 +95,14 @@ public class QuickstartRunner {
     _enableTenantIsolation = enableIsolation;
     _authToken = authToken;
     _configOverrides = configOverrides;
+    _queryOptions = queryOptions;
     clean();
   }
 
   public QuickstartRunner(List<QuickstartTableRequest> tableRequests, int 
numControllers, int numBrokers,
       int numServers, File tempDir)
       throws Exception {
-    this(tableRequests, numControllers, numBrokers, numServers, 0, tempDir, 
true, null, null);
+    this(tableRequests, numControllers, numBrokers, numServers, 0, tempDir, 
true, null, null, null);
   }
 
   private void startZookeeper()
@@ -248,6 +251,9 @@ public class QuickstartRunner {
   public JsonNode runQuery(String query)
       throws Exception {
     int brokerPort = _brokerPorts.get(RANDOM.nextInt(_brokerPorts.size()));
+    if (StringUtils.isNotBlank(_queryOptions)) {
+      query = query + " " + _queryOptions;
+    }
     return JsonUtils.stringToJsonNode(new 
PostQueryCommand().setBrokerPort(String.valueOf(brokerPort))
         
.setQueryType(CommonConstants.Broker.Request.SQL).setAuthToken(_authToken).setQuery(query).run());
   }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org