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 873cc0a215 [multistage] improve error message in case of non-existent 
table queried from controller (#10599)
873cc0a215 is described below

commit 873cc0a21552aa4f4fbf048af5788e68bcb1a78c
Author: Pratik Tibrewal <[email protected]>
AuthorDate: Wed Apr 19 01:42:11 2023 +0530

    [multistage] improve error message in case of non-existent table queried 
from controller (#10599)
---
 .../api/resources/PinotQueryResource.java          | 54 +++++++++++++---------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git 
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
 
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
index df796720d5..775c7ff1d2 100644
--- 
a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
+++ 
b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotQueryResource.java
@@ -60,6 +60,7 @@ import org.apache.pinot.controller.api.access.AccessType;
 import org.apache.pinot.controller.helix.core.PinotHelixResourceManager;
 import org.apache.pinot.core.auth.ManualAuthorization;
 import org.apache.pinot.core.query.executor.sql.SqlQueryExecutor;
+import org.apache.pinot.spi.config.table.TableConfig;
 import org.apache.pinot.spi.utils.CommonConstants;
 import 
org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
 import org.apache.pinot.spi.utils.JsonUtils;
@@ -178,8 +179,14 @@ public class PinotQueryResource {
           new Exception("Unable to find table name from SQL thus cannot 
dispatch to broker.")).toString();
     }
 
-    String brokerTenant = getCommonBrokerTenant(tableNames);
-    String serverTenant = getCommonServerTenant(tableNames);
+    List<TableConfig> tableConfigList = getListTableConfigs(tableNames);
+    if (tableConfigList == null || tableConfigList.size() == 0) {
+      return 
QueryException.getException(QueryException.BROKER_RESOURCE_MISSING_ERROR, new 
Exception(
+          "Unable to find table in cluster")).toString();
+    }
+
+    String brokerTenant = getCommonBrokerTenant(tableConfigList);
+    String serverTenant = getCommonServerTenant(tableConfigList);
     if (brokerTenant == null || serverTenant == null) {
       return 
QueryException.getException(QueryException.BROKER_REQUEST_SEND_ERROR,
           new Exception(String.format("Unable to dispatch multistage query 
with multiple tables : %s "
@@ -239,18 +246,30 @@ public class PinotQueryResource {
     return sendRequestToBroker(query, instanceId, traceEnabled, queryOptions, 
httpHeaders);
   }
 
-  // return the brokerTenant if all tables point to the same broker, else 
returns null
-  private String getCommonBrokerTenant(List<String> tableNames) {
-    Set<String> tableBrokers = new HashSet<>();
-    for (String tableName : tableNames) {
+  // given a list of tables, returns the list of tableConfigs
+  private List<TableConfig> getListTableConfigs(List<String> tableNames) {
+    List<TableConfig> allTableConfigList = new ArrayList<>();
+    for (String tableName: tableNames) {
+      List<TableConfig> tableConfigList = new ArrayList<>();
       if (_pinotHelixResourceManager.hasRealtimeTable(tableName)) {
-        
tableBrokers.add(Objects.requireNonNull(_pinotHelixResourceManager.getRealtimeTableConfig(tableName))
-                .getTenantConfig().getBroker());
+        
tableConfigList.add(Objects.requireNonNull(_pinotHelixResourceManager.getRealtimeTableConfig(tableName)));
       }
       if (_pinotHelixResourceManager.hasOfflineTable(tableName)) {
-        
tableBrokers.add(Objects.requireNonNull(_pinotHelixResourceManager.getOfflineTableConfig(tableName))
-                .getTenantConfig().getBroker());
+        
tableConfigList.add(Objects.requireNonNull(_pinotHelixResourceManager.getOfflineTableConfig(tableName)));
       }
+      if (tableConfigList.size() == 0) {
+        return null;
+      }
+      allTableConfigList.addAll(tableConfigList);
+    }
+    return allTableConfigList;
+  }
+
+  // return the brokerTenant if all table configs point to the same broker, 
else returns null
+  private String getCommonBrokerTenant(List<TableConfig> tableConfigList) {
+    Set<String> tableBrokers = new HashSet<>();
+    for (TableConfig tableConfig : tableConfigList) {
+      tableBrokers.add(tableConfig.getTenantConfig().getBroker());
     }
     if (tableBrokers.size() != 1) {
       return null;
@@ -258,18 +277,11 @@ public class PinotQueryResource {
     return (String) (tableBrokers.toArray()[0]);
   }
 
-  // return the serverTenant if all tables point to the same broker, else 
returns null
-  private String getCommonServerTenant(List<String> tableNames) {
+  // return the serverTenant if all table configs point to the same server, 
else returns null
+  private String getCommonServerTenant(List<TableConfig> tableConfigList) {
     Set<String> tableServers = new HashSet<>();
-    for (String tableName : tableNames) {
-      if (_pinotHelixResourceManager.hasRealtimeTable(tableName)) {
-        
tableServers.add(Objects.requireNonNull(_pinotHelixResourceManager.getRealtimeTableConfig(tableName))
-                .getTenantConfig().getServer());
-      }
-      if (_pinotHelixResourceManager.hasOfflineTable(tableName)) {
-        
tableServers.add(Objects.requireNonNull(_pinotHelixResourceManager.getOfflineTableConfig(tableName))
-                .getTenantConfig().getServer());
-      }
+    for (TableConfig tableConfig : tableConfigList) {
+      tableServers.add(tableConfig.getTenantConfig().getServer());
     }
     if (tableServers.size() != 1) {
       return null;


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

Reply via email to