jtao15 commented on a change in pull request #6224:
URL: https://github.com/apache/incubator-pinot/pull/6224#discussion_r517667947
##########
File path:
pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ClusterIntegrationTestUtils.java
##########
@@ -666,149 +668,14 @@ public static void testQuery(String pinotQuery, String
queryFormat, String broke
}
Set<String> expectedValues = new HashSet<>();
List<String> expectedOrderByValues = new ArrayList<>();
- Map<String, String> reusableExpectedValueMap = new HashMap<>();
- Map<String, List<String>> reusableMultiValuesMap = new HashMap<>();
- List<String> reusableColumnOrder = new ArrayList<>();
- int h2NumRows;
- for (h2NumRows = 0; h2ResultSet.next() && h2NumRows <
MAX_NUM_ROWS_TO_COMPARE; h2NumRows++) {
- reusableExpectedValueMap.clear();
- reusableMultiValuesMap.clear();
- reusableColumnOrder.clear();
-
- int numColumns = h2MetaData.getColumnCount();
- for (int columnIndex = 1; columnIndex <= numColumns; columnIndex++) {
- String columnName = h2MetaData.getColumnName(columnIndex);
-
- // Handle null result and convert boolean value to lower case
- String columnValue = h2ResultSet.getString(columnIndex);
- if (columnValue == null) {
- columnValue = "null";
- } else {
- columnValue = convertBooleanToLowerCase(columnValue);
- }
- // Handle multi-value columns
- int length = columnName.length();
- if (length > 5 && columnName.substring(length - 5, length -
1).equals("__MV")) {
- // Multi-value column
- String multiValueColumnName = columnName.substring(0, length - 5);
- List<String> multiValue =
reusableMultiValuesMap.get(multiValueColumnName);
- if (multiValue == null) {
- multiValue = new ArrayList<>();
- reusableMultiValuesMap.put(multiValueColumnName, multiValue);
- reusableColumnOrder.add(multiValueColumnName);
- }
- multiValue.add(columnValue);
- } else {
- // Single-value column
- reusableExpectedValueMap.put(columnName, columnValue);
- reusableColumnOrder.add(columnName);
- }
- }
-
- // Add multi-value column results to the expected values
- // The reason for this step is that Pinot does not maintain order of
elements in multi-value columns
- for (Map.Entry<String, List<String>> entry :
reusableMultiValuesMap.entrySet()) {
- List<String> multiValue = entry.getValue();
- Collections.sort(multiValue);
- reusableExpectedValueMap.put(entry.getKey(), multiValue.toString());
- }
-
- // Build expected value String
- StringBuilder expectedValue = new StringBuilder();
- StringBuilder expectedOrderByValue = new StringBuilder();
- for (String column : reusableColumnOrder) {
-
expectedValue.append(column).append(':').append(reusableExpectedValueMap.get(column)).append('
');
- if (orderByColumns.contains(column)) {
-
expectedOrderByValue.append(column).append(':').append(reusableExpectedValueMap.get(column)).append('
');
- }
- }
- expectedValues.add(expectedValue.toString());
- expectedOrderByValues.add(expectedOrderByValue.toString());
- }
+ int h2NumRows = getH2ExpectedValues(expectedValues,
expectedOrderByValues, h2ResultSet, h2MetaData, orderByColumns);
Review comment:
You are right, I think we can remove `queryFormat` cause it will always
be 'pql' for `testQuery()`
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
