-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add MSQ query context
maxNumSegments (#16637)
* Add MSQ query context maxNumSegments. - Default is MAX_INT (unbounded). - When set and if a time chunk contains more number of segments than set in the query context, the MSQ task will fail with TooManySegments fault. * Fixup hashCode(). * Rename and checkpoint. * Add some insert and replace happy and sad path tests. * Update error msg. * Commentary * Adjust the default to be null (meaning no max bound on number of segments). Also fix formatter. * Fix CodeQL warnings and minor cleanup. * Assert on maxNumSegments tuning config. * Minor test cleanup. * Use null default for the MultiStageQueryContext as well * Review feedback * Review feedback * Move logic to common function getPartitionsByBucket shared by INSERT and REPLACE. * Rename to validateNumSegmentsPerBucketOrThrow() for consistency. * Add segmentGranularity to error message.
- Loading branch information
1 parent
b772277
commit 82117e8
Showing
12 changed files
with
400 additions
and
11 deletions.
There are no files selected for viewing
This file contains 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 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 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
130 changes: 130 additions & 0 deletions
130
...ry/src/main/java/org/apache/druid/msq/indexing/error/TooManySegmentsInTimeChunkFault.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| package org.apache.druid.msq.indexing.error; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonTypeName; | ||
| import org.apache.druid.java.util.common.granularity.Granularity; | ||
| import org.apache.druid.java.util.common.granularity.GranularityType; | ||
| import org.apache.druid.msq.util.MultiStageQueryContext; | ||
| import org.joda.time.DateTime; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| @JsonTypeName(TooManySegmentsInTimeChunkFault.CODE) | ||
| public class TooManySegmentsInTimeChunkFault extends BaseMSQFault | ||
| { | ||
| public static final String CODE = "TooManySegmentsInTimeChunk"; | ||
|
|
||
| private final DateTime timeChunk; | ||
| private final int numSegments; | ||
| private final int maxNumSegments; | ||
| private final Granularity segmentGranularity; | ||
|
|
||
| @JsonCreator | ||
| public TooManySegmentsInTimeChunkFault( | ||
| @JsonProperty("timeChunk") final DateTime timeChunk, | ||
| @JsonProperty("numSegments") final int numSegments, | ||
| @JsonProperty("maxNumSegments") final int maxNumSegments, | ||
| @JsonProperty("segmentGranularity") final Granularity segmentGranularity | ||
| ) | ||
| { | ||
| super( | ||
| CODE, | ||
| "Too many segments requested to be generated in time chunk[%s] with granularity[%s]" | ||
| + " (requested = [%,d], maximum = [%,d]). Please try breaking up your query or change the maximum using" | ||
| + " the query context parameter[%s].", | ||
| timeChunk, | ||
| convertToGranularityString(segmentGranularity), | ||
| numSegments, | ||
| maxNumSegments, | ||
| MultiStageQueryContext.CTX_MAX_NUM_SEGMENTS | ||
| ); | ||
| this.timeChunk = timeChunk; | ||
| this.numSegments = numSegments; | ||
| this.maxNumSegments = maxNumSegments; | ||
| this.segmentGranularity = segmentGranularity; | ||
| } | ||
|
|
||
| /** | ||
| * Convert the given granularity to a more user-friendly granularity string, when possible. | ||
| */ | ||
| private static String convertToGranularityString(final Granularity granularity) | ||
| { | ||
| // If it's a "standard" granularity, we get a nicer string from the GranularityType enum. For any other | ||
| // granularity, we just fall back to the toString(). See GranularityType#isStandard(). | ||
| for (GranularityType value : GranularityType.values()) { | ||
| if (value.getDefaultGranularity().equals(granularity)) { | ||
| return value.name(); | ||
| } | ||
| } | ||
| return granularity.toString(); | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public DateTime getTimeChunk() | ||
| { | ||
| return timeChunk; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public int getNumSegments() | ||
| { | ||
| return numSegments; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public int getMaxNumSegments() | ||
| { | ||
| return maxNumSegments; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public Granularity getSegmentGranularity() | ||
| { | ||
| return segmentGranularity; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| if (!super.equals(o)) { | ||
| return false; | ||
| } | ||
| TooManySegmentsInTimeChunkFault that = (TooManySegmentsInTimeChunkFault) o; | ||
| return numSegments == that.numSegments | ||
| && maxNumSegments == that.maxNumSegments | ||
| && Objects.equals(timeChunk, that.timeChunk) | ||
| && Objects.equals(segmentGranularity, that.segmentGranularity); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(super.hashCode(), timeChunk, numSegments, maxNumSegments, segmentGranularity); | ||
| } | ||
| } |
This file contains 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 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
Oops, something went wrong.