This is an automated email from the ASF dual-hosted git repository. snlee pushed a commit to branch revert-12032-santizeNanNegativeZeroBehaviour in repository https://gitbox.apache.org/repos/asf/pinot.git
commit 09b235875489d4cb24ba2d7da85f029dfb259313 Author: Seunghyun Lee <[email protected]> AuthorDate: Mon Nov 27 11:39:57 2023 -0800 Revert "modifed test to ensure order of transformers." This reverts commit 05be5cfd9ade65d2785a412f6b0692f7ba0c0eb6. --- .../local/recordtransformer/SpecialValueTransformer.java | 2 +- .../local/recordtransformer/RecordTransformerTest.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/SpecialValueTransformer.java b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/SpecialValueTransformer.java index 3383803194..26df94933a 100644 --- a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/SpecialValueTransformer.java +++ b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/recordtransformer/SpecialValueTransformer.java @@ -97,7 +97,7 @@ public class SpecialValueTransformer implements RecordTransformer { negativeZeroNanSanitizedValues.add(nanTransformedValue); } } - record.putValue(element, negativeZeroNanSanitizedValues.toArray()); + record.putValue(element,negativeZeroNanSanitizedValues.toArray()); } else { // Single-valued column. Object zeroTransformedValue = transformNegativeZero(value); diff --git a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/recordtransformer/RecordTransformerTest.java b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/recordtransformer/RecordTransformerTest.java index 410fa19564..2685f8b6da 100644 --- a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/recordtransformer/RecordTransformerTest.java +++ b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/recordtransformer/RecordTransformerTest.java @@ -305,9 +305,9 @@ public class RecordTransformerTest { Schema schema = new Schema.SchemaBuilder().addSingleValueDimension("svInt", DataType.INT) .addSingleValueDimension("svDouble", DataType.DOUBLE) .addSingleValueDimension("expressionTestColumn", DataType.INT) - .addSingleValueDimension("svNaN", DataType.FLOAT).addMultiValueDimension("mvNaN", DataType.FLOAT) + .addSingleValueDimension("svNaN", DataType.FLOAT).addMultiValueDimension("mvNaN",DataType.FLOAT) .addSingleValueDimension("emptyDimensionForNullValueTransformer", DataType.FLOAT) - .addSingleValueDimension("svStringNull", DataType.STRING) + .addSingleValueDimension("svStringWithNullCharacters", DataType.STRING) .addSingleValueDimension("indexableExtras", DataType.JSON) .addDateTime("timeCol", DataType.TIMESTAMP, "1:MILLISECONDS:TIMESTAMP", "1:MILLISECONDS").build(); @@ -326,7 +326,7 @@ public class RecordTransformerTest { List<RecordTransformer> currentListOfTransformers = CompositeTransformer.getDefaultTransformers(tableConfig, schema); - // Create a list of transformers in the original order to compare. + // Create a list of transformers to compare. List<RecordTransformer> expectedListOfTransformers = List.of(new ExpressionTransformer(tableConfig, schema), new FilterTransformer(tableConfig), new SchemaConformingTransformer(tableConfig, schema), new DataTypeTransformer(tableConfig, schema), @@ -352,15 +352,14 @@ public class RecordTransformerTest { // Data for SpecialValue Transformer. record.putValue("svNaN", Float.NaN); - record.putValue("mvNaN", new Float[]{1.0f, Float.NaN, 2.0f}); + record.putValue("mvNaN",new Float[]{1.0f,Float.NaN,2.0f}); // Data for sanitization transformer. - record.putValue("svStringNull", null); + record.putValue("svStringWithNullCharacters", "1\0002\0003"); for (int i = 0; i < NUMBER_OF_TRANSFORMERS; i++) { - GenericRow copyRecord = record.copy(); GenericRow currentRecord = currentListOfTransformers.get(i).transform(record); - GenericRow expectedRecord = expectedListOfTransformers.get(i).transform(copyRecord); + GenericRow expectedRecord = expectedListOfTransformers.get(i).transform(record); assertEquals(currentRecord, expectedRecord); record = expectedRecord; } @@ -653,8 +652,7 @@ public class RecordTransformerTest { new Float[]{0.0f, 2.0f}); assertEquals(record.getValue("mvDoubleNaN"), new Double[]{0.0d, 2.0d}); - assertEquals(new ArrayList<>(record.getNullValueFields()), - new ArrayList<>(Arrays.asList("svFloatNaN", "svDoubleNaN"))); + assertEquals(new ArrayList<>(record.getNullValueFields()), new ArrayList<>(Arrays.asList("svFloatNaN","svDoubleNaN"))); } // Test empty record --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
