You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ne...@apache.org on 2021/06/11 16:13:55 UTC

[incubator-pinot] branch revert-7042-query_option_quickstart created (now 7a546bd)

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

nehapawar pushed a change to branch revert-7042-query_option_quickstart
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.


      at 7a546bd  Revert "Query options in quickstart (#7042)"

This branch includes the following new commits:

     new 7a546bd  Revert "Query options in quickstart (#7042)"

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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


[incubator-pinot] 01/01: Revert "Query options in quickstart (#7042)"

Posted by ne...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7a546bd128b677157e8515250d3a11ff0f67e741
Author: Neha Pawar <ne...@gmail.com>
AuthorDate: Fri Jun 11 09:13:34 2021 -0700

    Revert "Query options in quickstart (#7042)"
    
    This reverts commit 214a2c019bb61e6f072691c145aaafd36ecf33a5.
---
 .../src/main/java/org/apache/pinot/tools/Quickstart.java       |  9 +--------
 .../org/apache/pinot/tools/admin/command/QuickstartRunner.java | 10 ++--------
 2 files changed, 3 insertions(+), 16 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 4b7b5d8..4907d79 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,13 +63,6 @@ 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);
   }
@@ -188,7 +181,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(), getQueryOptions());
+            getConfigOverrides());
 
     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 c0ac5e4..8d60244 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,7 +31,6 @@ 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;
@@ -76,7 +75,6 @@ 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<>();
@@ -84,7 +82,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, String queryOptions)
+      Map<String, Object> configOverrides)
       throws Exception {
     _tableRequests = tableRequests;
     _numControllers = numControllers;
@@ -95,14 +93,13 @@ 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, null);
+    this(tableRequests, numControllers, numBrokers, numServers, 0, tempDir, true, null, null);
   }
 
   private void startZookeeper()
@@ -251,9 +248,6 @@ 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-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org