-
Notifications
You must be signed in to change notification settings - Fork 3.8k
fix: constant columns for clustered segment #19675
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
Open
clintropolis
wants to merge
3
commits into
apache:master
Choose a base branch
from
clintropolis:clustered-segment-improvements-and-fixes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+559
−504
Open
Changes from all commits
Commits
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
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
110 changes: 110 additions & 0 deletions
110
processing/src/main/java/org/apache/druid/segment/column/ConstantColumns.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,110 @@ | ||
| /* | ||
| * 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.column; | ||
|
|
||
| import com.google.common.base.Supplier; | ||
| import com.google.common.base.Suppliers; | ||
| import org.apache.druid.collections.bitmap.BitmapFactory; | ||
| import org.apache.druid.error.DruidException; | ||
| import org.apache.druid.java.util.common.StringUtils; | ||
| import org.apache.druid.segment.data.ConstantColumnarInts; | ||
| import org.apache.druid.segment.data.ConstantUtf8Indexed; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Fabricates in-memory {@link BaseColumnHolder}s for columns whose value is constant across every row, without any | ||
| * on-disk data. This is the runtime analogue of {@link org.apache.druid.segment.serde.NullColumnPartSerde} for | ||
| * arbitrary constants: a STRING constant is presented as a single-value {@link StringUtf8DictionaryEncodedColumn} | ||
| * (backed by a one-entry dictionary), and numeric constants as a {@link ConstantNumericColumn}. | ||
| */ | ||
| public final class ConstantColumns | ||
| { | ||
| private ConstantColumns() | ||
| { | ||
| // no instantiation | ||
| } | ||
|
|
||
| /** | ||
| * Add a constant column (via {@link #makeConstantColumnHolder}) to {@code target} for each column in | ||
| * {@code clusteringColumns}, using the group-constant value at the matching position of {@code clusteringValues}. | ||
| */ | ||
| public static void addConstantClusteringColumns( | ||
| Map<String, Supplier<BaseColumnHolder>> target, | ||
| RowSignature clusteringColumns, | ||
| Object[] clusteringValues, | ||
| int numRows, | ||
| BitmapFactory bitmapFactory | ||
| ) | ||
| { | ||
| DruidException.conditionalDefensive( | ||
| clusteringValues.length == clusteringColumns.size(), | ||
| "clusteringValues length [%s] must match clusteringColumns size [%s]", | ||
| clusteringValues.length, | ||
| clusteringColumns.size() | ||
| ); | ||
| for (int i = 0; i < clusteringColumns.size(); i++) { | ||
| final String columnName = clusteringColumns.getColumnName(i); | ||
| final ColumnType columnType = clusteringColumns.getColumnType(i) | ||
| .orElseThrow(() -> DruidException.defensive( | ||
| "clustering column [%s] is missing a type", | ||
| columnName | ||
| )); | ||
| final BaseColumnHolder holder = makeConstantColumnHolder(columnType, clusteringValues[i], numRows, bitmapFactory); | ||
| target.put(columnName, Suppliers.ofInstance(holder)); | ||
| } | ||
| } | ||
|
|
||
| public static BaseColumnHolder makeConstantColumnHolder( | ||
| ColumnType type, | ||
| @Nullable Object value, | ||
| int numRows, | ||
| BitmapFactory bitmapFactory | ||
| ) | ||
| { | ||
| final ColumnBuilder builder = new ColumnBuilder() | ||
| .setType(type) | ||
| .setHasMultipleValues(false) | ||
| .setHasNulls(value == null); | ||
|
|
||
| if (type.is(ValueType.STRING)) { | ||
| final ByteBuffer utf8 = value == null ? null : StringUtils.toUtf8ByteBuffer((String) value); | ||
| builder.setDictionaryEncodedColumnSupplier( | ||
| Suppliers.ofInstance( | ||
| new StringUtf8DictionaryEncodedColumn( | ||
| new ConstantColumnarInts(numRows, 0), | ||
| null, | ||
| new ConstantUtf8Indexed(utf8), | ||
| bitmapFactory | ||
| ) | ||
| ) | ||
| ); | ||
| } else if (type.isNumeric()) { | ||
| builder.setNumericColumnSupplier( | ||
| Suppliers.ofInstance(new ConstantNumericColumn(type, (Number) value, numRows)) | ||
| ); | ||
| } else { | ||
| throw DruidException.defensive("Cannot build a constant column for type[%s]", type); | ||
| } | ||
| return builder.build(); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
putting trust in caller to pass a good clusteringValues array. bad callsite use could index oob. perhaps worth a defensive size comparison with clusteringColumns