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

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

commit 91c66be4c9737bc239c0e9d1f1a6f64f4fd5bb84
Author: Neha Pawar <[email protected]>
AuthorDate: Mon Mar 2 17:11:22 2020 -0800

    Defaulttenant for hybrid quickstart and example queriesDefault tenant and 
example queries for hybrid quickstart
---
 .../airlineStats_realtime_table_config.json        |  5 +--
 kubernetes/helm/pinot-realtime-quickstart.yml      | 10 +----
 .../org/apache/pinot/tools/HybridQuickstart.java   | 43 +++++++++++++++++++---
 .../airlineStats_offline_table_config.json         |  5 +--
 .../airlineStats_realtime_table_config.json        |  5 +--
 .../docker/airlineStats_realtime_table_config.json |  5 +--
 .../airlineStats_realtime_table_config.json        |  5 +--
 .../airlineStats_realtime_table_config.json        |  5 +--
 8 files changed, 46 insertions(+), 37 deletions(-)

diff --git 
a/docker/images/pinot/table-configs/airlineStats_realtime_table_config.json 
b/docker/images/pinot/table-configs/airlineStats_realtime_table_config.json
index f8e80b1..c0d6890 100644
--- a/docker/images/pinot/table-configs/airlineStats_realtime_table_config.json
+++ b/docker/images/pinot/table-configs/airlineStats_realtime_table_config.json
@@ -12,10 +12,7 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
     "streamConfigs": {
diff --git a/kubernetes/helm/pinot-realtime-quickstart.yml 
b/kubernetes/helm/pinot-realtime-quickstart.yml
index 52e7ae3..f50c977 100644
--- a/kubernetes/helm/pinot-realtime-quickstart.yml
+++ b/kubernetes/helm/pinot-realtime-quickstart.yml
@@ -38,10 +38,7 @@ data:
         "replication": "1",
         "replicasPerPartition": "1"
       },
