This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c8771041d Fixing flaky ArrayAgg test (#11860)
8c8771041d is described below

commit 8c8771041d043fab30f37877daf3bb9fc600f535
Author: Xiang Fu <[email protected]>
AuthorDate: Mon Oct 23 14:01:35 2023 -0700

    Fixing flaky ArrayAgg test (#11860)
---
 .../pinot/integration/tests/custom/ArrayTest.java  | 87 ++++++++++++----------
 1 file changed, 49 insertions(+), 38 deletions(-)

diff --git 
a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/custom/ArrayTest.java
 
b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/custom/ArrayTest.java
index a7de368720..0555c3a201 100644
--- 
a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/custom/ArrayTest.java
+++ 
b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/custom/ArrayTest.java
@@ -67,15 +67,17 @@ public class ArrayTest extends 
CustomDataQueryClusterIntegrationTest {
             + "arrayAgg(timestampCol, 'TIMESTAMP') "
             + "FROM %s LIMIT %d", getTableName(), getCountStarResult());
     JsonNode jsonNode = postQuery(query);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").size(), 1);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).size(), 
7);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(0).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(1).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(2).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(3).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(4).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(5).size(),
 getCountStarResult());
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(6).size(),
 getCountStarResult());
+    JsonNode rows = jsonNode.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 1);
+    JsonNode row = rows.get(0);
+    Assert.assertEquals(row.size(), 7);
+    Assert.assertEquals(row.get(0).size(), getCountStarResult());
+    Assert.assertEquals(row.get(1).size(), getCountStarResult());
+    Assert.assertEquals(row.get(2).size(), getCountStarResult());
+    Assert.assertEquals(row.get(3).size(), getCountStarResult());
+    Assert.assertEquals(row.get(4).size(), getCountStarResult());
+    Assert.assertEquals(row.get(5).size(), getCountStarResult());
+    Assert.assertEquals(row.get(6).size(), getCountStarResult());
   }
 
   @Test(dataProvider = "useBothQueryEngines")
@@ -97,16 +99,19 @@ public class ArrayTest extends 
CustomDataQueryClusterIntegrationTest {
             + "GROUP BY groupKey "
             + "LIMIT %d", getTableName(), getCountStarResult());
     JsonNode jsonNode = postQuery(query);
-    System.out.println("jsonNode = " + jsonNode);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").size(), 10);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).size(), 
8);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(0).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(1).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(2).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(3).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(4).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(5).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(6).size(),
 getCountStarResult() / 10);
+    JsonNode rows = jsonNode.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 10);
+    for (int i = 0; i < 10; i++) {
+      JsonNode row = rows.get(i);
+      Assert.assertEquals(row.size(), 8);
+      Assert.assertEquals(row.get(0).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(1).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(2).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(3).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(4).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(5).size(), getCountStarResult() / 10);
+      Assert.assertEquals(row.get(6).size(), getCountStarResult() / 10);
+    }
   }
 
   @Test(dataProvider = "useBothQueryEngines")
@@ -126,15 +131,17 @@ public class ArrayTest extends 
CustomDataQueryClusterIntegrationTest {
             + "arrayAgg(timestampCol, 'TIMESTAMP', true) "
             + "FROM %s LIMIT %d", getTableName(), getCountStarResult());
     JsonNode jsonNode = postQuery(query);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").size(), 1);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).size(), 
7);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(0).size(),
 2);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(1).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(2).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(3).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(4).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(5).size(),
 getCountStarResult() / 10);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(6).size(),
 getCountStarResult() / 10);
+    JsonNode rows = jsonNode.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 1);
+    JsonNode row = rows.get(0);
+    Assert.assertEquals(row.size(), 7);
+    Assert.assertEquals(row.get(0).size(), 2);
+    Assert.assertEquals(row.get(1).size(), getCountStarResult() / 10);
+    Assert.assertEquals(row.get(2).size(), getCountStarResult() / 10);
+    Assert.assertEquals(row.get(3).size(), getCountStarResult() / 10);
+    Assert.assertEquals(row.get(4).size(), getCountStarResult() / 10);
+    Assert.assertEquals(row.get(5).size(), getCountStarResult() / 10);
+    Assert.assertEquals(row.get(6).size(), getCountStarResult() / 10);
   }
 
   @Test(dataProvider = "useBothQueryEngines")
@@ -157,15 +164,19 @@ public class ArrayTest extends 
CustomDataQueryClusterIntegrationTest {
             + "GROUP BY groupKey "
             + "LIMIT %d", getTableName(), getCountStarResult());
     JsonNode jsonNode = postQuery(query);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").size(), 10);
-    Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).size(), 
8);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(0).size(),
 2);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(1).size(),
 getCountStarResult() / 100);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(2).size(),
 getCountStarResult() / 100);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(3).size(),
 getCountStarResult() / 100);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(4).size(),
 getCountStarResult() / 100);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(5).size(),
 getCountStarResult() / 100);
-    
Assert.assertEquals(jsonNode.get("resultTable").get("rows").get(0).get(6).size(),
 getCountStarResult() / 100);
+    JsonNode rows = jsonNode.get("resultTable").get("rows");
+    Assert.assertEquals(rows.size(), 10);
+    for (int i = 0; i < 10; i++) {
+      JsonNode row = rows.get(i);
+      Assert.assertEquals(row.size(), 8);
+      Assert.assertEquals(row.get(0).size(), 2);
+      Assert.assertEquals(row.get(1).size(), getCountStarResult() / 100);
+      Assert.assertEquals(row.get(2).size(), getCountStarResult() / 100);
+      Assert.assertEquals(row.get(3).size(), getCountStarResult() / 100);
+      Assert.assertEquals(row.get(4).size(), getCountStarResult() / 100);
+      Assert.assertEquals(row.get(5).size(), getCountStarResult() / 100);
+      Assert.assertEquals(row.get(6).size(), getCountStarResult() / 100);
+    }
   }
 
   @Override
@@ -232,7 +243,7 @@ public class ArrayTest extends 
CustomDataQueryClusterIntegrationTest {
               record.put(LONG_COLUMN, finalI);
               record.put(FLOAT_COLUMN, finalI + RANDOM.nextFloat());
               record.put(DOUBLE_COLUMN, finalI + RANDOM.nextDouble());
-              record.put(STRING_COLUMN, 
RandomStringUtils.random(RANDOM.nextInt(100)));
+              record.put(STRING_COLUMN, RandomStringUtils.random(finalI));
               record.put(TIMESTAMP_COLUMN, finalI);
               record.put(GROUP_BY_COLUMN, String.valueOf(finalI % 10));
               return record;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to