Skip to content
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

remix nested columns #14014

Merged
merged 16 commits into from
Apr 5, 2023
Prev Previous commit
Next Next commit
fix npe and style
clintropolis committed Apr 2, 2023
commit 4ab840d2f71808f83f9b34870ea6af861c3befec
Original file line number Diff line number Diff line change
@@ -205,7 +205,7 @@ public StandardArrayColumnSupplier(
this.arrayDictionarySupplier = arrayDictionarySupplier;
this.encodedValueColumnSupplier = encodedValueColumnSupplier;
this.valueIndexes = valueIndexes;
this.nullValueBitmap = valueIndexes.get(0);
this.nullValueBitmap = valueIndexes.get(0) == null ? bitmapFactory.makeEmptyImmutableBitmap() : valueIndexes.get(0);
}

@Override
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ private StandardDoubleColumnSupplier(
this.valueColumnSupplier = valueColumnSupplier;
this.valueIndexes = valueIndexes;
this.bitmapFactory = bitmapFactory;
this.nullValueBitmap = valueIndexes.get(0);
this.nullValueBitmap = valueIndexes.get(0) == null ? bitmapFactory.makeEmptyImmutableBitmap() : valueIndexes.get(0);
}

@Override
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ private StandardLongColumnSupplier(
this.valueColumnSupplier = valueColumnSupplier;
this.valueIndexes = valueIndexes;
this.bitmapFactory = bitmapFactory;
this.nullValueBitmap = valueIndexes.get(0);
this.nullValueBitmap = valueIndexes.get(0) == null ? bitmapFactory.makeEmptyImmutableBitmap() : valueIndexes.get(0);
}

@Override
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ private StandardStringColumnSupplier(
this.encodedColumnSupplier = encodedColumnSupplier;
this.valueIndexes = valueIndexes;
this.bitmapFactory = serdeFactory.getBitmapFactory();
this.nullValueBitmap = valueIndexes.get(0);
this.nullValueBitmap = valueIndexes.get(0) == null ? bitmapFactory.makeEmptyImmutableBitmap() : valueIndexes.get(0);
}

@Override
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@
import org.apache.druid.metadata.DefaultPasswordProvider;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.column.RowSignature;
import org.apache.druid.segment.nested.NestedDataComplexTypeSerde;
import org.apache.druid.server.security.Access;
import org.apache.druid.server.security.ForbiddenException;
import org.apache.druid.sql.calcite.external.ExternalDataSource;