Sql statement api error messaging fixes. #14629
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| import java.util.concurrent.ExecutorService; | ||
|
|
||
| /** | ||
| * Used for reading results when select destination is {@link org.apache.druid.msq.indexing.destination.MSQSelectDestination#DURABLESTORAGE} | ||
| */ | ||
| public class DurableStorageQueryResultsInputChannelFactory extends DurableStorageInputChannelFactory | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,6 +66,7 @@ | |
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
|
|
@@ -233,17 +234,18 @@ public QueryResponse<Object[]> runQuery(final DruidQuery druidQuery) | |
| ); | ||
| } else { | ||
| final MSQSelectDestination msqSelectDestination = MultiStageQueryContext.getSelectDestination(sqlQueryContext); | ||
| if (msqSelectDestination.equals(MSQSelectDestination.TASKREPORT)) { | ||
| destination = TaskReportMSQDestination.instance(); | ||
| } else if (msqSelectDestination.equals(MSQSelectDestination.DURABLESTORAGE)) { | ||
| destination = DurableStorageMSQDestination.instance(); | ||
| } else { | ||
| throw InvalidInput.exception( | ||
| "Unsupported select destination [%s] provided in the query context. MSQ can currently write the select results to " | ||
| + "[%s]", | ||
| msqSelectDestination.getName(), | ||
| Arrays.stream(MSQSelectDestination.values()) | ||
| .map(MSQSelectDestination::getName) | ||
| .collect(Collectors.joining(",")) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ | |
|
|
||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
@@ -32,43 +33,46 @@ | |
| */ | ||
| public class PageInformation | ||
| { | ||
| private final long id; | ||
| @Nullable | ||
| private final Long numRows; | ||
| @Nullable | ||
| private final Long sizeInBytes; | ||
|
|
||
| @JsonCreator | ||
| public PageInformation( | ||
| @JsonProperty("id") long id, | ||
| @JsonProperty("numRows") @Nullable Long numRows, | ||
| @JsonProperty("sizeInBytes") @Nullable Long sizeInBytes | ||
| ) | ||
| { | ||
| this.id = id; | ||
| this.numRows = numRows; | ||
| this.sizeInBytes = sizeInBytes; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public long getId() | ||
| { | ||
| return id; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @Nullable | ||
| public Long getNumRows() | ||
| { | ||
| return numRows; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @Nullable | ||
| public Long getSizeInBytes() | ||
| { | ||
| return sizeInBytes; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
|
|
@@ -89,16 +93,16 @@ public boolean equals(Object o) | |
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(id, numRows, sizeInBytes); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return "PageInformation{" + | ||
| "id=" + id + | ||
| ", numRows=" + numRows + | ||
| ", sizeInBytes=" + sizeInBytes + | ||
| '}'; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,6 +28,7 @@ | |
| import org.apache.druid.client.indexing.TaskPayloadResponse; | ||
| import org.apache.druid.client.indexing.TaskStatusResponse; | ||
| import org.apache.druid.common.guava.FutureUtils; | ||
| import org.apache.druid.discovery.NodeRole; | ||
| import org.apache.druid.error.DruidException; | ||
| import org.apache.druid.error.ErrorResponse; | ||
| import org.apache.druid.error.Forbidden; | ||
|
|
@@ -830,16 +831,16 @@ private void contextChecks(QueryContext queryContext) | |
|
|
||
| if (executionMode == null) { | ||
| throw InvalidInput.exception( | ||
| "Execution mode is not provided to the sql statement api. " | ||
| + "Please set [%s] to [%s] in the query context", | ||
| QueryContexts.CTX_EXECUTION_MODE, | ||
| ExecutionMode.ASYNC | ||
| ); | ||
| } | ||
|
|
||
| if (!ExecutionMode.ASYNC.equals(executionMode)) { | ||
| throw InvalidInput.exception( | ||
| "The sql statement api currently does not support the provided execution mode [%s]. " | ||
| + "Please set [%s] to [%s] in the query context", | ||
| executionMode, | ||
| QueryContexts.CTX_EXECUTION_MODE, | ||
|
|
@@ -848,7 +849,7 @@ private void contextChecks(QueryContext queryContext) | |
| } | ||
|
|
||
| MSQSelectDestination selectDestination = MultiStageQueryContext.getSelectDestination(queryContext); | ||
| if (MSQSelectDestination.DURABLESTORAGE.equals(selectDestination)) { | ||
| checkForDurableStorageConnectorImpl(); | ||
| } | ||
| } | ||
|
|
@@ -860,12 +861,13 @@ private void checkForDurableStorageConnectorImpl() | |
| .ofCategory(DruidException.Category.INVALID_INPUT) | ||
| .build( | ||
| StringUtils.format( | ||
| "The sql statement api cannot read from the select destination [%s] provided " | ||
| + "in the query context [%s] since it is not configured on the %s. It is recommended to configure durable storage " | ||
| + "as it allows the user to fetch large result sets. Please contact your cluster admin to " | ||
| + "configure durable storage.", | ||
| MSQSelectDestination.DURABLESTORAGE.getName(), | ||
| MultiStageQueryContext.CTX_SELECT_DESTINATION, | ||
| NodeRole.BROKER.getJsonName() | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,7 @@ | |
| * | ||
| * <li><b>selectDestination</b>: If the query is a Select, determines the location to write results to, once the query | ||
| * is finished. Depending on the location, the results might also be truncated to {@link Limits#MAX_SELECT_RESULT_ROWS}. | ||
| * Default value is {@link MSQSelectDestination#TASKREPORT}, which writes all the results to the report. | ||
| * | ||
| * <li><b>useAutoColumnSchemas</b>: Temporary flag to allow experimentation using | ||
| * {@link org.apache.druid.segment.AutoTypeColumnSchema} for all 'standard' type columns during segment generation, | ||
|
|
@@ -93,7 +93,7 @@ public class MultiStageQueryContext | |
| public static final String CTX_DURABLE_SHUFFLE_STORAGE = "durableShuffleStorage"; | ||
| private static final boolean DEFAULT_DURABLE_SHUFFLE_STORAGE = false; | ||
| public static final String CTX_SELECT_DESTINATION = "selectDestination"; | ||
| private static final String DEFAULT_SELECT_DESTINATION = MSQSelectDestination.TASKREPORT.getName(); | ||
|
|
||
| public static final String CTX_FAULT_TOLERANCE = "faultTolerance"; | ||
| public static final boolean DEFAULT_FAULT_TOLERANCE = false; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The location where the workers write the intermediate results is always different hence I would like to keep the wording as is unless you feel strongly about it.