Update clickbench queries with parameter bucket_nullable=false (#4732)

* Update clickbench query

Signed-off-by: Heng Qian <[email protected]>

* Spotless check

Signed-off-by: Heng Qian <[email protected]>

---------

Signed-off-by: Heng Qian <[email protected]>

Author: qianheng-aws

integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/PPLClickBenchIT.java

@@ -5,6 +5,8 @@
 
 package org.opensearch.sql.calcite.clickbench;
 
+import static org.opensearch.sql.util.MatcherUtils.assertYamlEqualsIgnoreId;
+
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
@@ -68,6 +70,11 @@ public void test() throws IOException {
       }
       String ppl = sanitize(loadFromFile("clickbench/queries/q" + i + ".ppl"));
       timing(summary, "q" + i, ppl);
+      // V2 gets unstable scripts, ignore them when comparing plan
+      if (isCalciteEnabled()) {
+        String expected = loadExpectedPlan("clickbench/q" + i + ".yaml");
+        assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
+      }
     }
   }
 }

integ-test/src/test/resources/clickbench/queries/q10.ppl

@@ -3,6 +3,6 @@ SELECT RegionID, SUM(AdvEngineID), COUNT(*) AS c, AVG(ResolutionWidth), COUNT(DI
 FROM hits GROUP BY RegionID ORDER BY c DESC LIMIT 10;
 */
 source=hits
-| stats sum(AdvEngineID), count() as c, avg(ResolutionWidth), dc(UserID) by RegionID
+| stats bucket_nullable=false sum(AdvEngineID), count() as c, avg(ResolutionWidth), dc(UserID) by RegionID
 | sort - c
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q11.ppl

@@ -5,6 +5,6 @@ GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10;
 */
 source=hits
 | where MobilePhoneModel != ''
-| stats dc(UserID) as u by MobilePhoneModel
+| stats bucket_nullable=false dc(UserID) as u by MobilePhoneModel
 | sort - u
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q12.ppl

@@ -5,6 +5,6 @@ GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10;
 */
 source=hits
 | where MobilePhoneModel != ''
-| stats dc(UserID) as u by MobilePhone, MobilePhoneModel
+| stats bucket_nullable=false dc(UserID) as u by MobilePhone, MobilePhoneModel
 | sort - u
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q13.ppl

@@ -4,6 +4,6 @@ GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
 */
 source=hits
 | where SearchPhrase != ''
-| stats count() as c by SearchPhrase
+| stats bucket_nullable=false count() as c by SearchPhrase
 | sort - c
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q14.ppl

@@ -5,6 +5,6 @@ GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10;
 */
 source=hits
 | where SearchPhrase != ''
-| stats dc(UserID) as u by SearchPhrase
+| stats bucket_nullable=false dc(UserID) as u by SearchPhrase
 | sort - u
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q15.ppl

@@ -5,6 +5,6 @@ GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10;
 */
 source=hits
 | where SearchPhrase != ''
-| stats count() as c by SearchEngineID, SearchPhrase
+| stats bucket_nullable=false count() as c by SearchEngineID, SearchPhrase
 | sort - c
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q16.ppl

@@ -2,6 +2,6 @@
 SELECT UserID, COUNT(*) FROM hits GROUP BY UserID ORDER BY COUNT(*) DESC LIMIT 10;
 */
 source=hits
-| stats count() by UserID
+| stats bucket_nullable=false count() by UserID
 | sort - `count()`
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q17.ppl

@@ -3,6 +3,6 @@ SELECT UserID, SearchPhrase, COUNT(*)
 FROM hits GROUP BY UserID, SearchPhrase ORDER BY COUNT(*) DESC LIMIT 10;
 */
 source=hits
-| stats count() by UserID, SearchPhrase
+| stats bucket_nullable=false count() by UserID, SearchPhrase
 | sort - `count()`
-| head 10
+| head 10

integ-test/src/test/resources/clickbench/queries/q18.ppl

@@ -2,5 +2,5 @@
 SELECT UserID, SearchPhrase, COUNT(*) FROM hits GROUP BY UserID, SearchPhrase LIMIT 10;
 */
 source=hits
-| stats count() by UserID, SearchPhrase
-| head 10
+| stats bucket_nullable=false count() by UserID, SearchPhrase
+| head 10