Copilot commented on code in PR #17338:
URL: https://github.com/apache/pinot/pull/17338#discussion_r2608303526
##########
pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/AggregationOptimizerTest.java:
##########
@@ -166,25 +253,20 @@ public void testMaxMultiplicationWithNegativeConstant() {
@Test
public void testMultiplicationWithTwoColumnsNotOptimized() {
- // Build sum(a * b) manually; should remain unchanged because neither side
is a constant
- Expression multiplication = RequestUtils.getFunctionExpression("mult",
- RequestUtils.getIdentifierExpression("a"),
RequestUtils.getIdentifierExpression("b"));
- Expression sum = RequestUtils.getFunctionExpression("sum", multiplication);
- PinotQuery pinotQuery = buildQueryWithSelect(sum);
+ // Parse sum(a * b); should remain unchanged because neither side is a
constant
+ String query = "SELECT sum(a * b) FROM mytable";
+ PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(query);
+
+ assertTopLevelOperator(pinotQuery.getSelectList().get(0), "sum");
_optimizer.rewrite(pinotQuery);
Function rewritten = pinotQuery.getSelectList().get(0).getFunctionCall();
+ assertTopLevelOperator(pinotQuery.getSelectList().get(0), "sum");
assertEquals(rewritten.getOperator(), "sum");
assertEquals(rewritten.getOperands().size(), 1);
Function multiplicationFunction =
rewritten.getOperands().get(0).getFunctionCall();
- assertEquals(multiplicationFunction.getOperator(), "mult");
- }
-
- private PinotQuery buildQueryWithSelect(Expression expression) {
- PinotQuery pinotQuery = new PinotQuery();
- pinotQuery.setSelectList(new
ArrayList<>(Collections.singletonList(expression)));
- return pinotQuery;
+ assertEquals(multiplicationFunction.getOperator().toLowerCase(), "times");
Review Comment:
The test is checking for a lowercase version of the operator name, but other
tests in this file use exact string matching without case normalization. This
introduces inconsistency. Consider using the exact operator name as returned by
the parser or normalizing all operator comparisons consistently throughout the
test class.
```suggestion
assertEquals(multiplicationFunction.getOperator(), "times");
```
##########
pinot-common/src/test/java/org/apache/pinot/sql/parsers/rewriter/AggregationOptimizerTest.java:
##########
@@ -19,104 +19,189 @@
package org.apache.pinot.sql.parsers.rewriter;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.List;
import org.apache.pinot.common.request.Expression;
import org.apache.pinot.common.request.ExpressionType;
import org.apache.pinot.common.request.Function;
import org.apache.pinot.common.request.PinotQuery;
-import org.apache.pinot.common.utils.request.RequestUtils;
+import org.apache.pinot.common.utils.config.QueryOptionsUtils;
+import
org.apache.pinot.spi.utils.CommonConstants.Broker.Request.QueryOptionKey;
import org.apache.pinot.sql.parsers.CalciteSqlParser;
+import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
public class AggregationOptimizerTest {
private final AggregationOptimizer _optimizer = new AggregationOptimizer();
+ @BeforeClass
+ public void setUp() {
+ List<QueryRewriter> queryRewriters = new ArrayList<>();
+ for (QueryRewriter queryRewriter :
QueryRewriterFactory.getQueryRewriters()) {
+ if (!(queryRewriter instanceof AggregationOptimizer)) {
+ queryRewriters.add(queryRewriter);
+ }
+ }
+ CalciteSqlParser.QUERY_REWRITERS.clear();
+ CalciteSqlParser.QUERY_REWRITERS.addAll(queryRewriters);
+ }
+
+ @AfterClass
+ public void tearDown() {
+ CalciteSqlParser.QUERY_REWRITERS.clear();
+
CalciteSqlParser.QUERY_REWRITERS.addAll(QueryRewriterFactory.getQueryRewriters());
+ }
Review Comment:
Modifying the static `CalciteSqlParser.QUERY_REWRITERS` list in test
setup/teardown can cause test failures or flakiness if tests run in parallel.
Consider using instance-level state or mocking instead of mutating shared
static state, or ensure tests are configured to run sequentially.
--
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]
