This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new af333cc583d [refactor](arrow-flight) Move Arrow Flight SQL out of the
service package into org.apache.doris.arrowflight (#67866)
af333cc583d is described below
commit af333cc583d96ee706c115324524cd711f919ac5
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Fri Sep 11 23:50:04 2026 +0800
[refactor](arrow-flight) Move Arrow Flight SQL out of the service package
into org.apache.doris.arrowflight (#67866)
### What problem does this PR solve?
Issue Number: #67577 -- the tracking issue for the protocol-agnostic
session and execution
layer. This is a preparatory, mechanical PR of its Stage 1 and does not
close it.
Arrow Flight SQL was added under `org.apache.doris.service.arrowflight`
in 2023 (#24772)
because it was wired up next to the thrift `FrontendServiceImpl`. It has
since grown into a full
peer of the MySQL front end (its own connect processor, sessions, auth,
result channel, and, as
of #67835, a `ProtocolAdapter`), while the MySQL side lives in the
top-level `org.apache.doris.mysql`
package. #67835 already had to mirror the `protocol` sub-package on both
sides, and the next PR
(`ResultSender`) would add one more implementation per side. Moving
Flight out of `service/` now
keeps the two front ends symmetric before more code lands on that shape:
```
org.apache.doris.mysql
org.apache.doris.arrowflight (was service.arrowflight)
.protocol.MysqlProtocolAdapter
.protocol.FlightProtocolAdapter
.protocol.MysqlResultSender (next PR)
.protocol.FlightResultSender (next PR)
```
What moves (`git mv`, sub-packages kept as they were):
- `fe-core/src/main/java/org/apache/doris/service/arrowflight/**` ->
`.../doris/arrowflight/**`
(19 files: 4 top-level, `auth2/` 5, `protocol/` 1, `results/` 3,
`sessions/` 3, `tokens/` 3)
- `fe-core/src/test/java/org/apache/doris/service/arrowflight/**` ->
`.../doris/arrowflight/**`
(7 tests)
- `fe-core/src/test/java/org/apache/doris/service/FlightSqlJDBC.java` ->
`.../doris/arrowflight/`
(the manual Flight JDBC client left behind by #27661; it only sat in
`service` because Flight did)
What changes inside files: `package` declarations and `import` lines
only, plus re-sorting the
`org.apache.doris.*` import block where `arrowflight` now sorts before
`catalog`/`common`/`qe`
(checkstyle `CustomImportOrder`). 9 files outside the moved tree only
update imports:
`ConnectContext`, `ConnectScheduler`, `Coordinator`,
`NereidsCoordinator`, `OssFeServerStarterProvider`,
and the tests `ConnectionExceedTest`, `MysqlProtocolAdapterTest`,
`AuditLogWorkloadGroupTest`,
`FlightResultGoldenTest`.
Nothing else references the old package name: no `Class.forName`, no
configuration key, no
`pom.xml` / checkstyle suppression / log4j entry, no regression-test or
`.github` path. The four
classes that are actually the thrift service (`ExecuteEnv`,
`FeDiskInfo`, `FrontendOptions`,
`FrontendServiceImpl`) stay in `org.apache.doris.service`.
---
.../{service => }/arrowflight/DorisFlightSqlProducer.java | 10 +++++-----
.../{service => }/arrowflight/DorisFlightSqlService.java | 14 +++++++-------
.../arrowflight/FlightSqlConnectProcessor.java | 4 ++--
.../{service => }/arrowflight/FlightSqlSchemaHelper.java | 2 +-
.../{service => }/arrowflight/auth2/FlightAuthResult.java | 2 +-
.../{service => }/arrowflight/auth2/FlightAuthUtils.java | 4 ++--
.../arrowflight/auth2/FlightBearerTokenAuthenticator.java | 4 ++--
.../arrowflight/auth2/FlightCredentialValidator.java | 4 ++--
.../auth2/FlightRemoteIpServerStreamTracer.java | 2 +-
.../arrowflight/protocol/FlightProtocolAdapter.java | 8 ++++----
.../arrowflight/results/FlightSqlChannel.java | 2 +-
.../arrowflight/results/FlightSqlEndpointsLocation.java | 2 +-
.../arrowflight/results/FlightSqlResultCacheEntry.java | 2 +-
.../arrowflight/sessions/FlightSessionsManager.java | 2 +-
.../sessions/FlightSessionsWithTokenManager.java | 6 +++---
.../arrowflight/sessions/FlightSqlConnectPoolMgr.java | 4 ++--
.../arrowflight/tokens/FlightTokenDetails.java | 2 +-
.../arrowflight/tokens/FlightTokenManager.java | 4 ++--
.../arrowflight/tokens/FlightTokenManagerImpl.java | 4 ++--
.../src/main/java/org/apache/doris/qe/ConnectContext.java | 6 +++---
.../main/java/org/apache/doris/qe/ConnectScheduler.java | 2 +-
.../src/main/java/org/apache/doris/qe/Coordinator.java | 2 +-
.../main/java/org/apache/doris/qe/NereidsCoordinator.java | 2 +-
.../doris/tls/server/OssFeServerStarterProvider.java | 2 +-
.../arrowflight/DorisFlightSqlProducerTest.java | 6 +++---
.../doris/{service => arrowflight}/FlightSqlJDBC.java | 2 +-
.../arrowflight/FlightSqlSchemaHelperArrowTypeTest.java | 2 +-
.../auth2/FlightRemoteIpServerStreamTracerTest.java | 2 +-
.../arrowflight/protocol/FlightProtocolAdapterTest.java | 2 +-
.../arrowflight/sessions/FlightSessionClientIpTest.java | 2 +-
.../arrowflight/sessions/FlightSqlConnectPoolMgrTest.java | 4 ++--
.../sessions/FlightSqlDeferredQueryIdleTimeoutTest.java | 2 +-
.../java/org/apache/doris/mysql/ConnectionExceedTest.java | 6 +++---
.../doris/mysql/protocol/MysqlProtocolAdapterTest.java | 2 +-
.../org/apache/doris/qe/AuditLogWorkloadGroupTest.java | 2 +-
.../apache/doris/qe/protocol/FlightResultGoldenTest.java | 4 ++--
36 files changed, 66 insertions(+), 66 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducer.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlProducer.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducer.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlProducer.java
index 767b68600b2..f3beeb1ba5e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlProducer.java
@@ -18,17 +18,17 @@
//
https://github.com/apache/arrow/blob/main/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
// and modified by Doris
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
+import org.apache.doris.arrowflight.protocol.FlightProtocolAdapter;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
+import org.apache.doris.arrowflight.results.FlightSqlResultCacheEntry;
+import org.apache.doris.arrowflight.sessions.FlightSessionsManager;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.common.util.Util;
import org.apache.doris.mysql.MysqlCommand;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.QueryState.MysqlStateType;
-import org.apache.doris.service.arrowflight.protocol.FlightProtocolAdapter;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
-import org.apache.doris.service.arrowflight.results.FlightSqlResultCacheEntry;
-import org.apache.doris.service.arrowflight.sessions.FlightSessionsManager;
import org.apache.doris.thrift.TUniqueId;
import com.google.common.base.Preconditions;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlService.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlService.java
similarity index 88%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlService.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlService.java
index 22f9466e7db..4bc5f1e48cd 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/DorisFlightSqlService.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/DorisFlightSqlService.java
@@ -15,16 +15,16 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
+import org.apache.doris.arrowflight.auth2.FlightBearerTokenAuthenticator;
+import org.apache.doris.arrowflight.auth2.FlightRemoteIpServerStreamTracer;
+import org.apache.doris.arrowflight.sessions.FlightSessionsManager;
+import org.apache.doris.arrowflight.sessions.FlightSessionsWithTokenManager;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
+import org.apache.doris.arrowflight.tokens.FlightTokenManagerImpl;
import org.apache.doris.common.Config;
import org.apache.doris.service.FrontendOptions;
-import
org.apache.doris.service.arrowflight.auth2.FlightBearerTokenAuthenticator;
-import
org.apache.doris.service.arrowflight.auth2.FlightRemoteIpServerStreamTracer;
-import org.apache.doris.service.arrowflight.sessions.FlightSessionsManager;
-import
org.apache.doris.service.arrowflight.sessions.FlightSessionsWithTokenManager;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManagerImpl;
import io.grpc.ServerBuilder;
import org.apache.arrow.flight.FlightServer;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlConnectProcessor.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlConnectProcessor.java
index af5e214abd2..ee38a7aabd9 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlConnectProcessor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlConnectProcessor.java
@@ -15,9 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
import org.apache.doris.analysis.Expr;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.common.ConnectionException;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.ErrorReport;
@@ -32,7 +33,6 @@ import org.apache.doris.qe.ConnectProcessor;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.rpc.BackendServiceProxy;
import org.apache.doris.rpc.RpcException;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.thrift.TNetworkAddress;
import org.apache.doris.thrift.TStatusCode;
import org.apache.doris.thrift.TUniqueId;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelper.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlSchemaHelper.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelper.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlSchemaHelper.java
index c95019c004e..89e4042ead4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelper.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/FlightSqlSchemaHelper.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.PrimitiveType;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthResult.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthResult.java
similarity index 96%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthResult.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthResult.java
index d18925ae6e6..96c0b0ac1a1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthResult.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthResult.java
@@ -16,7 +16,7 @@
// under the License.
// This file is copied from
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
import org.apache.doris.analysis.UserIdentity;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthUtils.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthUtils.java
similarity index 96%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthUtils.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthUtils.java
index c93e0b5a309..133f67cf28c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightAuthUtils.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightAuthUtils.java
@@ -15,12 +15,12 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.AuthenticationException;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightBearerTokenAuthenticator.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightBearerTokenAuthenticator.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightBearerTokenAuthenticator.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightBearerTokenAuthenticator.java
index 9f4479c6bcd..4d3ccbed721 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightBearerTokenAuthenticator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightBearerTokenAuthenticator.java
@@ -18,9 +18,9 @@
//
https://github.com/dremio/dremio-oss/blob/master/services/arrow-flight/src/main/java/com/dremio/service/flight/auth2/DremioBearerTokenAuthenticator.java
// and modified by Doris
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
import org.apache.arrow.flight.CallHeaders;
import org.apache.arrow.flight.CallStatus;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightCredentialValidator.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightCredentialValidator.java
similarity index 95%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightCredentialValidator.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightCredentialValidator.java
index 259d5083446..7d8b6c767ad 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightCredentialValidator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightCredentialValidator.java
@@ -18,9 +18,9 @@
//
https://github.com/dremio/dremio-oss/blob/master/services/arrow-flight/src/main/java/com/dremio/service/flight/auth2/DremioCredentialValidator.java
// and modified by Doris
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
import org.apache.arrow.flight.auth2.BasicCallHeaderAuthenticator;
import org.apache.arrow.flight.auth2.CallHeaderAuthenticator.AuthResult;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
index 8c756c599a3..4b4cceab3ae 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracer.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
import io.grpc.Attributes;
import io.grpc.Context;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapter.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapter.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapter.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapter.java
index 7f2128e450b..b3c5aac5639 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapter.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapter.java
@@ -15,8 +15,11 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.protocol;
+package org.apache.doris.arrowflight.protocol;
+import org.apache.doris.arrowflight.auth2.FlightRemoteIpServerStreamTracer;
+import org.apache.doris.arrowflight.results.FlightSqlChannel;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.common.Config;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ConnectContext.ConnectType;
@@ -24,9 +27,6 @@ import org.apache.doris.qe.ConnectPoolMgr;
import org.apache.doris.qe.ConnectScheduler;
import org.apache.doris.qe.StmtExecutor;
import org.apache.doris.qe.protocol.ProtocolAdapter;
-import
org.apache.doris.service.arrowflight.auth2.FlightRemoteIpServerStreamTracer;
-import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.thrift.TResultSinkType;
import com.google.common.base.Strings;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlChannel.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlChannel.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlChannel.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlChannel.java
index 678dd7bb69f..485d15cd370 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlChannel.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlChannel.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.results;
+package org.apache.doris.arrowflight.results;
import org.apache.doris.catalog.Column;
import org.apache.doris.common.FeConstants;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlEndpointsLocation.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlEndpointsLocation.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlEndpointsLocation.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlEndpointsLocation.java
index 61adc797cc5..68d61b2bb34 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlEndpointsLocation.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlEndpointsLocation.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.results;
+package org.apache.doris.arrowflight.results;
import org.apache.doris.analysis.Expr;
import org.apache.doris.thrift.TNetworkAddress;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlResultCacheEntry.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlResultCacheEntry.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlResultCacheEntry.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlResultCacheEntry.java
index 6edc868b0dd..333498b52b7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/results/FlightSqlResultCacheEntry.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/results/FlightSqlResultCacheEntry.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.results;
+package org.apache.doris.arrowflight.results;
import org.apache.arrow.vector.VectorSchemaRoot;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsManager.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsManager.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsManager.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsManager.java
index c52ab6cfbbc..45e4f3bba1b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsManager.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsManager.java
@@ -16,7 +16,7 @@
// under the License.
// This file is copied from
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Env;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsWithTokenManager.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsWithTokenManager.java
similarity index 95%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsWithTokenManager.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsWithTokenManager.java
index 02e1389111d..0327c24b61f 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSessionsWithTokenManager.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSessionsWithTokenManager.java
@@ -15,16 +15,16 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
+import org.apache.doris.arrowflight.tokens.FlightTokenDetails;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.util.TokenMasker;
import org.apache.doris.common.util.Util;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ConnectScheduler;
import org.apache.doris.service.ExecuteEnv;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenDetails;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
import org.apache.arrow.flight.CallStatus;
import org.apache.logging.log4j.LogManager;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgr.java
similarity index 97%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgr.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgr.java
index c8854507e00..dc5763590c6 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgr.java
@@ -15,13 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
+import org.apache.doris.arrowflight.results.FlightSqlChannel;
import org.apache.doris.common.util.TokenMasker;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ConnectContext.ConnectType;
import org.apache.doris.qe.ConnectPoolMgr;
-import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
import com.google.common.collect.Maps;
import org.apache.logging.log4j.LogManager;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenDetails.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenDetails.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenDetails.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenDetails.java
index be9166eead1..4b1bca72e05 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenDetails.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenDetails.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.tokens;
+package org.apache.doris.arrowflight.tokens;
import org.apache.doris.analysis.UserIdentity;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManager.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManager.java
similarity index 94%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManager.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManager.java
index 23435c3c046..48684bbfecd 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManager.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManager.java
@@ -17,9 +17,9 @@
//
https://github.com/dremio/dremio-oss/blob/master/services/arrow-flight/src/main/java/com/dremio/service/tokens/TokenManager.java
// and modified by Doris
-package org.apache.doris.service.arrowflight.tokens;
+package org.apache.doris.arrowflight.tokens;
-import org.apache.doris.service.arrowflight.auth2.FlightAuthResult;
+import org.apache.doris.arrowflight.auth2.FlightAuthResult;
/**
* Token manager.
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManagerImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManagerImpl.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManagerImpl.java
rename to
fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManagerImpl.java
index a3c76da9f05..ca2487b8379 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/service/arrowflight/tokens/FlightTokenManagerImpl.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/arrowflight/tokens/FlightTokenManagerImpl.java
@@ -17,14 +17,14 @@
//
https://github.com/dremio/dremio-oss/blob/master/services/arrow-flight/src/main/java/com/dremio/service/tokens/TokenManagerImpl.java
// and modified by Doris
-package org.apache.doris.service.arrowflight.tokens;
+package org.apache.doris.arrowflight.tokens;
+import org.apache.doris.arrowflight.auth2.FlightAuthResult;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.CustomThreadFactory;
import org.apache.doris.common.util.TokenMasker;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.service.ExecuteEnv;
-import org.apache.doris.service.arrowflight.auth2.FlightAuthResult;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index 53f40d0066d..fa030e52bb5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -30,6 +30,9 @@ import org.apache.doris.analysis.ResourceTypeEnum;
import org.apache.doris.analysis.StringLiteral;
import org.apache.doris.analysis.TimeStampNsLiteral;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.protocol.FlightProtocolAdapter;
+import org.apache.doris.arrowflight.results.FlightSqlChannel;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.authentication.Principal;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.DatabaseIf;
@@ -73,9 +76,6 @@ import org.apache.doris.resource.BackendSelectionProfile;
import org.apache.doris.resource.Tag;
import org.apache.doris.resource.computegroup.ComputeGroup;
import org.apache.doris.resource.computegroup.ComputeGroupMgr;
-import org.apache.doris.service.arrowflight.protocol.FlightProtocolAdapter;
-import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.statistics.model.ColumnStatistic;
import org.apache.doris.statistics.model.Histogram;
import org.apache.doris.system.Backend;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
index b22e89cf209..06e544971f6 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java
@@ -18,11 +18,11 @@
package org.apache.doris.qe;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.sessions.FlightSqlConnectPoolMgr;
import org.apache.doris.common.Config;
import org.apache.doris.common.Status;
import org.apache.doris.common.ThreadPoolManager;
import org.apache.doris.qe.ConnectContext.ThreadInfo;
-import org.apache.doris.service.arrowflight.sessions.FlightSqlConnectPoolMgr;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
index 8f04eb8bb7f..0d3dec78561 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -20,6 +20,7 @@ package org.apache.doris.qe;
import org.apache.doris.analysis.DescriptorTable;
import org.apache.doris.analysis.DescriptorToThriftConverter;
import org.apache.doris.analysis.StorageBackend;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.catalog.AIResource;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.FsBroker;
@@ -88,7 +89,6 @@ import org.apache.doris.rpc.BackendServiceProxy;
import org.apache.doris.rpc.RpcException;
import org.apache.doris.service.ExecuteEnv;
import org.apache.doris.service.FrontendOptions;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.system.Backend;
import org.apache.doris.system.SystemInfoService;
import org.apache.doris.task.LoadEtlTask;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java
index 74671eac0bf..af96302568a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/NereidsCoordinator.java
@@ -19,6 +19,7 @@ package org.apache.doris.qe;
import org.apache.doris.analysis.DescriptorTable;
import org.apache.doris.analysis.StorageBackend;
+import org.apache.doris.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.FsBroker;
import org.apache.doris.common.AnalysisException;
@@ -55,7 +56,6 @@ import org.apache.doris.resource.BackendSelectionManager;
import org.apache.doris.resource.workloadgroup.QueryQueue;
import org.apache.doris.resource.workloadgroup.QueueToken;
import org.apache.doris.resource.workloadgroup.WorkloadGroup;
-import org.apache.doris.service.arrowflight.results.FlightSqlEndpointsLocation;
import org.apache.doris.system.Backend;
import org.apache.doris.thrift.TErrorTabletInfo;
import org.apache.doris.thrift.TNetworkAddress;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/tls/server/OssFeServerStarterProvider.java
b/fe/fe-core/src/main/java/org/apache/doris/tls/server/OssFeServerStarterProvider.java
index 1c8266d452f..af8ca85faef 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/tls/server/OssFeServerStarterProvider.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/tls/server/OssFeServerStarterProvider.java
@@ -17,6 +17,7 @@
package org.apache.doris.tls.server;
+import org.apache.doris.arrowflight.DorisFlightSqlService;
import org.apache.doris.common.Config;
import org.apache.doris.common.ThriftServer;
import org.apache.doris.metric.MetricRepo;
@@ -25,7 +26,6 @@ import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ConnectScheduler;
import org.apache.doris.service.ExecuteEnv;
import org.apache.doris.service.FrontendServiceImpl;
-import org.apache.doris.service.arrowflight.DorisFlightSqlService;
import org.apache.doris.thrift.FrontendService;
import org.apache.logging.log4j.LogManager;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/DorisFlightSqlProducerTest.java
similarity index 98%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducerTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/DorisFlightSqlProducerTest.java
index 4a90b35a088..60d146ce41f 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/DorisFlightSqlProducerTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/DorisFlightSqlProducerTest.java
@@ -15,13 +15,13 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
+import org.apache.doris.arrowflight.results.FlightSqlChannel;
+import org.apache.doris.arrowflight.sessions.FlightSessionsManager;
import org.apache.doris.common.FeConstants;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.StmtExecutor;
-import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
-import org.apache.doris.service.arrowflight.sessions.FlightSessionsManager;
import org.apache.arrow.flight.FlightDescriptor;
import org.apache.arrow.flight.FlightProducer.CallContext;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/FlightSqlJDBC.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlJDBC.java
similarity index 98%
rename from fe/fe-core/src/test/java/org/apache/doris/service/FlightSqlJDBC.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlJDBC.java
index a3c294bd7a2..da80b58c4e7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/service/FlightSqlJDBC.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlJDBC.java
@@ -16,7 +16,7 @@
// under the License.
// This file is copied from
-package org.apache.doris.service;
+package org.apache.doris.arrowflight;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
similarity index 99%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
index cb30f9ca23a..d7ffadfc121 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/FlightSqlSchemaHelperArrowTypeTest.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight;
+package org.apache.doris.arrowflight;
import org.apache.doris.common.jmockit.Deencapsulation;
import org.apache.doris.thrift.TColumnDesc;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
similarity index 98%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
index 76ded9f6301..4567f97c58d 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/auth2/FlightRemoteIpServerStreamTracerTest.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.auth2;
+package org.apache.doris.arrowflight.auth2;
import io.grpc.Attributes;
import io.grpc.Context;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapterTest.java
similarity index 99%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapterTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapterTest.java
index 6328788dc68..d4e33fa068f 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/protocol/FlightProtocolAdapterTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/protocol/FlightProtocolAdapterTest.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.protocol;
+package org.apache.doris.arrowflight.protocol;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.util.DebugUtil;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSessionClientIpTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSessionClientIpTest.java
similarity index 98%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSessionClientIpTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSessionClientIpTest.java
index 45a8375f767..012ea49eda5 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSessionClientIpTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSessionClientIpTest.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
import org.apache.doris.analysis.UserIdentity;
import org.apache.doris.catalog.Env;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
similarity index 96%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
index d18de94becc..ad68d0dc99c 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlConnectPoolMgrTest.java
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
+import org.apache.doris.arrowflight.results.FlightSqlChannel;
import org.apache.doris.qe.ConnectContext;
-import org.apache.doris.service.arrowflight.results.FlightSqlChannel;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
similarity index 99%
rename from
fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
rename to
fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
index c94782bedfc..7569c4b557c 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/service/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/arrowflight/sessions/FlightSqlDeferredQueryIdleTimeoutTest.java
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-package org.apache.doris.service.arrowflight.sessions;
+package org.apache.doris.arrowflight.sessions;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/mysql/ConnectionExceedTest.java
b/fe/fe-core/src/test/java/org/apache/doris/mysql/ConnectionExceedTest.java
index 3fbae96e1b5..813a796c856 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mysql/ConnectionExceedTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/ConnectionExceedTest.java
@@ -18,6 +18,9 @@
package org.apache.doris.mysql;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.sessions.FlightSessionsWithTokenManager;
+import org.apache.doris.arrowflight.tokens.FlightTokenDetails;
+import org.apache.doris.arrowflight.tokens.FlightTokenManager;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.datasource.InternalCatalog;
@@ -28,9 +31,6 @@ import org.apache.doris.qe.ConnectProcessor;
import org.apache.doris.qe.ConnectScheduler;
import org.apache.doris.qe.QueryState;
import org.apache.doris.service.ExecuteEnv;
-import
org.apache.doris.service.arrowflight.sessions.FlightSessionsWithTokenManager;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenDetails;
-import org.apache.doris.service.arrowflight.tokens.FlightTokenManager;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/mysql/protocol/MysqlProtocolAdapterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/mysql/protocol/MysqlProtocolAdapterTest.java
index 7efa3ec9e14..f84af0a6668 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/mysql/protocol/MysqlProtocolAdapterTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/mysql/protocol/MysqlProtocolAdapterTest.java
@@ -17,6 +17,7 @@
package org.apache.doris.mysql.protocol;
+import org.apache.doris.arrowflight.protocol.FlightProtocolAdapter;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.mysql.DummyMysqlChannel;
@@ -27,7 +28,6 @@ import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.ConnectContext.ConnectType;
import org.apache.doris.qe.ConnectProcessor;
import org.apache.doris.qe.ConnectScheduler;
-import org.apache.doris.service.arrowflight.protocol.FlightProtocolAdapter;
import org.apache.doris.thrift.TResultSinkType;
import org.apache.doris.thrift.TUniqueId;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditLogWorkloadGroupTest.java
b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditLogWorkloadGroupTest.java
index 5eaf4109632..b7c0e13f417 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/qe/AuditLogWorkloadGroupTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/qe/AuditLogWorkloadGroupTest.java
@@ -19,6 +19,7 @@ package org.apache.doris.qe;
import org.apache.doris.analysis.StatementBase;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.FlightSqlConnectProcessor;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.Config;
import org.apache.doris.common.ConnectionException;
@@ -27,7 +28,6 @@ import org.apache.doris.mysql.privilege.Auth;
import org.apache.doris.proto.Data;
import org.apache.doris.qe.ConnectContext.ConnectType;
import org.apache.doris.resource.workloadgroup.WorkloadGroupMgr;
-import org.apache.doris.service.arrowflight.FlightSqlConnectProcessor;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/qe/protocol/FlightResultGoldenTest.java
b/fe/fe-core/src/test/java/org/apache/doris/qe/protocol/FlightResultGoldenTest.java
index e4faba27434..47108b10495 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/qe/protocol/FlightResultGoldenTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/qe/protocol/FlightResultGoldenTest.java
@@ -18,12 +18,12 @@
package org.apache.doris.qe.protocol;
import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.arrowflight.FlightSqlConnectProcessor;
+import org.apache.doris.arrowflight.results.FlightSqlResultCacheEntry;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.QueryState.MysqlStateType;
-import org.apache.doris.service.arrowflight.FlightSqlConnectProcessor;
-import org.apache.doris.service.arrowflight.results.FlightSqlResultCacheEntry;
import org.apache.doris.utframe.TestWithFeService;
import com.google.common.collect.Lists;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
