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 8dab8034cf no error metric for queries where all segments are pruned 
(#10589)
8dab8034cf is described below

commit 8dab8034cf588be5d4d6c92db55dbbf3ebc51f7f
Author: Johan Adami <[email protected]>
AuthorDate: Tue Apr 18 16:14:55 2023 -0400

    no error metric for queries where all segments are pruned (#10589)
---
 .../requesthandler/BaseBrokerRequestHandler.java   | 40 ++++++++++++++--------
 .../airlineStats_realtime_table_config.json        |  5 +++
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git 
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
 
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
index 6fe32d6031..63089e863c 100644
--- 
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
+++ 
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
@@ -539,18 +539,7 @@ public abstract class BaseBrokerRequestHandler implements 
BrokerRequestHandler {
       }
 
       if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
-        if (pinotQuery.isExplain()) {
-          // EXPLAIN PLAN results to show that query is evaluated exclusively 
by Broker.
-          return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
-        }
-
-        // Send empty response since we don't need to evaluate either offline 
or realtime request.
-        BrokerResponseNative brokerResponse = BrokerResponseNative.empty();
-        // Extract source info from incoming request
-        _queryLogger.log(
-            new QueryLogger.QueryLogParams(requestId, query, requestContext, 
tableName, 0, new ServerStats(),
-                brokerResponse, System.nanoTime(), requesterIdentity));
-        return brokerResponse;
+        return getEmptyBrokerOnlyResponse(requestId, query, requesterIdentity, 
requestContext, pinotQuery, tableName);
       }
 
       if (offlineBrokerRequest != null && 
isFilterAlwaysTrue(offlineBrokerRequest.getPinotQuery())) {
@@ -618,9 +607,15 @@ public abstract class BaseBrokerRequestHandler implements 
BrokerRequestHandler {
       }
 
       if (offlineBrokerRequest == null && realtimeBrokerRequest == null) {
-        LOGGER.info("No server found for request {}: {}", requestId, query);
-        _brokerMetrics.addMeteredTableValue(rawTableName, 
BrokerMeter.NO_SERVER_FOUND_EXCEPTIONS, 1);
-        return new BrokerResponseNative(exceptions);
+        if (!exceptions.isEmpty()) {
+          LOGGER.info("No server found for request {}: {}", requestId, query);
+          _brokerMetrics.addMeteredTableValue(rawTableName, 
BrokerMeter.NO_SERVER_FOUND_EXCEPTIONS, 1);
+          return new BrokerResponseNative(exceptions);
+        } else {
+          // When all segments have been pruned, we can just return an empty 
response.
+          return getEmptyBrokerOnlyResponse(requestId, query, 
requesterIdentity, requestContext, pinotQuery,
+              tableName);
+        }
       }
       long routingEndTimeNs = System.nanoTime();
       _brokerMetrics.addPhaseTiming(rawTableName, 
BrokerQueryPhase.QUERY_ROUTING,
@@ -728,6 +723,21 @@ public abstract class BaseBrokerRequestHandler implements 
BrokerRequestHandler {
     }
   }
 
+  private BrokerResponseNative getEmptyBrokerOnlyResponse(long requestId, 
String query,
+      RequesterIdentity requesterIdentity, RequestContext requestContext, 
PinotQuery pinotQuery, String tableName) {
+    if (pinotQuery.isExplain()) {
+      // EXPLAIN PLAN results to show that query is evaluated exclusively by 
Broker.
+      return BrokerResponseNative.BROKER_ONLY_EXPLAIN_PLAN_OUTPUT;
+    }
+
+    // Send empty response since we don't need to evaluate either offline or 
realtime request.
+    BrokerResponseNative brokerResponse = BrokerResponseNative.empty();
+    // Extract source info from incoming request
+    _queryLogger.log(new QueryLogger.QueryLogParams(requestId, query, 
requestContext, tableName, 0, new ServerStats(),
+        brokerResponse, System.nanoTime(), requesterIdentity));
+    return brokerResponse;
+  }
+
   private void handleTimestampIndexOverride(PinotQuery pinotQuery, @Nullable 
TableConfig tableConfig) {
     if (tableConfig == null || tableConfig.getFieldConfigList() == null) {
       return;
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 94da8849f2..4d227d6c77 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,6 +12,11 @@
     "replication": "1",
     "replicasPerPartition": "1"
   },
+  "routing": {
+    "segmentPrunerTypes": [
+      "time"
+    ]
+  },
   "tenants": {},
   "tableIndexConfig": {
     "loadMode": "MMAP",


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

Reply via email to