clintropolis commented on code in PR #13561:
URL: https://github.com/apache/druid/pull/13561#discussion_r1049146778
##########
processing/src/test/java/org/apache/druid/segment/nested/NestedDataColumnSupplierTest.java:
##########
@@ -216,72 +223,124 @@ private void smokeTest(NestedDataComplexColumn column)
throws IOException
Assert.assertEquals(ImmutableSet.of(ColumnType.LONG),
column.getColumnTypes(xPath));
Assert.assertEquals(ColumnType.LONG,
column.getColumnHolder(xPath).getCapabilities().toColumnType());
ColumnValueSelector<?> xSelector = column.makeColumnValueSelector(xPath,
offset);
+ DimensionSelector xDimSelector = column.makeDimensionSelector(xPath,
offset, null);
ColumnIndexSupplier xIndexSupplier = column.getColumnIndexSupplier(xPath);
Assert.assertNotNull(xIndexSupplier);
StringValueSetIndex xValueIndex =
xIndexSupplier.as(StringValueSetIndex.class);
+ DruidPredicateIndex xPredicateIndex =
xIndexSupplier.as(DruidPredicateIndex.class);
NullValueIndex xNulls = xIndexSupplier.as(NullValueIndex.class);
final List<NestedPathPart> yPath = NestedPathFinder.parseJsonPath("$.y");
Assert.assertEquals(ImmutableSet.of(ColumnType.DOUBLE),
column.getColumnTypes(yPath));
Assert.assertEquals(ColumnType.DOUBLE,
column.getColumnHolder(yPath).getCapabilities().toColumnType());
ColumnValueSelector<?> ySelector = column.makeColumnValueSelector(yPath,
offset);
+ DimensionSelector yDimSelector = column.makeDimensionSelector(yPath,
offset, null);
ColumnIndexSupplier yIndexSupplier = column.getColumnIndexSupplier(yPath);
Assert.assertNotNull(yIndexSupplier);
StringValueSetIndex yValueIndex =
yIndexSupplier.as(StringValueSetIndex.class);
+ DruidPredicateIndex yPredicateIndex =
yIndexSupplier.as(DruidPredicateIndex.class);
NullValueIndex yNulls = yIndexSupplier.as(NullValueIndex.class);
final List<NestedPathPart> zPath = NestedPathFinder.parseJsonPath("$.z");
Assert.assertEquals(ImmutableSet.of(ColumnType.STRING),
column.getColumnTypes(zPath));
Assert.assertEquals(ColumnType.STRING,
column.getColumnHolder(zPath).getCapabilities().toColumnType());
ColumnValueSelector<?> zSelector = column.makeColumnValueSelector(zPath,
offset);
+ DimensionSelector zDimSelector = column.makeDimensionSelector(zPath,
offset, null);
ColumnIndexSupplier zIndexSupplier = column.getColumnIndexSupplier(zPath);
Assert.assertNotNull(zIndexSupplier);
StringValueSetIndex zValueIndex =
zIndexSupplier.as(StringValueSetIndex.class);
+ DruidPredicateIndex zPredicateIndex =
zIndexSupplier.as(DruidPredicateIndex.class);
NullValueIndex zNulls = zIndexSupplier.as(NullValueIndex.class);
- Assert.assertEquals(ImmutableList.of(xPath, yPath, zPath),
column.getNestedFields());
+ final List<NestedPathPart> vPath = NestedPathFinder.parseJsonPath("$.v");
+ Assert.assertEquals(ImmutableSet.of(ColumnType.STRING, ColumnType.LONG,
ColumnType.DOUBLE), column.getColumnTypes(vPath));
+ Assert.assertEquals(ColumnType.STRING,
column.getColumnHolder(vPath).getCapabilities().toColumnType());
+ ColumnValueSelector<?> vSelector = column.makeColumnValueSelector(vPath,
offset);
+ DimensionSelector vDimSelector = column.makeDimensionSelector(vPath,
offset, null);
+ ColumnIndexSupplier vIndexSupplier = column.getColumnIndexSupplier(vPath);
+ Assert.assertNotNull(vIndexSupplier);
+ StringValueSetIndex vValueIndex =
vIndexSupplier.as(StringValueSetIndex.class);
+ DruidPredicateIndex vPredicateIndex =
vIndexSupplier.as(DruidPredicateIndex.class);
+ NullValueIndex vNulls = vIndexSupplier.as(NullValueIndex.class);
+
+ Assert.assertEquals(ImmutableList.of(vPath, xPath, yPath, zPath),
column.getNestedFields());
for (int i = 0; i < data.size(); i++) {
Map row = data.get(i);
Assert.assertEquals(
JSON_MAPPER.writeValueAsString(row),
JSON_MAPPER.writeValueAsString(StructuredData.unwrap(rawSelector.getObject()))
);
- if (row.containsKey("x")) {
- Assert.assertEquals(row.get("x"), xSelector.getObject());
- Assert.assertEquals(row.get("x"), xSelector.getLong());
-
Assert.assertTrue(xValueIndex.forValue(String.valueOf(row.get("x"))).computeBitmapResult(resultFactory).get(i));
-
Assert.assertFalse(xNulls.forNull().computeBitmapResult(resultFactory).get(i));
- } else {
- Assert.assertNull(xSelector.getObject());
- Assert.assertTrue(xSelector.isNull());
-
Assert.assertTrue(xValueIndex.forValue(null).computeBitmapResult(resultFactory).get(i));
-
Assert.assertTrue(xNulls.forNull().computeBitmapResult(resultFactory).get(i));
- }
- if (row.containsKey("y")) {
- Assert.assertEquals(row.get("y"), ySelector.getObject());
- Assert.assertEquals(row.get("y"), ySelector.getDouble());
-
Assert.assertTrue(yValueIndex.forValue(String.valueOf(row.get("y"))).computeBitmapResult(resultFactory).get(i));
-
Assert.assertFalse(yNulls.forNull().computeBitmapResult(resultFactory).get(i));
- } else {
- Assert.assertNull(ySelector.getObject());
- Assert.assertTrue(ySelector.isNull());
-
Assert.assertTrue(yValueIndex.forValue(null).computeBitmapResult(resultFactory).get(i));
-
Assert.assertTrue(yNulls.forNull().computeBitmapResult(resultFactory).get(i));
- }
- if (row.containsKey("z")) {
- Assert.assertEquals(row.get("z"), zSelector.getObject());
- Assert.assertTrue(zValueIndex.forValue((String)
row.get("z")).computeBitmapResult(resultFactory).get(i));
-
Assert.assertFalse(zNulls.forNull().computeBitmapResult(resultFactory).get(i));
- } else {
- Assert.assertNull(zSelector.getObject());
-
Assert.assertTrue(zValueIndex.forValue(null).computeBitmapResult(resultFactory).get(i));
-
Assert.assertTrue(zNulls.forNull().computeBitmapResult(resultFactory).get(i));
- }
+
+ testPath(row, i, "v", vSelector, vDimSelector, vValueIndex,
vPredicateIndex, vNulls, null);
+ testPath(row, i, "x", xSelector, xDimSelector, xValueIndex,
xPredicateIndex, xNulls, ColumnType.LONG);
+ testPath(row, i, "y", ySelector, yDimSelector, yValueIndex,
yPredicateIndex, yNulls, ColumnType.DOUBLE);
+ testPath(row, i, "z", zSelector, zDimSelector, zValueIndex,
zPredicateIndex, zNulls, ColumnType.STRING);
+
offset.increment();
}
}
+ private void testPath(
+ Map row,
+ int rowNumber,
+ String path,
+ ColumnValueSelector<?> valueSelector,
+ DimensionSelector dimSelector,
+ StringValueSetIndex valueSetIndex,
+ DruidPredicateIndex predicateIndex,
+ NullValueIndex nullValueIndex,
+ @Nullable ColumnType singleType
+ )
+ {
+ if (row.containsKey(path) && row.get(path) != null) {
Review Comment:
oops probably missed, will add
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
