Skip to content

[Backport] fix bug in nested v4 format merger from refactoring #14060

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.

Sign up for GitHub

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 2 commits into from
Apr 13, 2023
Merged

[Backport] fix bug in nested v4 format merger from refactoring #14060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecf312a
fix bug in nested v4 format merger from refactoring (#14053)
clintropolis Apr 11, 2023
015ad87
Merge remote-tracking branch 'upstream/26.0.0' into backport-14053-to…
clintropolis Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.druid.segment.data.ImmutableBitmapValues;
import org.apache.druid.segment.data.IndexedIterable;
import org.apache.druid.segment.nested.NestedCommonFormatColumn;
import org.apache.druid.segment.nested.NestedDataComplexTypeSerde;
import org.apache.druid.segment.nested.SortedValueDictionary;
import org.apache.druid.segment.selector.settable.SettableColumnValueSelector;
import org.apache.druid.segment.selector.settable.SettableLongColumnValueSelector;
Expand Down Expand Up @@ -174,7 +175,9 @@ public NestedColumnMergable getNestedColumnMergeables(String columnName)
if (columnHolder == null) {
return null;
}
if (!(columnHolder.getColumnFormat() instanceof NestedCommonFormatColumn.Format)) {
final ColumnFormat format = columnHolder.getColumnFormat();
if (!(format instanceof NestedCommonFormatColumn.Format
|| format instanceof NestedDataComplexTypeSerde.NestedColumnFormatV4)) {
return null;
}

Expand Down
12 changes: 6 additions & 6 deletions processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
import org.apache.druid.query.aggregation.AggregatorFactory;
import org.apache.druid.query.aggregation.CountAggregatorFactory;
import org.apache.druid.query.expression.TestExprMacroTable;
import org.apache.druid.segment.AutoTypeColumnSchema;
import org.apache.druid.segment.IncrementalIndexSegment;
import org.apache.druid.segment.IndexBuilder;
import org.apache.druid.segment.IndexSpec;
import org.apache.druid.segment.NestedDataDimensionSchema;
import org.apache.druid.segment.QueryableIndexSegment;
import org.apache.druid.segment.Segment;
import org.apache.druid.segment.TestHelper;
Expand Down Expand Up @@ -96,11 +96,11 @@ public class NestedDataTestUtils
DimensionsSpec.builder()
.setDimensions(
Arrays.asList(
new AutoTypeColumnSchema("dim"),
new AutoTypeColumnSchema("nest_json"),
new AutoTypeColumnSchema("nester_json"),
new AutoTypeColumnSchema("variant_json"),
new AutoTypeColumnSchema("list_json")
new NestedDataDimensionSchema("dim"),
new NestedDataDimensionSchema("nest_json"),
new NestedDataDimensionSchema("nester_json"),
new NestedDataDimensionSchema("variant_json"),
new NestedDataDimensionSchema("list_json")
)
)
.build();
Expand Down
34 changes: 27 additions & 7 deletions processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
Expand Down Expand Up @@ -222,15 +223,34 @@ public QueryableIndex buildMMappedIndex()
Preconditions.checkNotNull(indexMerger, "indexMerger");
Preconditions.checkNotNull(tmpDir, "tmpDir");
try (final IncrementalIndex incrementalIndex = buildIncrementalIndex()) {
List<IndexableAdapter> adapters = Collections.singletonList(
new QueryableIndexIndexableAdapter(
indexIO.loadIndex(
indexMerger.persist(
incrementalIndex,
new File(
tmpDir,
StringUtils.format("testIndex-%s", ThreadLocalRandom.current().nextInt(Integer.MAX_VALUE))
),
indexSpec,
null
)
)
)
);
// Do a 'merge' of the persisted segment even though there is only one; this time it will be reading from the
// queryable index instead of the incremental index, which also mimics the behavior of real ingestion tasks
// which persist incremental indexes as intermediate segments and then merges all the intermediate segments to
// publish
return indexIO.loadIndex(
indexMerger.persist(
incrementalIndex,
new File(
tmpDir,
StringUtils.format("testIndex-%s", ThreadLocalRandom.current().nextInt(Integer.MAX_VALUE))
),
indexMerger.merge(
adapters,
schema.isRollup(),
schema.getMetrics(),
tmpDir,
schema.getDimensionsSpec(),
indexSpec,
null
Integer.MAX_VALUE
)
);
}
Expand Down