mirror of https://github.com/apache/druid.git
Move SqlTaskStatus and SqlTaskStausTest from msq module to sql module. (#17380)
- This is a non-functional change that moves SqlTaskStatus and its unit test SqlTaskStatusTest from the msq module to the sql module to help class reuse in other places. - This refactor is extracted from this PR to facilitate easier review. - Fix a minor spacing issue in the TaskStartTimeoutFault error message.
This commit is contained in:
parent
a44006c998
commit
9a16d4e219
|
@ -45,7 +45,7 @@ public class TaskStartTimeoutFault extends BaseMSQFault
|
||||||
{
|
{
|
||||||
super(
|
super(
|
||||||
CODE,
|
CODE,
|
||||||
"Unable to launch [%d] workers out of the total [%d] worker tasks within [%,d] seconds of the last successful worker launch."
|
"Unable to launch [%d] workers out of the total [%d] worker tasks within [%,d] seconds of the last successful worker launch. "
|
||||||
+ "There might be insufficient available slots to start all worker tasks simultaneously. "
|
+ "There might be insufficient available slots to start all worker tasks simultaneously. "
|
||||||
+ "Try lowering '%s' in your query context to a number that fits within your available task capacity, "
|
+ "Try lowering '%s' in your query context to a number that fits within your available task capacity, "
|
||||||
+ "or try increasing capacity.",
|
+ "or try increasing capacity.",
|
||||||
|
|
|
@ -33,7 +33,6 @@ import org.apache.druid.java.util.common.guava.Yielders;
|
||||||
import org.apache.druid.java.util.common.logger.Logger;
|
import org.apache.druid.java.util.common.logger.Logger;
|
||||||
import org.apache.druid.msq.guice.MultiStageQuery;
|
import org.apache.druid.msq.guice.MultiStageQuery;
|
||||||
import org.apache.druid.msq.sql.MSQTaskSqlEngine;
|
import org.apache.druid.msq.sql.MSQTaskSqlEngine;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.query.QueryException;
|
import org.apache.druid.query.QueryException;
|
||||||
import org.apache.druid.server.QueryResponse;
|
import org.apache.druid.server.QueryResponse;
|
||||||
import org.apache.druid.server.initialization.ServerConfig;
|
import org.apache.druid.server.initialization.ServerConfig;
|
||||||
|
@ -48,6 +47,7 @@ import org.apache.druid.sql.SqlStatementFactory;
|
||||||
import org.apache.druid.sql.http.ResultFormat;
|
import org.apache.druid.sql.http.ResultFormat;
|
||||||
import org.apache.druid.sql.http.SqlQuery;
|
import org.apache.druid.sql.http.SqlQuery;
|
||||||
import org.apache.druid.sql.http.SqlResource;
|
import org.apache.druid.sql.http.SqlResource;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.ws.rs.Consumes;
|
import javax.ws.rs.Consumes;
|
||||||
|
|
|
@ -29,9 +29,9 @@ import org.apache.druid.catalog.model.table.DatasourceDefn;
|
||||||
import org.apache.druid.catalog.model.table.TableBuilder;
|
import org.apache.druid.catalog.model.table.TableBuilder;
|
||||||
import org.apache.druid.java.util.common.StringUtils;
|
import org.apache.druid.java.util.common.StringUtils;
|
||||||
import org.apache.druid.java.util.common.logger.Logger;
|
import org.apache.druid.java.util.common.logger.Logger;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.query.QueryContexts;
|
import org.apache.druid.query.QueryContexts;
|
||||||
import org.apache.druid.sql.http.SqlQuery;
|
import org.apache.druid.sql.http.SqlQuery;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.testing.utils.DataLoaderHelper;
|
import org.apache.druid.testing.utils.DataLoaderHelper;
|
||||||
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
||||||
import org.apache.druid.testsEx.cluster.CatalogClient;
|
import org.apache.druid.testsEx.cluster.CatalogClient;
|
||||||
|
|
|
@ -27,8 +27,8 @@ import org.apache.druid.catalog.model.TableMetadata;
|
||||||
import org.apache.druid.catalog.model.table.DatasourceDefn;
|
import org.apache.druid.catalog.model.table.DatasourceDefn;
|
||||||
import org.apache.druid.catalog.model.table.TableBuilder;
|
import org.apache.druid.catalog.model.table.TableBuilder;
|
||||||
import org.apache.druid.java.util.common.StringUtils;
|
import org.apache.druid.java.util.common.StringUtils;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.sql.http.SqlQuery;
|
import org.apache.druid.sql.http.SqlQuery;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
||||||
import org.apache.druid.testsEx.categories.Catalog;
|
import org.apache.druid.testsEx.categories.Catalog;
|
||||||
import org.apache.druid.testsEx.cluster.CatalogClient;
|
import org.apache.druid.testsEx.cluster.CatalogClient;
|
||||||
|
|
|
@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.inject.Inject;
|
import com.google.inject.Inject;
|
||||||
import org.apache.druid.java.util.common.StringUtils;
|
import org.apache.druid.java.util.common.StringUtils;
|
||||||
import org.apache.druid.msq.exec.ClusterStatisticsMergeMode;
|
import org.apache.druid.msq.exec.ClusterStatisticsMergeMode;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.msq.util.MultiStageQueryContext;
|
import org.apache.druid.msq.util.MultiStageQueryContext;
|
||||||
import org.apache.druid.sql.http.SqlQuery;
|
import org.apache.druid.sql.http.SqlQuery;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
||||||
import org.apache.druid.testing.utils.DataLoaderHelper;
|
import org.apache.druid.testing.utils.DataLoaderHelper;
|
||||||
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
import org.apache.druid.testing.utils.MsqTestQueryHelper;
|
||||||
|
|
|
@ -25,8 +25,8 @@ import org.apache.druid.java.util.common.ISE;
|
||||||
import org.apache.druid.java.util.common.Pair;
|
import org.apache.druid.java.util.common.Pair;
|
||||||
import org.apache.druid.java.util.common.StringUtils;
|
import org.apache.druid.java.util.common.StringUtils;
|
||||||
import org.apache.druid.java.util.common.logger.Logger;
|
import org.apache.druid.java.util.common.logger.Logger;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.msq.util.MultiStageQueryContext;
|
import org.apache.druid.msq.util.MultiStageQueryContext;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
||||||
import org.apache.druid.testing.utils.DataLoaderHelper;
|
import org.apache.druid.testing.utils.DataLoaderHelper;
|
||||||
import org.apache.druid.testing.utils.ITRetryUtil;
|
import org.apache.druid.testing.utils.ITRetryUtil;
|
||||||
|
|
|
@ -29,7 +29,7 @@ import org.apache.druid.java.util.common.StringUtils;
|
||||||
import org.apache.druid.msq.indexing.report.MSQResultsReport;
|
import org.apache.druid.msq.indexing.report.MSQResultsReport;
|
||||||
import org.apache.druid.msq.indexing.report.MSQTaskReport;
|
import org.apache.druid.msq.indexing.report.MSQTaskReport;
|
||||||
import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
|
import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.storage.local.LocalFileExportStorageProvider;
|
import org.apache.druid.storage.local.LocalFileExportStorageProvider;
|
||||||
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
|
||||||
import org.apache.druid.testing.utils.DataLoaderHelper;
|
import org.apache.druid.testing.utils.DataLoaderHelper;
|
||||||
|
|
|
@ -37,8 +37,8 @@ import org.apache.druid.msq.guice.MSQIndexingModule;
|
||||||
import org.apache.druid.msq.indexing.report.MSQResultsReport;
|
import org.apache.druid.msq.indexing.report.MSQResultsReport;
|
||||||
import org.apache.druid.msq.indexing.report.MSQTaskReport;
|
import org.apache.druid.msq.indexing.report.MSQTaskReport;
|
||||||
import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
|
import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
|
||||||
import org.apache.druid.msq.sql.SqlTaskStatus;
|
|
||||||
import org.apache.druid.sql.http.SqlQuery;
|
import org.apache.druid.sql.http.SqlQuery;
|
||||||
|
import org.apache.druid.sql.http.SqlTaskStatus;
|
||||||
import org.apache.druid.testing.IntegrationTestingConfig;
|
import org.apache.druid.testing.IntegrationTestingConfig;
|
||||||
import org.apache.druid.testing.clients.OverlordResourceTestClient;
|
import org.apache.druid.testing.clients.OverlordResourceTestClient;
|
||||||
import org.apache.druid.testing.clients.SqlResourceTestClient;
|
import org.apache.druid.testing.clients.SqlResourceTestClient;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.apache.druid.msq.sql;
|
package org.apache.druid.sql.http;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
|
@ -25,13 +25,12 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import org.apache.druid.error.ErrorResponse;
|
import org.apache.druid.error.ErrorResponse;
|
||||||
import org.apache.druid.indexer.TaskState;
|
import org.apache.druid.indexer.TaskState;
|
||||||
import org.apache.druid.msq.sql.resources.SqlTaskResource;
|
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Response object for {@link SqlTaskResource#doPost}.
|
* Response object for org.apache.druid.msq.sql.resources.SqlTaskResource#doPost.
|
||||||
*/
|
*/
|
||||||
public class SqlTaskStatus
|
public class SqlTaskStatus
|
||||||
{
|
{
|
|
@ -17,7 +17,7 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.apache.druid.msq.sql;
|
package org.apache.druid.sql.http;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import nl.jqno.equalsverifier.EqualsVerifier;
|
import nl.jqno.equalsverifier.EqualsVerifier;
|
Loading…
Reference in New Issue