siddharthteotia commented on code in PR #8993:
URL: https://github.com/apache/pinot/pull/8993#discussion_r910695632
##########
pinot-core/src/test/java/org/apache/pinot/queries/MultiValueRawQueriesTest.java:
##########
@@ -807,4 +1320,283 @@ private void
validateAggregateWithGroupByQueryResults(ResultTable resultTable, D
}
}
}
+
+ @Test
+ public void testAggregateWithGroupByOrderByQueries() {
+ {
+ // Aggregation on int columns with group by order by
+ String query = "SELECT COUNTMV(mvIntCol), COUNTMV(mvRawIntCol),
SUMMV(mvIntCol), SUMMV(mvRawIntCol), "
+ + "MINMV(mvIntCol), MINMV(mvRawIntCol), MAXMV(mvIntCol),
MAXMV(mvRawIntCol), AVGMV(mvIntCol), "
+ + "AVGMV(mvRawIntCol), mvRawLongCol from testTable GROUP BY
mvRawLongCol ORDER BY mvRawLongCol";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvIntCol)", "countmv(mvRawIntCol)", "summv(mvIntCol)",
"summv(mvRawIntCol)", "minmv(mvIntCol)",
+ "minmv(mvRawIntCol)", "maxmv(mvIntCol)", "maxmv(mvRawIntCol)",
"avgmv(mvIntCol)", "avgmv(mvRawIntCol)",
+ "mvRawLongCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.LONG
+ });
+ validateAggregateWithGroupByOrderByQueryResults(resultTable, dataSchema);
+ }
+ {
+ // Aggregation on long columns with order by (same results as simple
aggregation)
+ String query = "SELECT COUNTMV(mvLongCol), COUNTMV(mvRawLongCol),
SUMMV(mvLongCol), SUMMV(mvRawLongCol), "
+ + "MINMV(mvLongCol), MINMV(mvRawLongCol), MAXMV(mvLongCol),
MAXMV(mvRawLongCol), AVGMV(mvLongCol), "
+ + "AVGMV(mvRawLongCol), mvRawIntCol from testTable GROUP BY
mvRawIntCol ORDER BY mvRawIntCol";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvLongCol)", "countmv(mvRawLongCol)", "summv(mvLongCol)",
"summv(mvRawLongCol)", "minmv(mvLongCol)",
+ "minmv(mvRawLongCol)", "maxmv(mvLongCol)", "maxmv(mvRawLongCol)",
"avgmv(mvLongCol)", "avgmv(mvRawLongCol)",
+ "mvRawIntCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.INT
+ });
+ validateAggregateWithGroupByOrderByQueryResults(resultTable, dataSchema);
+ }
+ {
+ // Aggregation on float columns with order by (same results as simple
aggregation)
+ String query = "SELECT COUNTMV(mvFloatCol), COUNTMV(mvRawFloatCol),
SUMMV(mvFloatCol), SUMMV(mvRawFloatCol), "
+ + "MINMV(mvFloatCol), MINMV(mvRawFloatCol), MAXMV(mvFloatCol),
MAXMV(mvRawFloatCol), AVGMV(mvFloatCol), "
+ + "AVGMV(mvRawFloatCol), mvRawIntCol from testTable GROUP BY
mvRawIntCol ORDER BY mvRawIntCol";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvFloatCol)", "countmv(mvRawFloatCol)",
"summv(mvFloatCol)", "summv(mvRawFloatCol)",
+ "minmv(mvFloatCol)", "minmv(mvRawFloatCol)", "maxmv(mvFloatCol)",
"maxmv(mvRawFloatCol)",
+ "avgmv(mvFloatCol)", "avgmv(mvRawFloatCol)", "mvRawIntCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.INT
+ });
+ validateAggregateWithGroupByOrderByQueryResults(resultTable, dataSchema);
+ }
+ {
+ // Aggregation on double columns with order by (same results as simple
aggregation)
+ String query = "SELECT COUNTMV(mvDoubleCol), COUNTMV(mvRawDoubleCol),
SUMMV(mvDoubleCol), SUMMV(mvRawDoubleCol), "
+ + "MINMV(mvDoubleCol), MINMV(mvRawDoubleCol), MAXMV(mvDoubleCol),
MAXMV(mvRawDoubleCol), AVGMV(mvDoubleCol), "
+ + "AVGMV(mvRawDoubleCol), mvRawIntCol from testTable GROUP BY
mvRawIntCol ORDER BY mvRawIntCol";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvDoubleCol)", "countmv(mvRawDoubleCol)",
"summv(mvDoubleCol)", "summv(mvRawDoubleCol)",
+ "minmv(mvDoubleCol)", "minmv(mvRawDoubleCol)", "maxmv(mvDoubleCol)",
"maxmv(mvRawDoubleCol)",
+ "avgmv(mvDoubleCol)", "avgmv(mvRawDoubleCol)", "mvRawIntCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.INT
+ });
+ validateAggregateWithGroupByOrderByQueryResults(resultTable, dataSchema);
+ }
+ {
+ // Aggregation on string columns with order by (same results as simple
aggregation)
+ String query = "SELECT COUNTMV(mvStringCol), COUNTMV(mvRawStringCol),
SUMMV(mvStringCol), SUMMV(mvRawStringCol), "
+ + "MINMV(mvStringCol), MINMV(mvRawStringCol), MAXMV(mvStringCol),
MAXMV(mvRawStringCol), AVGMV(mvStringCol), "
+ + "AVGMV(mvRawStringCol), mvRawIntCol from testTable GROUP BY
mvRawIntCol ORDER BY mvRawIntCol";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvStringCol)", "countmv(mvRawStringCol)",
"summv(mvStringCol)", "summv(mvRawStringCol)",
+ "minmv(mvStringCol)", "minmv(mvRawStringCol)", "maxmv(mvStringCol)",
"maxmv(mvRawStringCol)",
+ "avgmv(mvStringCol)", "avgmv(mvRawStringCol)", "mvRawIntCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.INT
+ });
+ validateAggregateWithGroupByOrderByQueryResults(resultTable, dataSchema);
+ }
+ {
+ // Aggregation on int columns with group by order by with order by agg
+ String query = "SELECT COUNTMV(mvIntCol), COUNTMV(mvRawIntCol),
SUMMV(mvIntCol), SUMMV(mvRawIntCol), "
+ + "MINMV(mvIntCol), MINMV(mvRawIntCol), MAXMV(mvIntCol),
MAXMV(mvRawIntCol), AVGMV(mvIntCol), "
+ + "AVGMV(mvRawIntCol), mvRawIntCol from testTable GROUP BY
mvRawIntCol ORDER BY mvRawIntCol DESC, "
+ + "SUMMV(mvRawIntCol) DESC";
+ ResultTable resultTable = getBrokerResponse(query).getResultTable();
+
+ DataSchema dataSchema = new DataSchema(new String[]{
+ "countmv(mvIntCol)", "countmv(mvRawIntCol)", "summv(mvIntCol)",
"summv(mvRawIntCol)", "minmv(mvIntCol)",
+ "minmv(mvRawIntCol)", "maxmv(mvIntCol)", "maxmv(mvRawIntCol)",
"avgmv(mvIntCol)", "avgmv(mvRawIntCol)",
+ "mvRawIntCol"
+ }, new DataSchema.ColumnDataType[]{
+ DataSchema.ColumnDataType.LONG, DataSchema.ColumnDataType.LONG,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.DOUBLE,
DataSchema.ColumnDataType.DOUBLE,
+ DataSchema.ColumnDataType.DOUBLE, DataSchema.ColumnDataType.INT
+ });
+ assertNotNull(resultTable);
+ assertEquals(resultTable.getDataSchema(), dataSchema);
+ List<Object[]> recordRows = resultTable.getRows();
+ assertEquals(recordRows.size(), 10);
+
+ double[] expectedSumValues = new double[]{8472.0, 8464.0, 8456.0,
8448.0, 8440.0, 8432.0, 8424.0, 8416.0, 8408.0,
+ 8400.0};
+ double[] expectedMinValues = new double[]{1009.0, 1008.0, 1007.0,
1006.0, 1005.0, 1004.0, 1003.0, 1002.0, 1001.0,
+ 1000.0};
+ double[] expectedMaxValues = new double[]{1109.0, 1108.0, 1107.0,
1106.0, 1105.0, 1104.0, 1103.0, 1102.0, 1101.0,
+ 1100.0};
+ double[] expectedAvgValues = new double[]{1059.0, 1058.0, 1057.0,
1056.0, 1055.0, 1054.0, 1053.0, 1052.0, 1051.0,
+ 1050.0};
+
+ for (int i = 0; i < 10; i++) {
+ Object[] values = recordRows.get(i);
+ assertEquals(values.length, 11);
+ long count = (long) values[0];
+ long countRaw = (long) values[1];
+ assertEquals(count, 8);
+ assertEquals(count, countRaw);
+
+ double sum = (double) values[2];
+ double sumRaw = (double) values[3];
+ assertEquals(sum, sumRaw);
+ assertEquals(sum, expectedSumValues[i]);
+
+ double min = (double) values[4];
+ double minRaw = (double) values[5];
+ assertEquals(min, minRaw);
+ assertEquals(min, expectedMinValues[i]);
+
+ double max = (double) values[6];
+ double maxRaw = (double) values[7];
+ assertEquals(max, maxRaw);
+ assertEquals(max, expectedMaxValues[i]);
+
+ double avg = (double) values[8];
+ double avgRaw = (double) values[9];
+ assertEquals(avg, avgRaw);
+ assertEquals(avg, expectedAvgValues[i]);
+
+ assertEquals((int) values[10], (int) max);
+ }
+ }
+ }
+
+ private void validateAggregateWithGroupByOrderByQueryResults(ResultTable
resultTable, DataSchema expectedDataSchema) {
+ assertNotNull(resultTable);
+ assertEquals(resultTable.getDataSchema(), expectedDataSchema);
+ List<Object[]> recordRows = resultTable.getRows();
+ assertEquals(recordRows.size(), 10);
+
+ double[] expectedSumValues = new double[]{400.0, 408.0, 416.0, 424.0,
432.0, 440.0, 448.0, 456.0, 464.0, 472.0};
+ double[] expectedMinValues = new double[]{0.0, 1.0, 2.0, 3.0, 4.0, 5.0,
6.0, 7.0, 8.0, 9.0};
+ double[] expectedMaxValues = new double[]{100.0, 101.0, 102.0, 103.0,
104.0, 105.0, 106.0, 107.0, 108.0, 109.0};
+ double[] expectedAvgValues = new double[]{50.0, 51.0, 52.0, 53.0, 54.0,
55.0, 56.0, 57.0, 58.0, 59.0};
+
+ for (int i = 0; i < 10; i++) {
+ Object[] values = recordRows.get(i);
+ assertEquals(values.length, 11);
+ long count = (long) values[0];
+ long countRaw = (long) values[1];
+ assertEquals(count, 8);
+ assertEquals(count, countRaw);
+
+ double sum = (double) values[2];
+ double sumRaw = (double) values[3];
+ assertEquals(sum, sumRaw);
+ assertEquals(sum, expectedSumValues[i]);
+
+ double min = (double) values[4];
+ double minRaw = (double) values[5];
+ assertEquals(min, minRaw);
+ assertEquals(min, expectedMinValues[i]);
+
+ double max = (double) values[6];
+ double maxRaw = (double) values[7];
+ assertEquals(max, maxRaw);
+ assertEquals(max, expectedMaxValues[i]);
+
+ double avg = (double) values[8];
+ double avgRaw = (double) values[9];
+ assertEquals(avg, avgRaw);
+ assertEquals(avg, expectedAvgValues[i]);
+
+ if (expectedDataSchema.getColumnDataType(10) ==
DataSchema.ColumnDataType.LONG) {
+ assertEquals((long) values[10], i);
+ } else {
+ assertEquals((int) values[10], i);
+ }
+ }
+ }
+
+ @Test
+ public void testTransformInsideAggregateQueries() {
Review Comment:
Just saw this. Please ignore my earlier comment on nesting transform inside
aggregate. It seems covered
--
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]
