diff --git a/.github/labeler.yml b/.github/labeler.yml index 754a949930d2..341cff1da3f2 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -24,7 +24,7 @@ - changed-files: - any-glob-to-any-file: - 'indexing-hadoop/**' - - 'extensions-core/multi-stage-query/**' + - 'multi-stage-query/**' 'Area - Dependencies': - changed-files: @@ -61,13 +61,13 @@ 'Area - MSQ': - changed-files: - any-glob-to-any-file: - - 'extensions-core/multi-stage-query/**' + - 'multi-stage-query/**' 'Area - Querying': - changed-files: - any-glob-to-any-file: - 'sql/**' - - 'extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/**' + - 'multi-stage-query/src/main/java/org/apache/druid/msq/sql/**' 'Area - Segment Format and Ser/De': - changed-files: diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 53a48232a861..247102c09840 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -223,13 +223,13 @@ test - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} test - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} tests diff --git a/distribution/docker/environment b/distribution/docker/environment index 8d8f465a1836..f4dbb0914b6b 100644 --- a/distribution/docker/environment +++ b/distribution/docker/environment @@ -27,7 +27,7 @@ DRUID_SINGLE_NODE_CONF=micro-quickstart druid_emitter_logging_logLevel=debug -druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage", "druid-multi-stage-query"] +druid_extensions_loadList=["druid-histogram", "druid-datasketches", "druid-lookups-cached-global", "postgresql-metadata-storage"] druid_zk_service_host=zookeeper diff --git a/distribution/pom.xml b/distribution/pom.xml index ea2be179b325..d13b313837de 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -222,8 +222,6 @@ -c org.apache.druid.extensions:druid-lookups-cached-single -c - org.apache.druid.extensions:druid-multi-stage-query - -c org.apache.druid.extensions:druid-protobuf-extensions -c org.apache.druid.extensions:mysql-metadata-storage @@ -527,8 +525,6 @@ -c org.apache.druid.extensions:druid-lookups-cached-global -c - org.apache.druid.extensions:druid-multi-stage-query - -c org.apache.druid.extensions:druid-protobuf-extensions -c org.apache.druid.extensions:mysql-metadata-storage diff --git a/embedded-tests/pom.xml b/embedded-tests/pom.xml index e740826e5a7e..b9f663429d3e 100644 --- a/embedded-tests/pom.xml +++ b/embedded-tests/pom.xml @@ -60,7 +60,7 @@ ${project.parent.version} - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} diff --git a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/IngestionSmokeTest.java b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/IngestionSmokeTest.java index 4e70a09909b6..5b5f4e5083c2 100644 --- a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/IngestionSmokeTest.java +++ b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/IngestionSmokeTest.java @@ -42,12 +42,6 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.parsers.CloseableIterator; import org.apache.druid.metadata.storage.postgresql.PostgreSQLMetadataStorageModule; -import org.apache.druid.msq.guice.IndexerMemoryManagementModule; -import org.apache.druid.msq.guice.MSQDurableStorageModule; -import org.apache.druid.msq.guice.MSQExternalDataSourceModule; -import org.apache.druid.msq.guice.MSQIndexingModule; -import org.apache.druid.msq.guice.MSQSqlModule; -import org.apache.druid.msq.guice.SqlTaskModule; import org.apache.druid.query.DruidMetrics; import org.apache.druid.query.http.SqlTaskStatus; import org.apache.druid.segment.indexing.DataSchema; @@ -117,13 +111,7 @@ public EmbeddedDruidCluster createCluster() .addExtensions( KafkaIndexTaskModule.class, LatchableEmitterModule.class, - PostgreSQLMetadataStorageModule.class, - MSQSqlModule.class, - SqlTaskModule.class, - MSQIndexingModule.class, - MSQDurableStorageModule.class, - MSQExternalDataSourceModule.class, - IndexerMemoryManagementModule.class + PostgreSQLMetadataStorageModule.class ) .addResource(new PostgreSQLMetadataResource()) .addResource(new MinIOStorageResource()) diff --git a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedDurableShuffleStorageTest.java b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedDurableShuffleStorageTest.java index 9a7aba6bf8dd..9813e978709d 100644 --- a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedDurableShuffleStorageTest.java +++ b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedDurableShuffleStorageTest.java @@ -24,17 +24,7 @@ import org.apache.druid.indexer.TaskState; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.StringUtils; -import org.apache.druid.msq.dart.guice.DartControllerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartControllerModule; -import org.apache.druid.msq.dart.guice.DartWorkerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartWorkerModule; import org.apache.druid.msq.exec.OutputChannelMode; -import org.apache.druid.msq.guice.IndexerMemoryManagementModule; -import org.apache.druid.msq.guice.MSQDurableStorageModule; -import org.apache.druid.msq.guice.MSQExternalDataSourceModule; -import org.apache.druid.msq.guice.MSQIndexingModule; -import org.apache.druid.msq.guice.MSQSqlModule; -import org.apache.druid.msq.guice.SqlTaskModule; import org.apache.druid.msq.indexing.destination.MSQSelectDestination; import org.apache.druid.msq.indexing.report.MSQStagesReport; import org.apache.druid.msq.indexing.report.MSQTaskReportPayload; @@ -101,19 +91,7 @@ public EmbeddedDruidCluster createCluster() return EmbeddedDruidCluster .withEmbeddedDerbyAndZookeeper() .useLatchableEmitter() - .addExtensions( - DartControllerModule.class, - DartWorkerModule.class, - DartControllerMemoryManagementModule.class, - DartWorkerMemoryManagementModule.class, - IndexerMemoryManagementModule.class, - MSQDurableStorageModule.class, - MSQIndexingModule.class, - MSQSqlModule.class, - SqlTaskModule.class, - MSQExternalDataSourceModule.class, - S3StorageConnectorModule.class - ) + .addExtensions(S3StorageConnectorModule.class) .addResource(storageResource) .addResource(msqStorageResource) .addServer(coordinator) diff --git a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeQueryTest.java b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeQueryTest.java index 165e6b06cc12..502482cce778 100644 --- a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeQueryTest.java +++ b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeQueryTest.java @@ -22,15 +22,6 @@ import org.apache.druid.client.indexing.TaskStatusResponse; import org.apache.druid.indexer.TaskState; import org.apache.druid.java.util.common.StringUtils; -import org.apache.druid.msq.dart.guice.DartControllerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartControllerModule; -import org.apache.druid.msq.dart.guice.DartWorkerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartWorkerModule; -import org.apache.druid.msq.guice.IndexerMemoryManagementModule; -import org.apache.druid.msq.guice.MSQDurableStorageModule; -import org.apache.druid.msq.guice.MSQIndexingModule; -import org.apache.druid.msq.guice.MSQSqlModule; -import org.apache.druid.msq.guice.SqlTaskModule; import org.apache.druid.msq.indexing.report.MSQTaskReportPayload; import org.apache.druid.query.DruidMetrics; import org.apache.druid.query.http.SqlTaskStatus; @@ -119,17 +110,6 @@ public EmbeddedDruidCluster createCluster() .addProperty("druid.lookup.enableLookupSyncOnStartup", "true"); return clusterWithKafka - .addExtensions( - DartControllerModule.class, - DartWorkerModule.class, - DartControllerMemoryManagementModule.class, - DartWorkerMemoryManagementModule.class, - IndexerMemoryManagementModule.class, - MSQDurableStorageModule.class, - MSQIndexingModule.class, - MSQSqlModule.class, - SqlTaskModule.class - ) .addCommonProperty("druid.monitoring.emissionPeriod", "PT0.1s") .addCommonProperty("druid.msq.dart.enabled", "true") .useLatchableEmitter() diff --git a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeUnnestQueryTest.java b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeUnnestQueryTest.java index cb38ce54acc6..728e7dc2e1f5 100644 --- a/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeUnnestQueryTest.java +++ b/embedded-tests/src/test/java/org/apache/druid/testing/embedded/msq/EmbeddedMSQRealtimeUnnestQueryTest.java @@ -20,15 +20,6 @@ package org.apache.druid.testing.embedded.msq; import org.apache.druid.java.util.common.StringUtils; -import org.apache.druid.msq.dart.guice.DartControllerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartControllerModule; -import org.apache.druid.msq.dart.guice.DartWorkerMemoryManagementModule; -import org.apache.druid.msq.dart.guice.DartWorkerModule; -import org.apache.druid.msq.guice.IndexerMemoryManagementModule; -import org.apache.druid.msq.guice.MSQDurableStorageModule; -import org.apache.druid.msq.guice.MSQIndexingModule; -import org.apache.druid.msq.guice.MSQSqlModule; -import org.apache.druid.msq.guice.SqlTaskModule; import org.apache.druid.msq.indexing.report.MSQTaskReportPayload; import org.apache.druid.query.DruidMetrics; import org.apache.druid.segment.QueryableIndex; @@ -84,17 +75,6 @@ public EmbeddedDruidCluster createCluster() .addProperty("druid.worker.capacity", "4"); return clusterWithKafka - .addExtensions( - DartControllerModule.class, - DartWorkerModule.class, - DartControllerMemoryManagementModule.class, - DartWorkerMemoryManagementModule.class, - IndexerMemoryManagementModule.class, - MSQDurableStorageModule.class, - MSQIndexingModule.class, - MSQSqlModule.class, - SqlTaskModule.class - ) .addCommonProperty("druid.monitoring.emissionPeriod", "PT0.1s") .addCommonProperty("druid.msq.dart.enabled", "true") .useLatchableEmitter() diff --git a/examples/conf/druid/auto/_common/common.runtime.properties b/examples/conf/druid/auto/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/auto/_common/common.runtime.properties +++ b/examples/conf/druid/auto/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/cluster/_common/common.runtime.properties b/examples/conf/druid/cluster/_common/common.runtime.properties index 79b0eb311a6a..383d03e57099 100644 --- a/examples/conf/druid/cluster/_common/common.runtime.properties +++ b/examples/conf/druid/cluster/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/large/_common/common.runtime.properties b/examples/conf/druid/single-server/large/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/large/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/large/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/medium/_common/common.runtime.properties b/examples/conf/druid/single-server/medium/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/medium/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/medium/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties b/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties b/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/small/_common/common.runtime.properties b/examples/conf/druid/single-server/small/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/small/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/small/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties b/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties index 1af96555aaca..54bf8a2ca9b5 100644 --- a/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties @@ -24,7 +24,7 @@ # If you specify `druid.extensions.loadList=[]`, Druid won't load any extension from file system. # If you don't specify `druid.extensions.loadList`, Druid will load all the extensions under root extension directory. # More info: https://druid.apache.org/docs/latest/operations/including-extensions.html -druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-multi-stage-query", "druid-parquet-extensions"] +druid.extensions.loadList=["druid-hdfs-storage", "druid-kafka-indexing-service", "druid-datasketches", "druid-parquet-extensions"] # If you have a different version of Hadoop, place your Hadoop client jar files in your hadoop-dependencies directory # and uncomment the line below to point to your directory. diff --git a/extensions-core/druid-catalog/pom.xml b/extensions-core/druid-catalog/pom.xml index 80d64d7b46e9..afb0db2c26f4 100644 --- a/extensions-core/druid-catalog/pom.xml +++ b/extensions-core/druid-catalog/pom.xml @@ -54,6 +54,12 @@ ${project.parent.version} provided + + org.apache.druid + druid-multi-stage-query + ${project.parent.version} + provided + com.google.inject guice diff --git a/extensions-core/multi-stage-query/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule b/extensions-core/multi-stage-query/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule deleted file mode 100644 index 1058d5d5f99e..000000000000 --- a/extensions-core/multi-stage-query/src/main/resources/META-INF/services/org.apache.druid.initialization.DruidModule +++ /dev/null @@ -1,26 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.druid.msq.dart.guice.DartControllerMemoryManagementModule -org.apache.druid.msq.dart.guice.DartControllerModule -org.apache.druid.msq.dart.guice.DartWorkerMemoryManagementModule -org.apache.druid.msq.dart.guice.DartWorkerModule -org.apache.druid.msq.guice.IndexerMemoryManagementModule -org.apache.druid.msq.guice.MSQDurableStorageModule -org.apache.druid.msq.guice.MSQExternalDataSourceModule -org.apache.druid.msq.guice.MSQIndexingModule -org.apache.druid.msq.guice.MSQSqlModule -org.apache.druid.msq.guice.PeonMemoryManagementModule -org.apache.druid.msq.guice.SqlTaskModule diff --git a/integration-tests-ex/cases/pom.xml b/integration-tests-ex/cases/pom.xml index a9a649dff292..e6da4fcf843d 100644 --- a/integration-tests-ex/cases/pom.xml +++ b/integration-tests-ex/cases/pom.xml @@ -253,7 +253,7 @@ ${project.parent.version} - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} provided diff --git a/integration-tests/docker/environment-configs/common b/integration-tests/docker/environment-configs/common index 0588813de2d6..49d3c2394139 100644 --- a/integration-tests/docker/environment-configs/common +++ b/integration-tests/docker/environment-configs/common @@ -28,7 +28,7 @@ DRUID_DEP_LIB_DIR=/shared/hadoop_xml:/shared/docker/lib/*:/usr/local/druid/lib/m # Druid configs # If you are making a change in load list below, make the necessary changes in github actions too -druid_extensions_loadList=["mysql-metadata-storage","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches","druid-parquet-extensions","druid-avro-extensions","druid-protobuf-extensions","druid-orc-extensions","druid-kafka-indexing-service","druid-s3-extensions","druid-multi-stage-query"] +druid_extensions_loadList=["mysql-metadata-storage","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches","druid-parquet-extensions","druid-avro-extensions","druid-protobuf-extensions","druid-orc-extensions","druid-kafka-indexing-service","druid-s3-extensions"] druid_startup_logging_logProperties=true druid_extensions_directory=/shared/docker/extensions druid_auth_authenticator_basic_authorizerName=basic diff --git a/integration-tests/docker/environment-configs/common-ldap b/integration-tests/docker/environment-configs/common-ldap index bd1a1c4fa44b..d24ee0f23191 100644 --- a/integration-tests/docker/environment-configs/common-ldap +++ b/integration-tests/docker/environment-configs/common-ldap @@ -29,7 +29,7 @@ DRUID_DEP_LIB_DIR=/shared/hadoop_xml:/shared/docker/lib/*:/usr/local/druid/lib/m # Druid configs # If you are making a change in load list below, make the necessary changes in github actions too -druid_extensions_loadList=["mysql-metadata-storage","druid-s3-extensions","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches","druid-multi-stage-query"] +druid_extensions_loadList=["mysql-metadata-storage","druid-s3-extensions","druid-basic-security","simple-client-sslcontext","druid-testing-tools","druid-lookups-cached-global","druid-histogram","druid-datasketches"] druid_extensions_directory=/shared/docker/extensions druid_auth_authenticator_ldap_authorizerName=ldapauth druid_auth_authenticator_ldap_initialAdminPassword=priest diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 79f5eaea22db..a2c9a1a10c13 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -223,7 +223,7 @@ ${project.parent.version} - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} diff --git a/extensions-core/multi-stage-query/README.md b/multi-stage-query/README.md similarity index 100% rename from extensions-core/multi-stage-query/README.md rename to multi-stage-query/README.md diff --git a/extensions-core/multi-stage-query/pom.xml b/multi-stage-query/pom.xml similarity index 96% rename from extensions-core/multi-stage-query/pom.xml rename to multi-stage-query/pom.xml index d2d023af93b8..acc0f6b00f94 100644 --- a/extensions-core/multi-stage-query/pom.xml +++ b/multi-stage-query/pom.xml @@ -23,7 +23,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.apache.druid.extensions druid-multi-stage-query druid-multi-stage-query druid-multi-stage-query @@ -32,7 +31,6 @@ org.apache.druid druid 35.0.0-SNAPSHOT - ../../pom.xml @@ -60,12 +58,6 @@ ${project.parent.version} provided - - org.apache.druid - druid-services - ${project.parent.version} - provided - com.google.inject guice @@ -156,6 +148,12 @@ javax.servlet-api provided + + javax.inject + javax.inject + 1 + provided + com.sun.jersey jersey-server @@ -333,12 +331,6 @@ test-jar test - - org.apache.druid.extensions - druid-catalog - ${project.parent.version} - test - org.apache.druid.extensions.contrib druid-compressed-bigdecimal diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java b/multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java similarity index 100% rename from extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java rename to multi-stage-query/src/main/java/org/apache/druid/catalog/sql/LiveCatalogResolver.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/ChannelCounters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/ChannelCounters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/ChannelCounters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/ChannelCounters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterNames.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterNames.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterNames.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterNames.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshots.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshots.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshots.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshots.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsSerializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsSerializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsSerializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsSerializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsTree.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsTree.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsTree.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterSnapshotsTree.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterTracker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterTracker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterTracker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CounterTracker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounter.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounter.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounter.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounter.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuCounters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingProcessorManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingProcessorManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingProcessorManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/CpuTimeAccumulatingProcessorManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/NilQueryCounterSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/NilQueryCounterSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/NilQueryCounterSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/NilQueryCounterSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounter.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounter.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounter.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounter.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounterSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounterSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounterSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/QueryCounterSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounter.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounter.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounter.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounter.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGeneratorMetricsWrapper.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGeneratorMetricsWrapper.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGeneratorMetricsWrapper.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/SegmentGeneratorMetricsWrapper.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SuperSorterProgressTrackerCounter.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SuperSorterProgressTrackerCounter.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/SuperSorterProgressTrackerCounter.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/SuperSorterProgressTrackerCounter.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/WarningCounters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/counters/WarningCounters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/counters/WarningCounters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/counters/WarningCounters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/Dart.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/Dart.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/Dart.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/Dart.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/DartResourcePermissionMapper.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/DartResourcePermissionMapper.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/DartResourcePermissionMapper.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/DartResourcePermissionMapper.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerHolder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerHolder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerHolder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerHolder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerMessageListener.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerMessageListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerMessageListener.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/ControllerMessageListener.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactoryImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactoryImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactoryImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerContextFactoryImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerRegistry.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerRegistry.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerRegistry.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartControllerRegistry.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelayFactoryImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelayFactoryImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelayFactoryImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelayFactoryImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelays.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelays.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelays.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartMessageRelays.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartSegmentAssignment.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartSegmentAssignment.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartSegmentAssignment.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartSegmentAssignment.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartWorkerManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartWorkerManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartWorkerManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/DartWorkerManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartQueryInfo.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartQueryInfo.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartQueryInfo.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/http/DartQueryInfo.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ControllerMessage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ControllerMessage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ControllerMessage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ControllerMessage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/DoneReadingInput.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/DoneReadingInput.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/DoneReadingInput.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/DoneReadingInput.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/PartialKeyStatistics.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/PartialKeyStatistics.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/PartialKeyStatistics.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/PartialKeyStatistics.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ResultsComplete.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ResultsComplete.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ResultsComplete.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/ResultsComplete.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerError.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerError.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerError.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerError.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerWarning.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerWarning.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerWarning.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/messages/WorkerWarning.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactoryImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactoryImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactoryImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientFactoryImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClients.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClients.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClients.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlClients.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlEngine.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlEngine.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlEngine.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartSqlEngine.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/PrePlannedDartQueryMaker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/PrePlannedDartQueryMaker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/PrePlannedDartQueryMaker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/PrePlannedDartQueryMaker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerMemoryManagementModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerMemoryManagementModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerMemoryManagementModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerMemoryManagementModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartControllerModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartModules.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartModules.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartModules.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartModules.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerMemoryManagementModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerMemoryManagementModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerMemoryManagementModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerMemoryManagementModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/guice/DartWorkerModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartControllerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartControllerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartControllerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartControllerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataSegmentProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataSegmentProvider.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataSegmentProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataSegmentProvider.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandlerFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandlerFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandlerFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartDataServerQueryHandlerFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartFrameContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartFrameContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartFrameContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartFrameContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProvider.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProvider.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartQueryableSegment.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartQueryableSegment.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartQueryableSegment.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartQueryableSegment.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClientImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClientImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClientImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerClientImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactoryImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactoryImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactoryImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerContextFactoryImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRetryPolicy.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRetryPolicy.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRetryPolicy.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRetryPolicy.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRunner.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRunner.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRunner.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/DartWorkerRunner.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/WorkerId.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/WorkerId.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/WorkerId.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/WorkerId.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfo.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfo.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfo.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfo.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerResource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerResource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerResource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/DartWorkerResource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponse.java b/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponse.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponse.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponse.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ClusterStatisticsMergeMode.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ClusterStatisticsMergeMode.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ClusterStatisticsMergeMode.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ClusterStatisticsMergeMode.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/Controller.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerMemoryParameters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerMemoryParameters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerMemoryParameters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerMemoryParameters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerQueryResultsReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerQueryResultsReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerQueryResultsReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerQueryResultsReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryResult.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryResult.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryResult.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/DataServerQueryResult.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContextImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContextImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContextImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExecutionContextImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExportMetadataManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExportMetadataManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExportMetadataManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExportMetadataManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExtraInfoHolder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExtraInfoHolder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExtraInfoHolder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExtraInfoHolder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameWriterSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameWriterSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameWriterSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/FrameWriterSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Limits.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Limits.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Limits.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/Limits.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ListeningOutputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ListeningOutputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ListeningOutputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ListeningOutputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetriceEventBuilder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetriceEventBuilder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetriceEventBuilder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQMetriceEventBuilder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/MSQTasks.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospectorImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospectorImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospectorImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/MemoryIntrospectorImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/OutputChannelMode.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/OutputChannelMode.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/OutputChannelMode.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/OutputChannelMode.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffers.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffers.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffers.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffers.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersProvider.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersProvider.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitBasedMSQPlanner.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitBasedMSQPlanner.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitBasedMSQPlanner.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitBasedMSQPlanner.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryKitSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryListener.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryListener.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryListener.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryValidator.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryValidator.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryValidator.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/QueryValidator.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ResultsContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ResultsContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ResultsContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/ResultsContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RetryCapableWorkerManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RetryCapableWorkerManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RetryCapableWorkerManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/RetryCapableWorkerManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrderListener.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrderListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrderListener.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrderListener.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentSource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentSource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentSource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/SegmentSource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/StageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/StageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/StageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/StageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/TaskDataSegmentProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/TaskDataSegmentProvider.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/TaskDataSegmentProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/TaskDataSegmentProvider.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Worker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Worker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/Worker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/Worker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerFailureListener.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerFailureListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerFailureListener.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerFailureListener.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerMemoryParameters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerMemoryParameters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerMemoryParameters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerMemoryParameters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerRunRef.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerRunRef.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerRunRef.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerRunRef.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStats.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStats.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStats.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStats.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStorageParameters.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStorageParameters.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStorageParameters.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerStorageParameters.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/BasicStandardStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/BasicStandardStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/BasicStandardStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/BasicStandardStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ProcessorsAndChannels.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ProcessorsAndChannels.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ProcessorsAndChannels.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ProcessorsAndChannels.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ResultAndChannels.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ResultAndChannels.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ResultAndChannels.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/ResultAndChannels.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardShuffleOperations.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardShuffleOperations.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardShuffleOperations.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardShuffleOperations.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageRunner.java b/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageRunner.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageRunner.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/exec/std/StandardStageRunner.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/IndexerMemoryManagementModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/IndexerMemoryManagementModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/IndexerMemoryManagementModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/IndexerMemoryManagementModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQDurableStorageModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQDurableStorageModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQDurableStorageModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQDurableStorageModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQExternalDataSourceModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQExternalDataSourceModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQExternalDataSourceModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQExternalDataSourceModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQIndexingModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQIndexingModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQIndexingModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQIndexingModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQSqlModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQSqlModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQSqlModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/MSQSqlModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MultiStageQuery.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MultiStageQuery.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/MultiStageQuery.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/MultiStageQuery.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/PeonMemoryManagementModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/PeonMemoryManagementModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/PeonMemoryManagementModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/PeonMemoryManagementModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/SqlTaskModule.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/SqlTaskModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/SqlTaskModule.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/SqlTaskModule.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/TaskMemoryManagementConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/guice/TaskMemoryManagementConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/guice/TaskMemoryManagementConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/guice/TaskMemoryManagementConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountableInputSourceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountableInputSourceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountableInputSourceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountableInputSourceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingOutputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingOutputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingOutputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingOutputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingReadableFrameChannel.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingReadableFrameChannel.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingReadableFrameChannel.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingReadableFrameChannel.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingWritableFrameChannel.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingWritableFrameChannel.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingWritableFrameChannel.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/CountingWritableFrameChannel.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerControllerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerFrameContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerFrameContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerFrameContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerFrameContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java similarity index 97% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java index 52679462fe5c..c619f357b3d9 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java +++ b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerProcessingBuffersProvider.java @@ -19,7 +19,6 @@ package org.apache.druid.msq.indexing; -import org.apache.druid.cli.CliIndexer; import org.apache.druid.collections.ReferenceCountingResourceHolder; import org.apache.druid.collections.ResourceHolder; import org.apache.druid.java.util.common.ISE; @@ -31,7 +30,7 @@ import java.util.List; /** - * Production implementation of {@link ProcessingBuffersProvider} for tasks in {@link CliIndexer}. + * Production implementation of {@link ProcessingBuffersProvider} for tasks in {@code CliIndexer}. */ public class IndexerProcessingBuffersProvider implements ProcessingBuffersProvider { diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java similarity index 93% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java index 2dedaf204ec7..8ec98364cd53 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java +++ b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerResourcePermissionMapper.java @@ -19,8 +19,6 @@ package org.apache.druid.msq.indexing; -import org.apache.druid.cli.CliIndexer; -import org.apache.druid.cli.CliPeon; import org.apache.druid.msq.rpc.ResourcePermissionMapper; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; @@ -31,7 +29,7 @@ import java.util.List; /** - * Production implementation of {@link ResourcePermissionMapper} for tasks: {@link CliIndexer} and {@link CliPeon}. + * Production implementation of {@link ResourcePermissionMapper} for tasks: {@code CliIndexer} and {@code CliPeon}. */ public class IndexerResourcePermissionMapper implements ResourcePermissionMapper { diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerTableInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerTableInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerTableInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerTableInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerWorkerContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerWorkerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerWorkerContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/IndexerWorkerContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelsImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelsImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelsImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/InputChannelsImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/LegacyMSQSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/LegacyMSQSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/LegacyMSQSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/LegacyMSQSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQControllerTask.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQControllerTask.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQControllerTask.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQControllerTask.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQPartitionAssignment.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQPartitionAssignment.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQPartitionAssignment.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQPartitionAssignment.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTaskList.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTaskList.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTaskList.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTaskList.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTuningConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTuningConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTuningConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQTuningConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTask.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTask.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTask.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTask.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java similarity index 98% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java index 56a14b516cb8..9143ce630db5 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java +++ b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeonProcessingBuffersProvider.java @@ -19,7 +19,6 @@ package org.apache.druid.msq.indexing; -import org.apache.druid.cli.CliPeon; import org.apache.druid.collections.NonBlockingPool; import org.apache.druid.collections.ReferenceCountingResourceHolder; import org.apache.druid.collections.ResourceHolder; @@ -35,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** - * Production implementation of {@link ProcessingBuffersProvider} for tasks in {@link CliPeon}. + * Production implementation of {@link ProcessingBuffersProvider} for tasks in {@code CliPeon}. */ public class PeonProcessingBuffersProvider implements ProcessingBuffersProvider { diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeriodicControllerChecker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeriodicControllerChecker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeriodicControllerChecker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/PeriodicControllerChecker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/QueryDefMSQSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/QueryDefMSQSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/QueryDefMSQSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/QueryDefMSQSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/TaskReportQueryListener.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/TaskReportQueryListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/TaskReportQueryListener.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/TaskReportQueryListener.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/WorkerCount.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/WorkerCount.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/WorkerCount.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/WorkerCount.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleaner.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleaner.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleaner.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleaner.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleanerConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleanerConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleanerConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/cleaner/DurableStorageCleanerConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/ControllerChatHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/ControllerChatHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/ControllerChatHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/ControllerChatHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerControllerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerWorkerClient.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerWorkerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerWorkerClient.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/IndexerWorkerClient.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/SketchResponseHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/SketchResponseHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/SketchResponseHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/SketchResponseHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/WorkerChatHandler.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/WorkerChatHandler.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/WorkerChatHandler.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/client/WorkerChatHandler.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DurableStorageMSQDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DurableStorageMSQDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DurableStorageMSQDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/DurableStorageMSQDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/ExportMSQDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/ExportMSQDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/ExportMSQDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/ExportMSQDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQSelectDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQSelectDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQSelectDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQSelectDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQTerminalStageSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQTerminalStageSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQTerminalStageSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/MSQTerminalStageSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationStageSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationStageSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationStageSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationStageSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationTerminalStageSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationTerminalStageSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationTerminalStageSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationTerminalStageSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/SegmentGenerationUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TaskReportMSQDestination.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TaskReportMSQDestination.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TaskReportMSQDestination.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TaskReportMSQDestination.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TerminalStageSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TerminalStageSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TerminalStageSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/destination/TerminalStageSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BaseMSQFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BaseMSQFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BaseMSQFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BaseMSQFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CanceledFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CanceledFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CanceledFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CanceledFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CancellationReason.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CancellationReason.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CancellationReason.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CancellationReason.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CannotParseExternalDataFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CannotParseExternalDataFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CannotParseExternalDataFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/CannotParseExternalDataFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnNameRestrictedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnNameRestrictedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnNameRestrictedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnNameRestrictedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnTypeNotSupportedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnTypeNotSupportedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnTypeNotSupportedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/ColumnTypeNotSupportedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/DurableStorageConfigurationFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/DurableStorageConfigurationFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/DurableStorageConfigurationFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/DurableStorageConfigurationFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/FaultsExceededChecker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/FaultsExceededChecker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/FaultsExceededChecker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/FaultsExceededChecker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotAllocateSegmentFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotAllocateSegmentFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotAllocateSegmentFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotAllocateSegmentFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotBeEmptyFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotBeEmptyFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotBeEmptyFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertCannotBeEmptyFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeNullFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeNullFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeNullFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeNullFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeOutOfBoundsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeOutOfBoundsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeOutOfBoundsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InsertTimeOutOfBoundsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidFieldFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidFieldFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidFieldFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidFieldFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidNullByteFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidNullByteFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidNullByteFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/InvalidNullByteFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQErrorReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQException.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQException.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQException.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQException.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFaultUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFaultUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFaultUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQFaultUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportLimiterPublisher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportPublisher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportPublisher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportPublisher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportPublisher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportSimplePublisher.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportSimplePublisher.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportSimplePublisher.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarningReportSimplePublisher.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarnings.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarnings.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarnings.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/MSQWarnings.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughMemoryFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughMemoryFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughMemoryFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughMemoryFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughTemporaryStorageFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughTemporaryStorageFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughTemporaryStorageFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/NotEnoughTemporaryStorageFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryNotSupportedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryNotSupportedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryNotSupportedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryNotSupportedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/QueryRuntimeFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/RowTooLargeFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/RowTooLargeFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/RowTooLargeFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/RowTooLargeFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TaskStartTimeoutFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TaskStartTimeoutFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TaskStartTimeoutFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TaskStartTimeoutFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForJob.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForJob.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForJob.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForJob.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForWorker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForWorker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForWorker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyAttemptsForWorker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyBucketsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyBucketsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyBucketsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyBucketsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyClusteredByColumnsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyClusteredByColumnsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyClusteredByColumnsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyClusteredByColumnsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyColumnsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyColumnsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyColumnsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyColumnsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyInputFilesFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyInputFilesFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyInputFilesFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyInputFilesFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyPartitionsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyPartitionsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyPartitionsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyPartitionsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsInAWindowFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsInAWindowFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsInAWindowFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsInAWindowFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsWithSameKeyFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsWithSameKeyFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsWithSameKeyFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyRowsWithSameKeyFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManySegmentsInTimeChunkFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManySegmentsInTimeChunkFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManySegmentsInTimeChunkFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManySegmentsInTimeChunkFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWarningsFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWarningsFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWarningsFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWarningsFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWorkersFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWorkersFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWorkersFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/TooManyWorkersFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/UnknownFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/UnknownFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/UnknownFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/UnknownFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerFailedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerFailedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerFailedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerFailedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerRpcFailedFault.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerRpcFailedFault.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerRpcFailedFault.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/WorkerRpcFailedFault.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/KeyStatisticsCollectionProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/KeyStatisticsCollectionProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/KeyStatisticsCollectionProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/KeyStatisticsCollectionProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQResultsReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQResultsReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQResultsReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQResultsReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQSegmentReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQSegmentReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQSegmentReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQSegmentReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStagesReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStagesReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStagesReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStagesReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStatusReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStatusReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStatusReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQStatusReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReport.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReport.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReport.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReport.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReportPayload.java b/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReportPayload.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReportPayload.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/indexing/report/MSQTaskReportPayload.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlices.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlices.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlices.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSlices.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicerFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicerFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicerFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecSlicerFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecs.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecs.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecs.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/InputSpecs.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/MapInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/NilInputSource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ParseExceptionUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/ParseExceptionUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ParseExceptionUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/ParseExceptionUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInput.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInput.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInput.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInput.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInputs.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInputs.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInputs.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/ReadableInputs.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/SlicerUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/SlicerUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/SlicerUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/SlicerUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/inline/InlineInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/lookup/LookupInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CollectedReadablePartitions.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CollectedReadablePartitions.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CollectedReadablePartitions.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CollectedReadablePartitions.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CombinedReadablePartitions.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CombinedReadablePartitions.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CombinedReadablePartitions.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/CombinedReadablePartitions.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/InputChannels.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/InputChannels.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/InputChannels.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/InputChannels.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartition.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartition.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartition.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartition.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartitions.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartitions.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartitions.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/ReadablePartitions.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitions.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitions.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitions.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitions.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpecSlicer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpecSlicer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StageInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StripedReadablePartitions.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StripedReadablePartitions.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StripedReadablePartitions.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/stage/StripedReadablePartitions.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataSegmentWithLocation.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataSegmentWithLocation.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataSegmentWithLocation.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataSegmentWithLocation.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerRequestDescriptor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerRequestDescriptor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerRequestDescriptor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerRequestDescriptor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerSelector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerSelector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerSelector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/DataServerSelector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/RichSegmentDescriptor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/RichSegmentDescriptor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/RichSegmentDescriptor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/RichSegmentDescriptor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentWithDescriptor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentWithDescriptor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentWithDescriptor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentWithDescriptor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSlice.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSlice.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSlice.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSliceReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSliceReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSliceReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/SegmentsInputSliceReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/TableInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/TableInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/table/TableInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/input/table/TableInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortMaxCountShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortMaxCountShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortMaxCountShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortMaxCountShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortTargetSizeShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortTargetSizeShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortTargetSizeShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/GlobalSortTargetSizeShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/HashShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/HashShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/HashShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/HashShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/LimitHintJsonIncludeFilter.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/LimitHintJsonIncludeFilter.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/LimitHintJsonIncludeFilter.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/LimitHintJsonIncludeFilter.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/MixShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/MixShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/MixShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/MixShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/NilExtraInfoHolder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/NilExtraInfoHolder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/NilExtraInfoHolder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/NilExtraInfoHolder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinition.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinition.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinition.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinition.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinitionBuilder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinitionBuilder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinitionBuilder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/QueryDefinitionBuilder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleKind.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleKind.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleKind.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleKind.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/ShuffleSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinitionBuilder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinitionBuilder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinitionBuilder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinitionBuilder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageId.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageId.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageId.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageId.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StagePartition.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StagePartition.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StagePartition.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StagePartition.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkOrder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkOrder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkOrder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkOrder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkerAssignmentStrategy.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkerAssignmentStrategy.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkerAssignmentStrategy.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/WorkerAssignmentStrategy.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernel.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernel.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernel.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernel.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfig.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfig.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfig.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfig.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStagePhase.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStagePhase.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStagePhase.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStagePhase.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStageTracker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStageTracker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStageTracker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerStageTracker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerWorkerStagePhase.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerWorkerStagePhase.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerWorkerStagePhase.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/ControllerWorkerStagePhase.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/StageGroup.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/StageGroup.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/StageGroup.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/StageGroup.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/WorkerInputs.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/WorkerInputs.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/WorkerInputs.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/controller/WorkerInputs.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStageKernel.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStageKernel.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStageKernel.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStageKernel.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStagePhase.java b/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStagePhase.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStagePhase.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/kernel/worker/WorkerStagePhase.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/DruidLogicalToQueryDefinitionTranslator.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/DruidLogicalToQueryDefinitionTranslator.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/DruidLogicalToQueryDefinitionTranslator.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/DruidLogicalToQueryDefinitionTranslator.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/LogicalInputSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/LogicalInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/LogicalInputSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/LogicalInputSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/StageMaker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/StageMaker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/StageMaker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/StageMaker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractFrameProcessorStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractFrameProcessorStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractFrameProcessorStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractFrameProcessorStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractLogicalStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractLogicalStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractLogicalStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractLogicalStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractShuffleStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractShuffleStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractShuffleStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/AbstractShuffleStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/FilterStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/FilterStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/FilterStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/FilterStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/GroupByStages.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/GroupByStages.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/GroupByStages.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/GroupByStages.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/LogicalStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/LogicalStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/LogicalStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/LogicalStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/OffsetLimitStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/OffsetLimitStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/OffsetLimitStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/OffsetLimitStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ProjectStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ProjectStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ProjectStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ProjectStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ReadStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ReadStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ReadStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/ReadStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/SortStage.java b/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/SortStage.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/SortStage.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/logical/stages/SortStage.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessorManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessorManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessorManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafFrameProcessorManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseLeafStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ChainedProcessorManager.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ChainedProcessorManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ChainedProcessorManager.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ChainedProcessorManager.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSegmentProvider.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSegmentProvider.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSegmentProvider.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSegmentProvider.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/InputNumberDataSource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/InputNumberDataSource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/InputNumberDataSource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/InputNumberDataSource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/LazyResourceHolder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/LazyResourceHolder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/LazyResourceHolder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/LazyResourceHolder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/MultiQueryKit.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/MultiQueryKit.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/MultiQueryKit.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/MultiQueryKit.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKit.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKit.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKit.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKit.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitSpec.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitSpec.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitSpec.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactories.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactories.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactories.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactories.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/SimpleSegmentMapFnProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/SimpleSegmentMapFnProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/SimpleSegmentMapFnProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/SimpleSegmentMapFnProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryKit.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryKit.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryKit.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryKit.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/OffsetLimitStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPostShuffleStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByPreShuffleStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByQueryKit.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByQueryKit.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByQueryKit.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/groupby/GroupByQueryKit.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ExternalColumnSelectorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ExternalColumnSelectorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ExternalColumnSelectorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ExternalColumnSelectorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryKit.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryKit.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryKit.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryKit.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryStageProcessor.java b/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryStageProcessor.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryStageProcessor.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryStageProcessor.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ControllerResource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ControllerResource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ControllerResource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ControllerResource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/MSQResourceUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/MSQResourceUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/MSQResourceUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/MSQResourceUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ResourcePermissionMapper.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ResourcePermissionMapper.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ResourcePermissionMapper.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/ResourcePermissionMapper.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/SketchEncoding.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/SketchEncoding.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/SketchEncoding.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/SketchEncoding.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageQueryResultsInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageQueryResultsInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageQueryResultsInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageQueryResultsInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageStageInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageStageInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageStageInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/DurableStorageStageInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/MetaInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/MetaInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/MetaInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/MetaInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerOrLocalInputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerOrLocalInputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerOrLocalInputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerOrLocalInputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStream.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStream.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStream.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStream.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageOutputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageOutputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageOutputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageOutputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageQueryResultsOutputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageQueryResultsOutputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageQueryResultsOutputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageQueryResultsOutputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageTaskOutputChannelFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageTaskOutputChannelFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageTaskOutputChannelFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/DurableStorageTaskOutputChannelFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FileStageOutputReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FileStageOutputReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FileStageOutputReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FileStageOutputReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FutureReadableFrameChannel.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FutureReadableFrameChannel.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FutureReadableFrameChannel.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/FutureReadableFrameChannel.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/NilStageOutputReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/NilStageOutputReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/NilStageOutputReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/NilStageOutputReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputHolder.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputHolder.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputHolder.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputHolder.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputReader.java b/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputReader.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputReader.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/output/StageOutputReader.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/DartQueryKitSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/DartQueryKitSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/DartQueryKitSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/DartQueryKitSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryKitSpecFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryKitSpecFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryKitSpecFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryKitSpecFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryMaker.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryMaker.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryMaker.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskQueryMaker.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQTaskSqlEngine.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/SqlStatementState.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/SqlStatementState.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/SqlStatementState.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/SqlStatementState.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypes.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypes.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypes.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypes.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/PageInformation.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/PageInformation.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/PageInformation.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/PageInformation.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ResultSetInformation.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ResultSetInformation.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ResultSetInformation.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/ResultSetInformation.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/SqlStatementResult.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/SqlStatementResult.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/SqlStatementResult.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/entity/SqlStatementResult.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlStatementResource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlStatementResource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlStatementResource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlStatementResource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java b/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImpl.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImpl.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImpl.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/ClusterByStatisticsSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/CompleteKeyStatisticsInformation.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/CompleteKeyStatisticsInformation.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/CompleteKeyStatisticsInformation.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/CompleteKeyStatisticsInformation.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollectorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollectorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollectorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeyCollectorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeySnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeySnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeySnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/DistinctKeySnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectorSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectors.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectors.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectors.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/KeyCollectors.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformation.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformation.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformation.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformation.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollector.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollector.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollector.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollector.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshot.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshot.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshot.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshot.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/ClusterByStatisticsSnapshotSerde.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/ClusterByStatisticsSnapshotSerde.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/ClusterByStatisticsSnapshotSerde.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/ClusterByStatisticsSnapshotSerde.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DelegateOrMinSerializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DelegateOrMinSerializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DelegateOrMinSerializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DelegateOrMinSerializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DistinctSnapshotSerializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DistinctSnapshotSerializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DistinctSnapshotSerializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/DistinctSnapshotSerializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotDeserializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotDeserializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotDeserializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotDeserializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/QuantilesSnapshotSerializer.java b/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/QuantilesSnapshotSerializer.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/QuantilesSnapshotSerializer.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/statistics/serde/QuantilesSnapshotSerializer.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/ArrayIngestMode.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/ArrayIngestMode.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/ArrayIngestMode.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/ArrayIngestMode.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/DecoratedExecutorService.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/DecoratedExecutorService.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/DecoratedExecutorService.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/DecoratedExecutorService.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/DimensionSchemaUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/DimensionSchemaUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/DimensionSchemaUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/DimensionSchemaUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/IntervalUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/IntervalUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/IntervalUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/IntervalUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQMetricUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQMetricUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQMetricUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQMetricUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregator.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregator.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregator.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregator.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregatorFactory.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregatorFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregatorFactory.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/PassthroughAggregatorFactory.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SequenceUtils.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/SequenceUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SequenceUtils.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/SequenceUtils.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SupplierIterator.java b/multi-stage-query/src/main/java/org/apache/druid/msq/util/SupplierIterator.java similarity index 100% rename from extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SupplierIterator.java rename to multi-stage-query/src/main/java/org/apache/druid/msq/util/SupplierIterator.java diff --git a/extensions-core/multi-stage-query/src/main/resources/log4j2.xml b/multi-stage-query/src/main/resources/log4j2.xml similarity index 100% rename from extensions-core/multi-stage-query/src/main/resources/log4j2.xml rename to multi-stage-query/src/main/resources/log4j2.xml diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CountersSnapshotTreeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CountersSnapshotTreeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CountersSnapshotTreeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/counters/CountersSnapshotTreeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CpuCountersTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CpuCountersTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/CpuCountersTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/counters/CpuCountersTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounterTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounterTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounterTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/counters/SegmentGenerationProgressCounterTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartControllerContextTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartControllerContextTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartControllerContextTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartControllerContextTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartTableInputSpecSlicerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartWorkerManagerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartWorkerManagerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartWorkerManagerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/DartWorkerManagerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartQueryInfoTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartQueryInfoTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartQueryInfoTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartQueryInfoTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/messages/ControllerMessageTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/messages/ControllerMessageTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/messages/ControllerMessageTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/messages/ControllerMessageTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImplTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImplTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImplTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/sql/DartSqlClientImplTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProviderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProviderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProviderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartProcessingBuffersProviderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartQueryableSegmentTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartQueryableSegmentTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartQueryableSegmentTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartQueryableSegmentTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartWorkerRunnerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartWorkerRunnerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartWorkerRunnerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/DartWorkerRunnerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/WorkerIdTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/WorkerIdTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/WorkerIdTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/WorkerIdTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfoTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfoTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfoTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/DartWorkerInfoTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponseTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponseTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponseTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/dart/worker/http/GetWorkersResponseTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerImplTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerImplTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerImplTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerImplTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerMemoryParametersTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerMemoryParametersTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerMemoryParametersTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/ControllerMemoryParametersTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/DataServerQueryHandlerUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDataSketchesTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDataSketchesTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDataSketchesTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDataSketchesTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQDrillWindowQueryTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQExportTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQFaultsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQFaultsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQFaultsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQFaultsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQReplaceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ProcessingBuffersSetTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ProcessingBuffersSetTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ProcessingBuffersSetTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/ProcessingBuffersSetTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/QueryValidatorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/QueryValidatorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/QueryValidatorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/QueryValidatorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ResultsContextSerdeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ResultsContextSerdeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/ResultsContextSerdeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/ResultsContextSerdeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/RunWorkOrderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/RunWorkOrderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/RunWorkOrderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/RunWorkOrderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcherTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcherTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcherTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/SegmentLoadStatusFetcherTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TaskDataSegmentProviderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TaskDataSegmentProviderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TaskDataSegmentProviderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/TaskDataSegmentProviderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/TestMSQSqlModule.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerImplTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerImplTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerImplTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerImplTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerMemoryParametersTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerMemoryParametersTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerMemoryParametersTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerMemoryParametersTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerRunRefTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerRunRefTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerRunRefTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerRunRefTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerSketchFetcherTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerSketchFetcherTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerSketchFetcherTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerSketchFetcherTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerStorageParametersTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerStorageParametersTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerStorageParametersTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/exec/WorkerStorageParametersTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/ColumnMappingTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/ColumnMappingTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/ColumnMappingTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/ColumnMappingTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/DurableStorageCleanerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/DurableStorageCleanerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/DurableStorageCleanerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/DurableStorageCleanerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/IndexerDataServerQueryHandlerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQControllerTaskTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQControllerTaskTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQControllerTaskTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQControllerTaskTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java similarity index 98% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java index 140ec298e113..4fb7b96d9b78 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java +++ b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecCompatTest.java @@ -203,7 +203,7 @@ private Path getTestDataPath(TestInfo info) { String testMethodName = info.getTestMethod().get().getName(); File f = ProjectPathUtils.getPathFromProjectRoot( - "extensions-core/multi-stage-query/src/test/resources/" + getClass().getName() + "/" + testMethodName + ".json" + "multi-stage-query/src/test/resources/" + getClass().getName() + "/" + testMethodName + ".json" ); Path p = f.toPath(); return p; diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTaskListTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTaskListTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTaskListTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTaskListTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTuningConfigTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTuningConfigTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTuningConfigTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQTuningConfigTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherRetryTests.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherRetryTests.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherRetryTests.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherRetryTests.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskLauncherTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQWorkerTaskTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/PeriodicControllerCheckerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/PeriodicControllerCheckerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/PeriodicControllerCheckerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/PeriodicControllerCheckerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/WorkerChatHandlerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/WorkerChatHandlerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/WorkerChatHandlerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/WorkerChatHandlerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/client/ControllerChatHandlerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/client/ControllerChatHandlerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/client/ControllerChatHandlerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/client/ControllerChatHandlerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestinationTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestinationTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestinationTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/DataSourceMSQDestinationTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/ExportMSQDestinationTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/ExportMSQDestinationTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/ExportMSQDestinationTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/destination/ExportMSQDestinationTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/CanceledFaultTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/CanceledFaultTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/CanceledFaultTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/CanceledFaultTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFaultTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFaultTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFaultTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/InsertLockPreemptedFaultTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQErrorReportTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQErrorReportTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQErrorReportTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQErrorReportTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQWarningsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQWarningsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQWarningsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQWarningsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/report/MSQTaskReportTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/report/MSQTaskReportTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/report/MSQTaskReportTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/indexing/report/MSQTaskReportTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/InputSpecsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/InputSpecsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/InputSpecsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/InputSpecsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/NilInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/NilInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/NilInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/NilInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecSlicerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/external/ExternalInputSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/NilInputSourceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/NilInputSourceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/external/NilInputSourceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/external/NilInputSourceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/inline/InlineInputSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/lookup/LookupInputSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CollectedReadablePartitionsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CollectedReadablePartitionsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CollectedReadablePartitionsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CollectedReadablePartitionsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CombinedReadablePartitionsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CombinedReadablePartitionsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CombinedReadablePartitionsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/CombinedReadablePartitionsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/ReadablePartitionTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/ReadablePartitionTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/ReadablePartitionTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/ReadablePartitionTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitionsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitionsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitionsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/SparseStripedReadablePartitionsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecSlicerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecSlicerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecSlicerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecSlicerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StageInputSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StripedReadablePartitionsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StripedReadablePartitionsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StripedReadablePartitionsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/stage/StripedReadablePartitionsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/DataServerRequestDescriptorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/DataServerRequestDescriptorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/DataServerRequestDescriptorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/DataServerRequestDescriptorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/IndexerTableInputSpecSlicerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/IndexerTableInputSpecSlicerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/IndexerTableInputSpecSlicerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/IndexerTableInputSpecSlicerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/RichSegmentDescriptorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/RichSegmentDescriptorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/RichSegmentDescriptorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/RichSegmentDescriptorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentWithDescriptorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentWithDescriptorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentWithDescriptorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentWithDescriptorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentsInputSliceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentsInputSliceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentsInputSliceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/SegmentsInputSliceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/TableInputSpecTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/TableInputSpecTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/input/table/TableInputSpecTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/input/table/TableInputSpecTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/QueryDefinitionTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/QueryDefinitionTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/QueryDefinitionTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/QueryDefinitionTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageDefinitionTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageDefinitionTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageDefinitionTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageDefinitionTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageIdTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageIdTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageIdTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/StageIdTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/WorkOrderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/WorkOrderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/WorkOrderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/WorkOrderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/BaseControllerQueryKernelTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/BaseControllerQueryKernelTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/BaseControllerQueryKernelTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/BaseControllerQueryKernelTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfigTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfigTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfigTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelConfigTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerQueryKernelUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSlice.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSlice.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSlice.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSlice.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpec.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpec.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpec.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpec.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpecSlicer.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpecSlicer.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpecSlicer.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ControllerTestInputSpecSlicer.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/MockQueryDefinitionBuilder.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/MockQueryDefinitionBuilder.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/MockQueryDefinitionBuilder.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/MockQueryDefinitionBuilder.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/NonShufflingWorkersWithRetryKernelTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/NonShufflingWorkersWithRetryKernelTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/NonShufflingWorkersWithRetryKernelTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/NonShufflingWorkersWithRetryKernelTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ShufflingWorkersWithRetryKernelTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ShufflingWorkersWithRetryKernelTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ShufflingWorkersWithRetryKernelTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/ShufflingWorkersWithRetryKernelTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/WorkerInputsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/WorkerInputsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/WorkerInputsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/kernel/controller/WorkerInputsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/ChainedProcessorManagerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/ChainedProcessorManagerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/ChainedProcessorManagerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/ChainedProcessorManagerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/FrameProcessorTestBase.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/FrameProcessorTestBase.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/FrameProcessorTestBase.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/FrameProcessorTestBase.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/NonFailingWritableFrameChannel.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/NonFailingWritableFrameChannel.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/NonFailingWritableFrameChannel.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/NonFailingWritableFrameChannel.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSourceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSourceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSourceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/RestrictedInputNumberDataSourceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryFrameProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/WindowOperatorQueryStageProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinFrameProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/common/SortMergeJoinStageProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/ExportResultsStageProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/results/QueryResultsFrameProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java similarity index 90% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java index 5f3ca89e4906..2b8805b59963 100644 --- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java +++ b/multi-stage-query/src/test/java/org/apache/druid/msq/quidem/MSQQuidemTest.java @@ -35,6 +35,6 @@ public MSQQuidemTest() @Override protected File getTestRoot() { - return ProjectPathUtils.getPathFromProjectRoot("extensions-core/multi-stage-query/src/test/quidem/" + getClass().getName()); + return ProjectPathUtils.getPathFromProjectRoot("multi-stage-query/src/test/quidem/" + getClass().getName()); } } diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/rpc/BaseWorkerClientImplTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/rpc/BaseWorkerClientImplTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/rpc/BaseWorkerClientImplTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/rpc/BaseWorkerClientImplTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/DurableStorageOutputChannelFactoryTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/DurableStorageOutputChannelFactoryTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/DurableStorageOutputChannelFactoryTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/DurableStorageOutputChannelFactoryTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStreamTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStreamTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStreamTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ByteChunksInputStreamTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReaderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReaderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReaderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/ChannelStageOutputReaderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/NilStageOutputReaderTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/NilStageOutputReaderTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/NilStageOutputReaderTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/shuffle/output/NilStageOutputReaderTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQModeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQModeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQModeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQModeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypesTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypesTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypesTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ColumnNameAndTypesTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ResultSetInformationTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ResultSetInformationTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ResultSetInformationTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/ResultSetInformationTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/SqlStatementResultTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/SqlStatementResultTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/SqlStatementResultTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/entity/SqlStatementResultTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlStatementResourceTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlStatementResourceTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlStatementResourceTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlStatementResourceTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ByteRowKeySerdeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ByteRowKeySerdeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ByteRowKeySerdeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ByteRowKeySerdeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImplTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImplTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImplTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/ClusterByStatisticsCollectorImplTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DelegateOrMinKeyCollectorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DistinctKeyCollectorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DistinctKeyCollectorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DistinctKeyCollectorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/DistinctKeyCollectorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/KeyCollectorTestUtils.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/KeyCollectorTestUtils.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/KeyCollectorTestUtils.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/KeyCollectorTestUtils.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformationSerdeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformationSerdeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformationSerdeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/PartialKeyStatisticsInformationSerdeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshotTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshotTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshotTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorSnapshotTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/QuantilesSketchKeyCollectorTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/SendPartialKeyStatisticsInformationSerdeTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/SendPartialKeyStatisticsInformationSerdeTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/SendPartialKeyStatisticsInformationSerdeTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/SendPartialKeyStatisticsInformationSerdeTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializerTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializerTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializerTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/statistics/serde/KeyCollectorSnapshotSerializerTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractMSQComponentSupplierDelegate.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractMSQComponentSupplierDelegate.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractMSQComponentSupplierDelegate.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractMSQComponentSupplierDelegate.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/AllDruidEnginesComponentSupplier.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/AllDruidEnginesComponentSupplier.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/AllDruidEnginesComponentSupplier.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/AllDruidEnginesComponentSupplier.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteArraysQueryMSQTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteArraysQueryMSQTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteArraysQueryMSQTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteArraysQueryMSQTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteDartTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteDartTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteDartTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteDartTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteMSQTestsHelper.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteNestedDataQueryMSQTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteNestedDataQueryMSQTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteNestedDataQueryMSQTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteNestedDataQueryMSQTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectQueryMSQTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CounterSnapshotMatcher.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/CounterSnapshotMatcher.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CounterSnapshotMatcher.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/CounterSnapshotMatcher.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DartComponentSupplier.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/DartComponentSupplier.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DartComponentSupplier.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/DartComponentSupplier.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledCalciteDartTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledCalciteDartTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledCalciteDartTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledCalciteDartTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartCalciteQueryTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartCalciteQueryTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartCalciteQueryTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartCalciteQueryTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartExtension.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartExtension.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartExtension.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartExtension.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/ExtractResultsFactory.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/LimitedFrameWriterFactory.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/LimitedFrameWriterFactory.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/LimitedFrameWriterFactory.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/LimitedFrameWriterFactory.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQCalciteSelectJoinQueryTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestBase.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestBase.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestBase.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestBase.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerClient.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestDelegateDataSegmentPusher.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestDelegateDataSegmentPusher.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestDelegateDataSegmentPusher.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestDelegateDataSegmentPusher.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestSegmentManager.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestSegmentManager.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestSegmentManager.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestSegmentManager.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestTaskActionClient.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestTaskActionClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestTaskActionClient.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestTaskActionClient.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerClient.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerClient.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerClient.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerClient.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerContext.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerContext.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerContext.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestWorkerContext.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/NoopQueryListener.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/NoopQueryListener.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/NoopQueryListener.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/NoopQueryListener.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardAndMSQComponentSupplier.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardAndMSQComponentSupplier.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardAndMSQComponentSupplier.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardAndMSQComponentSupplier.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/StandardMSQComponentSupplier.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/TestDartControllerContextFactoryImpl.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/TestDartControllerContextFactoryImpl.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/TestDartControllerContextFactoryImpl.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/TestDartControllerContextFactoryImpl.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/VerifyMSQSupportedNativeQueriesPredicate.java b/multi-stage-query/src/test/java/org/apache/druid/msq/test/VerifyMSQSupportedNativeQueriesPredicate.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/VerifyMSQSupportedNativeQueriesPredicate.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/test/VerifyMSQSupportedNativeQueriesPredicate.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/DimensionSchemaUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/DimensionSchemaUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/DimensionSchemaUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/DimensionSchemaUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/IntervalUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/IntervalUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/IntervalUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/IntervalUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQFaultUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQFaultUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQFaultUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQFaultUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtilsTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtilsTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtilsTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/MSQTaskQueryMakerUtilsTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MultiStageQueryContextTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/MultiStageQueryContextTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/MultiStageQueryContextTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/MultiStageQueryContextTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/PassthroughAggregatorFactoryTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/PassthroughAggregatorFactoryTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/PassthroughAggregatorFactoryTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/PassthroughAggregatorFactoryTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/SqlStatementResourceHelperTest.java b/multi-stage-query/src/test/java/org/apache/druid/msq/util/SqlStatementResourceHelperTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/util/SqlStatementResourceHelperTest.java rename to multi-stage-query/src/test/java/org/apache/druid/msq/util/SqlStatementResourceHelperTest.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/DartDruidMeta.java b/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/DartDruidMeta.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/DartDruidMeta.java rename to multi-stage-query/src/test/java/org/apache/druid/sql/avatica/DartDruidMeta.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java b/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java rename to multi-stage-query/src/test/java/org/apache/druid/sql/avatica/MSQDruidMeta.java diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java b/multi-stage-query/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java similarity index 100% rename from extensions-core/multi-stage-query/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java rename to multi-stage-query/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/dart.iq b/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/dart.iq similarity index 100% rename from extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/dart.iq rename to multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/dart.iq diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq1.iq b/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq1.iq similarity index 100% rename from extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq1.iq rename to multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq1.iq diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq2.iq b/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq2.iq similarity index 100% rename from extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq2.iq rename to multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msq2.iq diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq b/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq similarity index 100% rename from extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq rename to multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq b/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq similarity index 100% rename from extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq rename to multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq diff --git a/extensions-core/multi-stage-query/src/test/resources/dataset-with-time-column.json b/multi-stage-query/src/test/resources/dataset-with-time-column.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/dataset-with-time-column.json rename to multi-stage-query/src/test/resources/dataset-with-time-column.json diff --git a/extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-1.json b/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-1.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-1.json rename to multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-1.json diff --git a/extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-2.json b/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-2.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-2.json rename to multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-2.json diff --git a/extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-3.json b/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-3.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-3.json rename to multi-stage-query/src/test/resources/multipleFiles/wikipedia-sampled-3.json diff --git a/extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder1.json b/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder1.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder1.json rename to multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder1.json diff --git a/extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder2.json b/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder2.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder2.json rename to multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testBuilder2.json diff --git a/extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testComplexMSQSpec.json b/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testComplexMSQSpec.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testComplexMSQSpec.json rename to multi-stage-query/src/test/resources/org.apache.druid.msq.indexing.MSQSpecCompatTest/testComplexMSQSpec.json diff --git a/extensions-core/multi-stage-query/src/test/resources/unparseable-mv-string-array.json b/multi-stage-query/src/test/resources/unparseable-mv-string-array.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/unparseable-mv-string-array.json rename to multi-stage-query/src/test/resources/unparseable-mv-string-array.json diff --git a/extensions-core/multi-stage-query/src/test/resources/unparseable-null-byte-string.csv b/multi-stage-query/src/test/resources/unparseable-null-byte-string.csv similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/unparseable-null-byte-string.csv rename to multi-stage-query/src/test/resources/unparseable-null-byte-string.csv diff --git a/extensions-core/multi-stage-query/src/test/resources/unparseable.gz b/multi-stage-query/src/test/resources/unparseable.gz similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/unparseable.gz rename to multi-stage-query/src/test/resources/unparseable.gz diff --git a/extensions-core/multi-stage-query/src/test/resources/wikipedia-sampled-unparsable.json b/multi-stage-query/src/test/resources/wikipedia-sampled-unparsable.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/wikipedia-sampled-unparsable.json rename to multi-stage-query/src/test/resources/wikipedia-sampled-unparsable.json diff --git a/extensions-core/multi-stage-query/src/test/resources/wikipedia-sampled.json b/multi-stage-query/src/test/resources/wikipedia-sampled.json similarity index 100% rename from extensions-core/multi-stage-query/src/test/resources/wikipedia-sampled.json rename to multi-stage-query/src/test/resources/wikipedia-sampled.json diff --git a/pom.xml b/pom.xml index aacc828b6bd1..410e509723aa 100644 --- a/pom.xml +++ b/pom.xml @@ -188,6 +188,7 @@ server indexing-service indexing-hadoop + multi-stage-query services sql integration-tests @@ -211,7 +212,6 @@ extensions-core/kafka-extraction-namespace extensions-core/kafka-indexing-service extensions-core/kinesis-indexing-service - extensions-core/multi-stage-query extensions-core/mysql-metadata-storage extensions-core/orc-extensions extensions-core/parquet-extensions diff --git a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java index 034b88bcdf0d..cae76196b53c 100644 --- a/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java +++ b/processing/src/main/java/org/apache/druid/guice/ExtensionsLoader.java @@ -193,9 +193,18 @@ public void initializeExtensionFilesToLoad() if (toLoad == null) { extensionsToLoad = rootExtensionsDir.listFiles(); } else { + final LinkedHashSet validExtensionsToLoad = new LinkedHashSet<>(toLoad); + if (validExtensionsToLoad.remove("druid-multi-stage-query")) { + log.warn( + "Skipping extension[druid-multi-stage-query] as it is now a core" + + " capability of Druid. Please remove this extension from your" + + " configs as it will cause services to fail in future Druid versions." + ); + } + int i = 0; - extensionsToLoad = new File[toLoad.size()]; - for (final String extensionName : toLoad) { + extensionsToLoad = new File[validExtensionsToLoad.size()]; + for (final String extensionName : validExtensionsToLoad) { File extensionDir = new File(extensionName); if (!extensionDir.isAbsolute()) { extensionDir = new File(rootExtensionsDir, extensionName); diff --git a/quidem-ut/pom.xml b/quidem-ut/pom.xml index b00ae52e6410..fbb1795f5ce7 100644 --- a/quidem-ut/pom.xml +++ b/quidem-ut/pom.xml @@ -232,7 +232,7 @@ ${project.parent.version} - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query ${project.parent.version} @@ -430,7 +430,7 @@ ${project.parent.version} - org.apache.druid.extensions + org.apache.druid druid-multi-stage-query test-jar ${project.parent.version} diff --git a/services/pom.xml b/services/pom.xml index 8a5a7938c6f7..5dba67fbb57c 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -68,6 +68,11 @@ druid-sql ${project.parent.version} + + org.apache.druid + druid-multi-stage-query + ${project.parent.version} + com.github.rvesse airline diff --git a/services/src/main/java/org/apache/druid/cli/CliBroker.java b/services/src/main/java/org/apache/druid/cli/CliBroker.java index 7e3c11a66311..60c958f31677 100644 --- a/services/src/main/java/org/apache/druid/cli/CliBroker.java +++ b/services/src/main/java/org/apache/druid/cli/CliBroker.java @@ -56,6 +56,13 @@ import org.apache.druid.guice.SegmentWranglerModule; import org.apache.druid.guice.ServerTypeConfig; import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.msq.dart.guice.DartControllerMemoryManagementModule; +import org.apache.druid.msq.dart.guice.DartControllerModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; +import org.apache.druid.msq.guice.MSQSqlModule; +import org.apache.druid.msq.guice.SqlTaskModule; import org.apache.druid.query.QuerySegmentWalker; import org.apache.druid.query.RetryQueryRunnerConfig; import org.apache.druid.query.lookup.LookupModule; @@ -196,7 +203,14 @@ protected List getModules() .in(LazySingleton.class); }, new LookupModule(), - new SqlModule() + new SqlModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule(), + new MSQSqlModule(), + new SqlTaskModule(), + new DartControllerModule(), + new DartControllerMemoryManagementModule() ); } } diff --git a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java index 5a94d73a3e8b..e26e665b5d11 100644 --- a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java +++ b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java @@ -65,6 +65,9 @@ import org.apache.druid.java.util.http.client.HttpClient; import org.apache.druid.metadata.MetadataStorage; import org.apache.druid.metadata.MetadataStorageProvider; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; import org.apache.druid.query.lookup.LookupSerdeModule; import org.apache.druid.segment.metadata.CoordinatorSegmentMetadataCache; import org.apache.druid.segment.metadata.SegmentMetadataCacheConfig; @@ -298,6 +301,9 @@ public LoadQueueTaskMaster getLoadQueueTaskMaster( // the injector to get confused due to having multiple bindings for the same classes. modules.add(new LookupSerdeModule()); modules.add(new SupervisorCleanupModule()); + modules.add(new MSQIndexingModule()); + modules.add(new MSQDurableStorageModule()); + modules.add(new MSQExternalDataSourceModule()); } return modules; diff --git a/services/src/main/java/org/apache/druid/cli/CliHistorical.java b/services/src/main/java/org/apache/druid/cli/CliHistorical.java index 433d9ced54ef..3365ac3b4c32 100644 --- a/services/src/main/java/org/apache/druid/cli/CliHistorical.java +++ b/services/src/main/java/org/apache/druid/cli/CliHistorical.java @@ -45,6 +45,11 @@ import org.apache.druid.guice.SegmentWranglerModule; import org.apache.druid.guice.ServerTypeConfig; import org.apache.druid.java.util.common.logger.Logger; +import org.apache.druid.msq.dart.guice.DartWorkerMemoryManagementModule; +import org.apache.druid.msq.dart.guice.DartWorkerModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; import org.apache.druid.query.QuerySegmentWalker; import org.apache.druid.query.lookup.LookupModule; import org.apache.druid.server.QueryResource; @@ -146,7 +151,12 @@ protected List getModules() .toProvider(new LocalTmpStorageConfig.DefaultLocalTmpStorageConfigProvider("historical")) .in(LazySingleton.class); }, - new LookupModule() + new LookupModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule(), + new DartWorkerModule(), + new DartWorkerMemoryManagementModule() ); } diff --git a/services/src/main/java/org/apache/druid/cli/CliIndexer.java b/services/src/main/java/org/apache/druid/cli/CliIndexer.java index 5a3c108dfb4e..d0e0b0634134 100644 --- a/services/src/main/java/org/apache/druid/cli/CliIndexer.java +++ b/services/src/main/java/org/apache/druid/cli/CliIndexer.java @@ -66,6 +66,10 @@ import org.apache.druid.indexing.worker.shuffle.ShuffleModule; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.metadata.input.InputSourceModule; +import org.apache.druid.msq.guice.IndexerMemoryManagementModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; import org.apache.druid.query.QuerySegmentWalker; import org.apache.druid.query.lookup.LookupModule; import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; @@ -245,7 +249,11 @@ public DataNodeService getDataNodeService(DruidServerConfig serverConfig) new HadoopIndexTaskModule(), new QueryablePeonModule(), new CliIndexerServerModule(properties), - new LookupModule() + new LookupModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule(), + new IndexerMemoryManagementModule() ); } } diff --git a/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java b/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java index 44a5f05558c0..30b851b4fdb2 100644 --- a/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java +++ b/services/src/main/java/org/apache/druid/cli/CliMiddleManager.java @@ -70,6 +70,9 @@ import org.apache.druid.indexing.worker.shuffle.ShuffleModule; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.metadata.input.InputSourceModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; import org.apache.druid.query.DruidMetrics; import org.apache.druid.query.lookup.LookupSerdeModule; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; @@ -252,7 +255,10 @@ public WorkerNodeService getWorkerNodeService(WorkerConfig workerConfig) new IndexingServiceTuningConfigModule(), new InputSourceModule(), new HadoopIndexTaskModule(), - new LookupSerdeModule() + new LookupSerdeModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule() ); } diff --git a/services/src/main/java/org/apache/druid/cli/CliOverlord.java b/services/src/main/java/org/apache/druid/cli/CliOverlord.java index c627f84174ea..ca175a1286b9 100644 --- a/services/src/main/java/org/apache/druid/cli/CliOverlord.java +++ b/services/src/main/java/org/apache/druid/cli/CliOverlord.java @@ -111,6 +111,9 @@ import org.apache.druid.indexing.worker.shuffle.LocalIntermediaryDataManager; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.metadata.input.InputSourceModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; import org.apache.druid.query.lookup.LookupSerdeModule; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.realtime.ChatHandlerProvider; @@ -460,7 +463,10 @@ private void configureOverlordHelpers(Binder binder) new HadoopIndexTaskModule(), new SupervisorModule(), new LookupSerdeModule(), - new SamplerModule() + new SamplerModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule() ); } diff --git a/services/src/main/java/org/apache/druid/cli/CliPeon.java b/services/src/main/java/org/apache/druid/cli/CliPeon.java index 75baabb73dc7..26f7f8d39ffd 100644 --- a/services/src/main/java/org/apache/druid/cli/CliPeon.java +++ b/services/src/main/java/org/apache/druid/cli/CliPeon.java @@ -95,6 +95,10 @@ import org.apache.druid.java.util.common.lifecycle.Lifecycle; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.metadata.input.InputSourceModule; +import org.apache.druid.msq.guice.MSQDurableStorageModule; +import org.apache.druid.msq.guice.MSQExternalDataSourceModule; +import org.apache.druid.msq.guice.MSQIndexingModule; +import org.apache.druid.msq.guice.PeonMemoryManagementModule; import org.apache.druid.query.DruidMetrics; import org.apache.druid.query.QuerySegmentWalker; import org.apache.druid.query.lookup.LookupModule; @@ -378,7 +382,11 @@ public LocalTmpStorageConfig getLocalTmpStorage() new InputSourceModule(), new HadoopIndexTaskModule(), new ChatHandlerServerModule(properties), - new LookupModule() + new LookupModule(), + new MSQIndexingModule(), + new MSQDurableStorageModule(), + new MSQExternalDataSourceModule(), + new PeonMemoryManagementModule() ); }