Skip to content

Use JsonNode for comparing Json strings to fix the flaky test #1

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

Open
prathyushreddylpr wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Use JsonNode for comparing Json strings to fix the flaky test #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70564b6
fix the flaky test
Sep 1, 2023
4d7a82d
Update FlattenSpecParquetReaderTest.java
prathyushreddylpr Oct 13, 2023
5054fd7
Update FlattenSpecParquetReaderTest.java
prathyushreddylpr Oct 13, 2023
11a7ad1
Update FlattenSpecParquetReaderTest.java
prathyushreddylpr Nov 11, 2023
abb838e
Fix 6 flaky tests using JSON node comparison
lxb007981 Nov 19, 2023
172f094
Merge pull request #2 from lxb007981/fix-flaky-r
prathyushreddylpr Nov 28, 2023
111acaa
resolve comments
Nov 30, 2023
b803fac
remove space
Nov 30, 2023
9bea280
change asserttrue to assertequals
Dec 1, 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
25 changes: 11 additions & 14 deletions ...extensions/src/test/java/org/apache/druid/data/input/parquet/CompatParquetReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.druid.data.input.parquet;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.ColumnsFilter;
import org.apache.druid.data.input.InputEntityReader;
Expand All @@ -42,6 +43,8 @@
*/
public class CompatParquetReaderTest extends BaseParquetReaderTest
{
private static final ObjectMapper JSON_MAPPER = new ObjectMapper();

@Test
public void testBinaryAsString() throws IOException
{
Expand Down Expand Up @@ -94,19 +97,14 @@ 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(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.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())
);
+ "}";
Assert.assertEquals(JSON_MAPPER.readTree(expectedJsonBinary), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampledAsBinary.get(0).getRawValues())));
}


@Test
public void testParquet1217() throws IOException
{
Expand Down Expand Up @@ -143,7 +141,7 @@ public void testParquet1217() throws IOException
final String expectedJson = "{\n"
+ " \"col\" : -1\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}

@Test
Expand Down Expand Up @@ -305,7 +303,7 @@ required group nestedIntsColumn (LIST) {
+ " } ]\n"
+ " }\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}

@Test
Expand Down Expand Up @@ -342,10 +340,9 @@ public void testOldRepeatedInt() throws IOException
final String expectedJson = "{\n"
+ " \"repeatedInt\" : [ 1, 2, 3 ]\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}


@Test
public void testReadNestedArrayStruct() throws IOException
{
Expand Down Expand Up @@ -385,7 +382,7 @@ public void testReadNestedArrayStruct() throws IOException
+ " \"repeatedMessage\" : [ 3 ]\n"
+ " } ]\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}

@Test
Expand Down Expand Up @@ -435,6 +432,6 @@ public void testProtoStructWithArray() throws IOException
+ " \"someId\" : 9\n"
+ " }\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(JSON_MAPPER.readTree(expectedJson), JSON_MAPPER.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}
}
4 changes: 3 additions & 1 deletion ...sions/src/test/java/org/apache/druid/data/input/parquet/FlattenSpecParquetReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.druid.data.input.parquet;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.ColumnsFilter;
import org.apache.druid.data.input.InputEntityReader;
Expand Down Expand Up @@ -205,8 +206,9 @@ public void testFlat1FlattenSelectListItem() throws IOException
flattenSpec
);
List<InputRowListPlusRawValues> sampled = sampleAllRows(reader);
ObjectMapper mapper = new ObjectMapper();

Assert.assertEquals(FLAT_JSON, DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues()));
Assert.assertEquals(mapper.readTree(FLAT_JSON), mapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampled.get(0).getRawValues())));
}


Expand Down
6 changes: 4 additions & 2 deletions ...nsions/src/test/java/org/apache/druid/data/input/parquet/TimestampsParquetReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.druid.data.input.parquet;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.ColumnsFilter;
import org.apache.druid.data.input.InputEntityReader;
Expand Down Expand Up @@ -91,8 +92,9 @@ public void testDateHandling() throws IOException
+ " \"idx\" : 1,\n"
+ " \"date_as_date\" : 1497744000000\n"
+ "}";
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampledAsString.get(0).getRawValues()));
Assert.assertEquals(expectedJson, DEFAULT_JSON_WRITER.writeValueAsString(sampledAsDate.get(0).getRawValues()));
ObjectMapper mapper = new ObjectMapper();
Assert.assertEquals(mapper.readTree(expectedJson), mapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampledAsString.get(0).getRawValues())));
Assert.assertEquals(mapper.readTree(expectedJson), mapper.readTree(DEFAULT_JSON_WRITER.writeValueAsString(sampledAsDate.get(0).getRawValues())));
}

@Test
Expand Down