From 8c58b8e1dbb4849ab12cfac893e123f305c45c07 Mon Sep 17 00:00:00 2001 From: ycp2 Date: Tue, 26 Sep 2023 23:14:43 -0500 Subject: [PATCH] Combine fixes for multiple flaky tests in parquet-extensions --- .../input/parquet/BaseParquetReaderTest.java | 1 + .../input/parquet/CompatParquetReaderTest.java | 12 ++++++------ .../parquet/FlattenSpecParquetReaderTest.java | 18 +++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetReaderTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetReaderTest.java index 25fc2e23554f..0658661fb763 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetReaderTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetReaderTest.java @@ -39,6 +39,7 @@ class BaseParquetReaderTest extends InitializedNullHandlingTest { ObjectWriter DEFAULT_JSON_WRITER = new ObjectMapper().writerWithDefaultPrettyPrinter(); + protected final ObjectMapper objectMapper = new ObjectMapper(); InputEntityReader createReader(String parquetFile, InputRowSchema schema, JSONPathSpec flattenSpec) { diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetReaderTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetReaderTest.java index f94949d6bd21..9f7d368e8996 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetReaderTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetReaderTest.java @@ -94,15 +94,15 @@ public void testBinaryAsString() throws IOException + " \"field\" : \"hey this is &é(-è_çà)=^$ù*! Ω^^\",\n" + " \"ts\" : 1471800234\n" + "}"; - Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(expectedJson), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); final String expectedJsonBinary = "{\n" + " \"field\" : \"aGV5IHRoaXMgaXMgJsOpKC3DqF/Dp8OgKT1eJMO5KiEgzqleXg==\",\n" + " \"ts\" : 1471800234\n" + "}"; Assert.assertEquals( - expectedJsonBinary, - DEFAULT_JSON_WRITER.writeValueAsString(sampledAsBinary.get(0).getRawValues()) + objectMapper.readTree(expectedJsonBinary), + objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampledAsBinary.get(0).getRawValues())) ); } @@ -305,7 +305,7 @@ required group nestedIntsColumn (LIST) { + " } ]\n" + " }\n" + "}"; - Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(expectedJson), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -385,7 +385,7 @@ public void testReadNestedArrayStruct() throws IOException + " \"repeatedMessage\" : [ 3 ]\n" + " } ]\n" + "}"; - Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(expectedJson), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -435,6 +435,6 @@ public void testProtoStructWithArray() throws IOException + " \"someId\" : 9\n" + " }\n" + "}"; - Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(expectedJson), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } } diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetReaderTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetReaderTest.java index 726ecde4adf3..325d3431fe00 100644 --- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetReaderTest.java +++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetReaderTest.java @@ -93,7 +93,7 @@ public void testFlat1NoFlattenSpec() throws IOException flattenSpec ); List sampled = sampleAllRows(reader); - Assert.assertEquals(FLAT_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(FLAT_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -126,7 +126,7 @@ public void testFlat1Autodiscover() throws IOException JSONPathSpec.DEFAULT ); List sampled = sampleAllRows(reader); - Assert.assertEquals(FLAT_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(FLAT_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -167,7 +167,7 @@ public void testFlat1Flatten() throws IOException flattenSpec ); List sampled = sampleAllRows(reader); - Assert.assertEquals(FLAT_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(FLAT_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -204,9 +204,9 @@ public void testFlat1FlattenSelectListItem() throws IOException schema, flattenSpec ); - List sampled = sampleAllRows(reader); - Assert.assertEquals(FLAT_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + List sampled = sampleAllRows(reader); + Assert.assertEquals(objectMapper.readTree(FLAT_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @@ -243,7 +243,7 @@ public void testNested1NoFlattenSpec() throws IOException flattenSpec ); List sampled = sampleAllRows(reader); - Assert.assertEquals(NESTED_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(NESTED_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -276,7 +276,7 @@ public void testNested1Autodiscover() throws IOException JSONPathSpec.DEFAULT ); List sampled = sampleAllRows(reader); - Assert.assertEquals(NESTED_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(NESTED_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -319,7 +319,7 @@ public void testNested1Flatten() throws IOException flattenSpec ); List sampled = sampleAllRows(reader); - Assert.assertEquals(NESTED_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(NESTED_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test @@ -360,7 +360,7 @@ public void testNested1FlattenSelectListItem() throws IOException flattenSpec ); List sampled = sampleAllRows(reader); - Assert.assertEquals(NESTED_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())); + Assert.assertEquals(objectMapper.readTree(NESTED_JSON), objectMapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()))); } @Test