-
Notifications
You must be signed in to change notification settings - Fork 3.8k
longer compatibility window for nested column format v4 #14955
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
clintropolis
merged 9 commits into
apache:master
from
clintropolis:longer-json-backwards-compatibility-window
Sep 12, 2023
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
904f99b
longer compatibility window for nested column format v4
clintropolis 9224d0f
test stuff
clintropolis bcdd434
fix maybe
clintropolis 87dc838
style
clintropolis 6cae3d9
named handler providers
clintropolis e8aa9a5
Merge remote-tracking branch 'upstream/master' into longer-json-backw…
clintropolis 7fca66d
fix test
clintropolis c02e361
fix test
clintropolis 21dfb64
javadoc and validation
clintropolis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
87 changes: 87 additions & 0 deletions
87
processing/src/main/java/org/apache/druid/segment/DefaultColumnFormatConfig.java
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 |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * 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.segment; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.apache.druid.error.DruidException; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.Objects; | ||
|
|
||
| public class DefaultColumnFormatConfig | ||
| { | ||
| public static void validateNestedFormatVersion(@Nullable Integer formatVersion) | ||
| { | ||
| if (formatVersion != null) { | ||
| if (formatVersion < 4 || formatVersion > 5) { | ||
| throw DruidException.forPersona(DruidException.Persona.USER) | ||
| .ofCategory(DruidException.Category.INVALID_INPUT) | ||
| .build("Unsupported nested column format version[%s]", formatVersion); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @JsonProperty("nestedColumnFormatVersion") | ||
| private final Integer nestedColumnFormatVersion; | ||
|
|
||
| @JsonCreator | ||
| public DefaultColumnFormatConfig( | ||
| @JsonProperty("nestedColumnFormatVersion") @Nullable Integer nestedColumnFormatVersion | ||
| ) | ||
| { | ||
| this.nestedColumnFormatVersion = nestedColumnFormatVersion; | ||
| validateNestedFormatVersion(this.nestedColumnFormatVersion); | ||
| } | ||
|
|
||
| @Nullable | ||
| @JsonProperty("nestedColumnFormatVersion") | ||
| public Integer getNestedColumnFormatVersion() | ||
| { | ||
| return nestedColumnFormatVersion; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| DefaultColumnFormatConfig that = (DefaultColumnFormatConfig) o; | ||
| return Objects.equals(nestedColumnFormatVersion, that.nestedColumnFormatVersion); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(nestedColumnFormatVersion); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return "DefaultColumnFormatConfig{" + | ||
| "nestedColumnFormatVersion=" + nestedColumnFormatVersion + | ||
| '}'; | ||
| } | ||
| } | ||
105 changes: 105 additions & 0 deletions
105
processing/src/main/java/org/apache/druid/segment/NestedDataColumnHandlerV4.java
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 |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * 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.segment; | ||
|
|
||
| import org.apache.druid.data.input.impl.DimensionSchema; | ||
| import org.apache.druid.java.util.common.io.Closer; | ||
| import org.apache.druid.query.dimension.DefaultDimensionSpec; | ||
| import org.apache.druid.query.dimension.DimensionSpec; | ||
| import org.apache.druid.segment.column.ColumnCapabilities; | ||
| import org.apache.druid.segment.column.ColumnType; | ||
| import org.apache.druid.segment.nested.StructuredData; | ||
| import org.apache.druid.segment.selector.settable.SettableColumnValueSelector; | ||
| import org.apache.druid.segment.selector.settable.SettableObjectColumnValueSelector; | ||
| import org.apache.druid.segment.writeout.SegmentWriteOutMedium; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| public class NestedDataColumnHandlerV4 implements DimensionHandler<StructuredData, StructuredData, StructuredData> | ||
| { | ||
| private static Comparator<ColumnValueSelector> COMPARATOR = (s1, s2) -> | ||
| StructuredData.COMPARATOR.compare( | ||
| StructuredData.wrap(s1.getObject()), | ||
| StructuredData.wrap(s2.getObject()) | ||
| ); | ||
|
|
||
| private final String name; | ||
|
|
||
| public NestedDataColumnHandlerV4(String name) | ||
| { | ||
| this.name = name; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDimensionName() | ||
| { | ||
| return name; | ||
| } | ||
|
|
||
| @Override | ||
| public DimensionSpec getDimensionSpec() | ||
| { | ||
| return new DefaultDimensionSpec(name, name, ColumnType.NESTED_DATA); | ||
| } | ||
|
|
||
| @Override | ||
| public DimensionSchema getDimensionSchema(ColumnCapabilities capabilities) | ||
| { | ||
| return new NestedDataColumnSchema(name, 4); | ||
| } | ||
|
|
||
| @Override | ||
| public DimensionIndexer<StructuredData, StructuredData, StructuredData> makeIndexer(boolean useMaxMemoryEstimates) | ||
| { | ||
| return new NestedDataColumnIndexerV4(); | ||
| } | ||
|
|
||
| @Override | ||
| public DimensionMergerV9 makeMerger( | ||
| IndexSpec indexSpec, | ||
| SegmentWriteOutMedium segmentWriteOutMedium, | ||
| ColumnCapabilities capabilities, | ||
| ProgressIndicator progress, | ||
| Closer closer | ||
| ) | ||
| { | ||
| return new NestedDataColumnMergerV4(name, indexSpec, segmentWriteOutMedium, closer); | ||
| } | ||
|
|
||
| @Override | ||
| public int getLengthOfEncodedKeyComponent(StructuredData dimVals) | ||
| { | ||
| // this is called in one place, OnheapIncrementalIndex, where returning 0 here means the value is null | ||
| // so the actual value we return here doesn't matter. we should consider refactoring this to a boolean | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| public Comparator<ColumnValueSelector> getEncodedValueSelectorComparator() | ||
| { | ||
| return COMPARATOR; | ||
| } | ||
|
|
||
| @Override | ||
| public SettableColumnValueSelector makeNewSettableEncodedValueSelector() | ||
| { | ||
| return new SettableObjectColumnValueSelector(); | ||
| } | ||
| } |
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.
Nit - can you add in the error message that supported values are 4 and 5?
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.
i think im going to skip this for now to not churn through CI again, and also seems like we should find some programmatic way to list what versions are supported so the error messaging doesn't become stale if we add another version. Also the versions are still kind of confusing so idk how I feel about exposing them too much, 4 makes sense, but 5 is a virtual version since 5 is really version 0 of the new nested common format introduced by 'auto'.