2

xinyiZzz · Sep 13, 2023 · 27d56d2 · 27d56d2
1 parent 61f63a5
commit 27d56d2
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 1,109 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -2629,7 +2629,7 @@ public List<ResultRow> executeInternalQuery() {
         }
     }
 
-    public void executeArrowFlightQuery(FlightStatementContext<Statement> flightStatementContext) {
+    public void executeArrowFlightQuery(FlightStatementContext flightStatementContext) {
         LOG.debug("ARROW FLIGHT QUERY: " + originStmt.toString());
         try {
             try {
@@ -2673,12 +2673,13 @@ public void executeArrowFlightQuery(FlightStatementContext<Statement> flightStat
                 coord.exec();
             } catch (Exception e) {
                 queryScheduleSpan.recordException(e);
+                LOG.warn("Failed to coord exec, because: {}", e.getMessage(), e);
                 throw new InternalQueryExecutionException(e.getMessage() + Util.getRootCauseMessage(e), e);
             } finally {
                 queryScheduleSpan.end();
             }
         } finally {
-            QeProcessorImpl.INSTANCE.unregisterQuery(context.queryId());
+            QeProcessorImpl.INSTANCE.unregisterQuery(context.queryId()); // TODO for query profile
         }
         flightStatementContext.setFinstId(coord.getFinstId());
         flightStatementContext.setResultFlightServerAddr(coord.getResultFlightServerAddr());

diff --git a/...ce/arrowflight/FlightServerBasicAuth.java → ...light/FlightServerBasicAuthValidator.java b/...ce/arrowflight/FlightServerBasicAuth.java → ...light/FlightServerBasicAuthValidator.java
@@ -26,11 +26,11 @@
  * authentication specialized implementation of BasicAuthValidator. Authenticates with provided
  * credentials.
  */
-public class FlightServerBasicAuth implements BasicServerAuthHandler.BasicAuthValidator {
+public class FlightServerBasicAuthValidator implements BasicServerAuthHandler.BasicAuthValidator {
 
     private static final String myToken = "DORIS_READ_WRITE_TOKEN";
 
-    public FlightServerBasicAuth() {
+    public FlightServerBasicAuthValidator() {
     }
 
     @Override

diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlExecutor.java
diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlService.java b/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlService.java
@@ -40,13 +40,13 @@ public class FlightSqlService {
             = FlightServerMiddleware.Key.of(FLIGHT_CLIENT_PROPERTIES_MIDDLEWARE);
 
     public FlightSqlService(int port) {
-        BufferAllocator allocator = new RootAllocator(100000);
+        BufferAllocator allocator = new RootAllocator();
         Location location = Location.forGrpcInsecure("0.0.0.0", port);
         FlightSqlServiceImpl producer = new FlightSqlServiceImpl(location);
         flightServer = FlightServer.builder(allocator, location, producer)
             .middleware(FLIGHT_CLIENT_PROPERTIES_MIDDLEWARE_KEY,
                 new ServerCookieMiddleware.Factory())
-            .authHandler(new BasicServerAuthHandler(new FlightServerBasicAuth())).build();
+            .authHandler(new BasicServerAuthHandler(new FlightServerBasicAuthValidator())).build();
     }
 
     // start Flightsql protocol service