-      "tenants": {
-        "broker": "airline_broker",
-        "server": "airline"
-      },
+      "tenants": {},
       "tableIndexConfig": {
         "loadMode": "MMAP",
         "streamConfigs": {
@@ -78,10 +75,7 @@ data:
         "replication": "1",
         "replicasPerPartition": "1"
       },
-      "tenants": {
-        "broker": "airline_broker",
-        "server": "airline"
-      },
+      "tenants": {},
       "tableIndexConfig": {
         "loadMode": "MMAP",
         "streamConfigs": {
diff --git 
a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java 
b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
index 3d2dfb0..7951a3f 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/HybridQuickstart.java
@@ -24,6 +24,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import org.apache.commons.io.FileUtils;
+import org.apache.pinot.common.config.TagNameUtils;
 import org.apache.pinot.spi.data.Schema;
 import org.apache.pinot.common.utils.ZkStarter;
 import org.apache.pinot.spi.data.readers.FileFormat;
@@ -35,6 +36,7 @@ import org.apache.pinot.tools.admin.command.QuickstartRunner;
 import org.apache.pinot.tools.streams.AirlineDataStream;
 import org.apache.pinot.tools.utils.KafkaStarterUtils;
 
+import static org.apache.pinot.tools.Quickstart.prettyPrintResponse;
 import static org.apache.pinot.tools.Quickstart.printStatus;
 
 
@@ -129,10 +131,10 @@ public class HybridQuickstart {
     startKafka();
     printStatus(Color.YELLOW, "***** Starting Zookeeper, 2 servers, 2 brokers 
and 1 controller *****");
     runner.startAll();
-    printStatus(Color.YELLOW, "***** Creating a server tenant with name 
'airline' *****");
-    runner.createServerTenantWith(1, 1, "airline");
-    printStatus(Color.YELLOW, "***** Creating a broker tenant with name 
'airline_broker' *****");
-    runner.createBrokerTenantWith(2, "airline_broker");
+    printStatus(Color.YELLOW, "***** Creating a server tenant with name 
'DefaultTenant' *****");
+    runner.createServerTenantWith(1, 1, TagNameUtils.DEFAULT_TENANT_NAME);
+    printStatus(Color.YELLOW, "***** Creating a broker tenant with name 
'DefaultTenant' *****");
+    runner.createBrokerTenantWith(2, TagNameUtils.DEFAULT_TENANT_NAME);
     printStatus(Color.YELLOW, "***** Adding airlineStats offline and realtime 
table *****");
     runner.addTable();
     printStatus(Color.YELLOW, "***** Launch data ingestion job to build index 
segments for airlineStats and push to controller *****");
@@ -155,7 +157,38 @@ public class HybridQuickstart {
     printStatus(Color.YELLOW, "*****    7. Built and pushed an offline segment 
*****");
     printStatus(Color.YELLOW,
         "*****    8. Started publishing a Kafka stream for the realtime 
instance to start consuming *****");
-    printStatus(Color.YELLOW, "***** go to http://localhost:9000/query to run 
a few queries *****");
+
+    String q1 = "select count(*) from airlineStats limit 10";
+    printStatus(Color.YELLOW, "Total number of documents in the table");
+    printStatus(Color.CYAN, "Query : " + q1);
+    printStatus(Color.YELLOW, prettyPrintResponse(runner.runQuery(q1)));
+    printStatus(Color.GREEN, 
"***************************************************");
+
+    String q2 = "select sum(Cancelled) from airlineStats group by AirlineID 
limit 5";
+    printStatus(Color.YELLOW, "Top 5 airlines in cancellation ");
+    printStatus(Color.CYAN, "Query : " + q2);
+    printStatus(Color.YELLOW, prettyPrintResponse(runner.runQuery(q2)));
+    printStatus(Color.GREEN, 
"***************************************************");
+
+    String q3 = "select sum(Flights) from airlineStats where Year > 2010 group 
by AirlineID, Year limit 5";
+    printStatus(Color.YELLOW, "Top 5 airlines in number of flights after 
2010");
+    printStatus(Color.CYAN, "Query : " + q3);
+    printStatus(Color.YELLOW, prettyPrintResponse(runner.runQuery(q3)));
+    printStatus(Color.GREEN, 
"***************************************************");
+
+    String q4 = "select max(Flights) from airlineStats group by OriginCityName 
limit 5";
+    printStatus(Color.YELLOW, "Top 5 cities for number of flights");
+    printStatus(Color.CYAN, "Query : " + q4);
+    printStatus(Color.YELLOW, prettyPrintResponse(runner.runQuery(q4)));
+    printStatus(Color.GREEN, 
"***************************************************");
+
+    String q5 = "select AirlineID, OriginCityName, DestCityName, Year from 
airlineStats order by Year limit 5";
+    printStatus(Color.YELLOW, "Print AirlineID, OriginCityName, DestCityName, 
Year for 5 records ordered by Year");
+    printStatus(Color.CYAN, "Query : " + q5);
+    printStatus(Color.YELLOW, prettyPrintResponse(runner.runQuery(q5)));
+    printStatus(Color.GREEN, 
"***************************************************");
+
+    printStatus(Color.GREEN, "You can always go to http://localhost:9000/query 
to play around in the query console");
 
     Runtime.getRuntime().addShutdownHook(new Thread() {
       @Override
diff --git 
a/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
 
b/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
index de73b4c..b91aa33 100644
--- 
a/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
+++ 
b/pinot-tools/src/main/resources/examples/batch/airlineStats/airlineStats_offline_table_config.json
@@ -8,10 +8,7 @@
     "segmentAssignmentStrategy": "BalanceNumSegmentAssignmentStrategy",
     "replication": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP"
   },
diff --git 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
index 6a893e4..cb5d690 100644
--- 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
+++ 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/airlineStats_realtime_table_config.json
@@ -12,10 +12,7 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
     "streamConfigs": {
diff --git 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
index f483e85..0c32339 100644
--- 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
+++ 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/docker/airlineStats_realtime_table_config.json
@@ -12,10 +12,7 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
     "streamConfigs": {
diff --git 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_0.9/airlineStats_realtime_table_config.json
 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_0.9/airlineStats_realtime_table_config.json
index f5c4652..758e638 100644
--- 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_0.9/airlineStats_realtime_table_config.json
+++ 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_0.9/airlineStats_realtime_table_config.json
@@ -12,10 +12,7 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
     "streamConfigs": {
diff --git 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_2.0/airlineStats_realtime_table_config.json
 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_2.0/airlineStats_realtime_table_config.json
index 6a893e4..cb5d690 100644
--- 
a/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_2.0/airlineStats_realtime_table_config.json
+++ 
b/pinot-tools/src/main/resources/examples/stream/airlineStats/kafka_2.0/airlineStats_realtime_table_config.json
@@ -12,10 +12,7 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
-  "tenants": {
-    "broker": "airline_broker",
-    "server": "airline"
-  },
+  "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",
     "streamConfigs": {


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

Reply via email to