flow of logic

apache · Oct 18, 2024 · 3240a4b · 3240a4b
1 parent fa21310
commit 3240a4b
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/...main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java b/...main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java
@@ -626,22 +626,6 @@ protected BrokerResponse handleRequest(long requestId, String query, SqlNodeAndO
       boolean realtimeTableDisabled = _routingManager.isTableDisabled(
           TableNameBuilder.REALTIME.tableNameWithType(rawTableName));
       List<ProcessingException> exceptions = new ArrayList<>();
-
-      if (offlineTableDisabled || realtimeTableDisabled) {
-        String errorMessage = null;
-        if (((realtimeTableConfig != null && offlineTableConfig != null) && (offlineTableDisabled
-            && realtimeTableDisabled)) || (offlineTableConfig == null && realtimeTableDisabled) || (
-            realtimeTableConfig == null && offlineTableDisabled)) {
-          requestContext.setErrorCode(QueryException.TABLE_IS_DISABLED_ERROR_CODE);
-          return BrokerResponseNative.TABLE_IS_DISABLED;
-        } else if ((realtimeTableConfig != null && offlineTableConfig != null) && realtimeTableDisabled) {
-          errorMessage = "Realtime table is disabled in hybrid table";
-        } else if ((realtimeTableConfig != null && offlineTableConfig != null) && offlineTableDisabled) {
-          errorMessage = "Offline table is disabled in hybrid table";
-        }
-        exceptions.add(QueryException.getException(QueryException.TABLE_IS_DISABLED_ERROR, errorMessage));
-      }
-
       if (offlineBrokerRequest != null) {
         // NOTE: Routing table might be null if table is just removed
         RoutingTable routingTable = _routingManager.getRoutingTable(offlineBrokerRequest, requestId);
@@ -680,6 +664,22 @@ protected BrokerResponse handleRequest(long requestId, String query, SqlNodeAndO
           realtimeBrokerRequest = null;
         }
       }
+
+      if (offlineTableDisabled || realtimeTableDisabled) {
+        String errorMessage = null;
+        if (((realtimeTableConfig != null && offlineTableConfig != null) && (offlineTableDisabled
+            && realtimeTableDisabled)) || (offlineTableConfig == null && realtimeTableDisabled) || (
+            realtimeTableConfig == null && offlineTableDisabled)) {
+          requestContext.setErrorCode(QueryException.TABLE_IS_DISABLED_ERROR_CODE);
+          return BrokerResponseNative.TABLE_IS_DISABLED;
+        } else if ((realtimeTableConfig != null && offlineTableConfig != null) && realtimeTableDisabled) {
+          errorMessage = "Realtime table is disabled in hybrid table";
+        } else if ((realtimeTableConfig != null && offlineTableConfig != null) && offlineTableDisabled) {
+          errorMessage = "Offline table is disabled in hybrid table";
+        }
+        exceptions.add(QueryException.getException(QueryException.TABLE_IS_DISABLED_ERROR, errorMessage));
+      }
+
       int numUnavailableSegments = unavailableSegments.size();
       requestContext.setNumUnavailableSegments(numUnavailableSegments);