Add original SQL and fix the bug of Sarg point (q41)

LantaoJin · LantaoJin · commit 8ee8b0949eb2 · 2025-07-10T15:45:45.000+08:00
Signed-off-by: Lantao Jin &lt;ltjin@amazon.com&gt;
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/CalcitePPLClickBenchIT.java
@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.calcite.clickbench;
 
-import java.util.Set;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
@@ -18,9 +17,4 @@ public void init() throws Exception {
     enableCalcite();
     disallowCalciteFallback();
   }
-
-  @Override
-  protected Set<Integer> ignored() {
-    return Set.of(29, 41, 43);
-  }
 }
diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/PPLClickBenchIT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/clickbench/PPLClickBenchIT.java
@@ -48,8 +48,9 @@ public static void reset() throws IOException {
     System.out.println();
   }
 
+  /** Ignore queries that are not supported by Calcite. */
   protected Set<Integer> ignored() {
-    return Set.of(29, 43);
+    return Set.of(29);
   }
 
   @Test
diff --git a/integ-test/src/test/resources/clickbench/data/clickbench.json b/integ-test/src/test/resources/clickbench/data/clickbench.json
@@ -1,2 +1,2 @@
 {"index":{}}
-{"WatchID":"9110818468285196899","JavaEnable":0,"Title":"","GoodEvent":1,"EventTime":"2013-07-14 20:38:47","EventDate":"2013-07-15","CounterID":17,"ClientIP":-1216690514,"RegionID":839,"UserID":"-2461439046089301801","CounterClass":0,"OS":0,"UserAgent":0,"URL":"","Referer":"","IsRefresh":0,"RefererCategoryID":0,"RefererRegionID":0,"URLCategoryID":0,"URLRegionID":0,"ResolutionWidth":0,"ResolutionHeight":0,"ResolutionDepth":0,"FlashMajor":0,"FlashMinor":0,"FlashMinor2":"","NetMajor":0,"NetMinor":0,"UserAgentMajor":0,"UserAgentMinor":"�O","CookieEnable":0,"JavascriptEnable":0,"IsMobile":0,"MobilePhone":0,"MobilePhoneModel":"","Params":"","IPNetworkID":3793327,"TraficSourceID":4,"SearchEngineID":0,"SearchPhrase":"","AdvEngineID":0,"IsArtifical":0,"WindowClientWidth":0,"WindowClientHeight":0,"ClientTimeZone":-1,"ClientEventTime":"1971-01-01 14:16:06","SilverlightVersion1":0,"SilverlightVersion2":0,"SilverlightVersion3":0,"SilverlightVersion4":0,"PageCharset":"","CodeVersion":0,"IsLink":0,"IsDownload":0,"IsNotBounce":0,"FUniqID":"0","OriginalURL":"","HID":0,"IsOldCounter":0,"IsEvent":0,"IsParameter":0,"DontCountHits":0,"WithHash":0,"HitColor":"5","LocalEventTime":"2013-07-15 10:47:34","Age":0,"Sex":0,"Income":0,"Interests":0,"Robotness":0,"RemoteIP":-1001831330,"WindowName":-1,"OpenerName":-1,"HistoryLength":-1,"BrowserLanguage":"�","BrowserCountry":"�\f","SocialNetwork":"","SocialAction":"","HTTPError":0,"SendTiming":0,"DNSTiming":0,"ConnectTiming":0,"ResponseStartTiming":0,"ResponseEndTiming":0,"FetchTiming":0,"SocialSourceNetworkID":0,"SocialSourcePage":"","ParamPrice":"0","ParamOrderID":"","ParamCurrency":"NH\u001C","ParamCurrencyID":0,"OpenstatServiceName":"","OpenstatCampaignID":"","OpenstatAdID":"","OpenstatSourceID":"","UTMSource":"","UTMMedium":"","UTMCampaign":"","UTMContent":"","UTMTerm":"","FromTag":"","HasGCLID":0,"RefererHash":"-296158784638538920","URLHash":"-8417682003818480435","CLID":0}
+{"WatchID":"9110818468285196899","JavaEnable":0,"Title":"","GoodEvent":1,"EventTime":"2013-07-14 20:38:47","EventDate":"2013-07-15","CounterID":17,"ClientIP":-1216690514,"RegionID":839,"UserID":"-2461439046089301801","CounterClass":0,"OS":0,"UserAgent":0,"URL":"","Referer":"https://example.org/about","IsRefresh":0,"RefererCategoryID":0,"RefererRegionID":0,"URLCategoryID":0,"URLRegionID":0,"ResolutionWidth":0,"ResolutionHeight":0,"ResolutionDepth":0,"FlashMajor":0,"FlashMinor":0,"FlashMinor2":"","NetMajor":0,"NetMinor":0,"UserAgentMajor":0,"UserAgentMinor":"�O","CookieEnable":0,"JavascriptEnable":0,"IsMobile":0,"MobilePhone":0,"MobilePhoneModel":"","Params":"","IPNetworkID":3793327,"TraficSourceID":4,"SearchEngineID":0,"SearchPhrase":"","AdvEngineID":0,"IsArtifical":0,"WindowClientWidth":0,"WindowClientHeight":0,"ClientTimeZone":-1,"ClientEventTime":"1971-01-01 14:16:06","SilverlightVersion1":0,"SilverlightVersion2":0,"SilverlightVersion3":0,"SilverlightVersion4":0,"PageCharset":"","CodeVersion":0,"IsLink":0,"IsDownload":0,"IsNotBounce":0,"FUniqID":"0","OriginalURL":"","HID":0,"IsOldCounter":0,"IsEvent":0,"IsParameter":0,"DontCountHits":0,"WithHash":0,"HitColor":"5","LocalEventTime":"2013-07-15 10:47:34","Age":0,"Sex":0,"Income":0,"Interests":0,"Robotness":0,"RemoteIP":-1001831330,"WindowName":-1,"OpenerName":-1,"HistoryLength":-1,"BrowserLanguage":"�","BrowserCountry":"�\f","SocialNetwork":"","SocialAction":"","HTTPError":0,"SendTiming":0,"DNSTiming":0,"ConnectTiming":0,"ResponseStartTiming":0,"ResponseEndTiming":0,"FetchTiming":0,"SocialSourceNetworkID":0,"SocialSourcePage":"","ParamPrice":"0","ParamOrderID":"","ParamCurrency":"NH\u001C","ParamCurrencyID":0,"OpenstatServiceName":"","OpenstatCampaignID":"","OpenstatAdID":"","OpenstatSourceID":"","UTMSource":"","UTMMedium":"","UTMCampaign":"","UTMContent":"","UTMTerm":"","FromTag":"","HasGCLID":0,"RefererHash":"-296158784638538920","URLHash":"-8417682003818480435","CLID":0}
diff --git a/integ-test/src/test/resources/clickbench/queries/q1.ppl b/integ-test/src/test/resources/clickbench/queries/q1.ppl
@@ -1 +1,4 @@
+/*
+SELECT COUNT(*) FROM hits;
+*/
 source=hits | stats count()
diff --git a/integ-test/src/test/resources/clickbench/queries/q10.ppl b/integ-test/src/test/resources/clickbench/queries/q10.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT RegionID, SUM(AdvEngineID), COUNT(*) AS c, AVG(ResolutionWidth), COUNT(DISTINCT UserID) 
+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
 | sort - c
diff --git a/integ-test/src/test/resources/clickbench/queries/q11.ppl b/integ-test/src/test/resources/clickbench/queries/q11.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT MobilePhoneModel, COUNT(DISTINCT UserID) AS u
+FROM hits WHERE MobilePhoneModel <> ''
+GROUP BY MobilePhoneModel ORDER BY u DESC LIMIT 10;
+*/
 source=hits
 | where MobilePhoneModel != ''
 | stats dc(UserID) as u by MobilePhoneModel
diff --git a/integ-test/src/test/resources/clickbench/queries/q12.ppl b/integ-test/src/test/resources/clickbench/queries/q12.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT MobilePhone, MobilePhoneModel, COUNT(DISTINCT UserID) AS u
+FROM hits WHERE MobilePhoneModel <> ''
+GROUP BY MobilePhone, MobilePhoneModel ORDER BY u DESC LIMIT 10;
+*/
 source=hits
 | where MobilePhoneModel != ''
 | stats dc(UserID) as u by MobilePhone, MobilePhoneModel
diff --git a/integ-test/src/test/resources/clickbench/queries/q13.ppl b/integ-test/src/test/resources/clickbench/queries/q13.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT SearchPhrase, COUNT(*) AS c FROM hits WHERE SearchPhrase <> ''
+GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | stats count() as c by SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q14.ppl b/integ-test/src/test/resources/clickbench/queries/q14.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT SearchPhrase, COUNT(DISTINCT UserID) AS u
+FROM hits WHERE SearchPhrase <> ''
+GROUP BY SearchPhrase ORDER BY u DESC LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | stats dc(UserID) as u by SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q15.ppl b/integ-test/src/test/resources/clickbench/queries/q15.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT SearchEngineID, SearchPhrase, COUNT(*) AS c
+FROM hits WHERE SearchPhrase <> ''
+GROUP BY SearchEngineID, SearchPhrase ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | stats count() as c by SearchEngineID, SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q16.ppl b/integ-test/src/test/resources/clickbench/queries/q16.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT UserID, COUNT(*) FROM hits GROUP BY UserID ORDER BY COUNT(*) DESC LIMIT 10;
+*/
 source=hits
 | stats count() by UserID
 | sort - `count()`
diff --git a/integ-test/src/test/resources/clickbench/queries/q17.ppl b/integ-test/src/test/resources/clickbench/queries/q17.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT UserID, SearchPhrase, COUNT(*)
+FROM hits GROUP BY UserID, SearchPhrase ORDER BY COUNT(*) DESC LIMIT 10;
+*/
 source=hits
 | stats count() by UserID, SearchPhrase
 | sort - `count()`
diff --git a/integ-test/src/test/resources/clickbench/queries/q18.ppl b/integ-test/src/test/resources/clickbench/queries/q18.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT UserID, SearchPhrase, COUNT(*) FROM hits GROUP BY UserID, SearchPhrase LIMIT 10;
+*/
 source=hits
 | stats count() by UserID, SearchPhrase
 | head 10
diff --git a/integ-test/src/test/resources/clickbench/queries/q19.ppl b/integ-test/src/test/resources/clickbench/queries/q19.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT UserID, extract(minute FROM EventTime) AS m, SearchPhrase, COUNT(*)
+FROM hits GROUP BY UserID, m, SearchPhrase ORDER BY COUNT(*) DESC LIMIT 10;
+*/
 source=hits
 | eval m = extract(minute from EventTime)
 | stats count() by UserID, m, SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q2.ppl b/integ-test/src/test/resources/clickbench/queries/q2.ppl
@@ -1 +1,4 @@
+/*
+SELECT COUNT(*) FROM hits WHERE AdvEngineID <> 0;
+*/
 source=hits | where AdvEngineID!=0 | stats count()
diff --git a/integ-test/src/test/resources/clickbench/queries/q20.ppl b/integ-test/src/test/resources/clickbench/queries/q20.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT UserID FROM hits WHERE UserID = 435090932899640449;
+*/
 source=hits
 | where UserID = 435090932899640449
 | fields UserID
diff --git a/integ-test/src/test/resources/clickbench/queries/q21.ppl b/integ-test/src/test/resources/clickbench/queries/q21.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT COUNT(*) FROM hits WHERE URL LIKE '%google%';
+*/
 source=hits
 | where like(URL, '%google%')
 | stats count()
diff --git a/integ-test/src/test/resources/clickbench/queries/q22.ppl b/integ-test/src/test/resources/clickbench/queries/q22.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT SearchPhrase, MIN(URL), COUNT(*) AS c
+FROM hits WHERE URL LIKE '%google%' AND SearchPhrase <> ''
+GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where like(URL, '%google%') and SearchPhrase != ''
 | stats /* min(URL), */ count() as c by SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q23.ppl b/integ-test/src/test/resources/clickbench/queries/q23.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT SearchPhrase, MIN(URL), MIN(Title), COUNT(*) AS c, COUNT(DISTINCT UserID)
+FROM hits WHERE Title LIKE '%Google%' AND URL NOT LIKE '%.google.%' AND SearchPhrase <> ''
+GROUP BY SearchPhrase ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where like(Title, '%Google%') and not like(URL, '%.google.%') and SearchPhrase != ''
 | stats /* min(URL), min(Title), */ count() as c, dc(UserID) by SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q24.ppl b/integ-test/src/test/resources/clickbench/queries/q24.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT * FROM hits WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10;
+*/
 source=hits
 | where like(URL, '%google%')
 | sort EventTime
diff --git a/integ-test/src/test/resources/clickbench/queries/q25.ppl b/integ-test/src/test/resources/clickbench/queries/q25.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY EventTime LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | sort EventTime
diff --git a/integ-test/src/test/resources/clickbench/queries/q26.ppl b/integ-test/src/test/resources/clickbench/queries/q26.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY SearchPhrase LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | fields SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q27.ppl b/integ-test/src/test/resources/clickbench/queries/q27.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT SearchPhrase FROM hits WHERE SearchPhrase <> '' ORDER BY EventTime, SearchPhrase LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | sort EventTime, SearchPhrase
diff --git a/integ-test/src/test/resources/clickbench/queries/q28.ppl b/integ-test/src/test/resources/clickbench/queries/q28.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT CounterID, AVG(length(URL)) AS l, COUNT(*) AS c
+FROM hits WHERE URL <> '' GROUP BY CounterID HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;
+*/
 source=hits
 | where URL != ''
 | stats avg(length(URL)) as l, count() as c by CounterID
diff --git a/integ-test/src/test/resources/clickbench/queries/q29.ppl b/integ-test/src/test/resources/clickbench/queries/q29.ppl
@@ -1,3 +1,8 @@
+/*
+SELECT REGEXP_REPLACE(Referer, '^https?://(?:www\.)?([^/]+)/.*$', '\1') AS k,
+AVG(length(Referer)) AS l, COUNT(*) AS c, MIN(Referer)
+FROM hits WHERE Referer <> '' GROUP BY k HAVING COUNT(*) > 100000 ORDER BY l DESC LIMIT 25;
+*/
 source=hits
 | Referer != ''
 | eval k = regexp_replace(Referer, '^https?://(?:www\.)?([^/]+)/.*$', '\1')
diff --git a/integ-test/src/test/resources/clickbench/queries/q3.ppl b/integ-test/src/test/resources/clickbench/queries/q3.ppl
@@ -1 +1,4 @@
+/*
+SELECT SUM(AdvEngineID), COUNT(*), AVG(ResolutionWidth) FROM hits;
+*/
 source=hits | stats sum(AdvEngineID), count() , avg(ResolutionWidth)
diff --git a/integ-test/src/test/resources/clickbench/queries/q30.ppl b/integ-test/src/test/resources/clickbench/queries/q30.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT SUM(ResolutionWidth), SUM(ResolutionWidth + 1), ... SUM(ResolutionWidth + 89) FROM hits;
+*/
 source=hits
 | stats
     sum(ResolutionWidth),
diff --git a/integ-test/src/test/resources/clickbench/queries/q31.ppl b/integ-test/src/test/resources/clickbench/queries/q31.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT SearchEngineID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth)
+FROM hits WHERE SearchPhrase <> '' GROUP BY SearchEngineID, ClientIP ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | stats count() as c, sum(IsRefresh), avg(ResolutionWidth) by SearchEngineID, ClientIP
diff --git a/integ-test/src/test/resources/clickbench/queries/q32.ppl b/integ-test/src/test/resources/clickbench/queries/q32.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth)
+FROM hits WHERE SearchPhrase <> '' GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | where SearchPhrase != ''
 | stats count() as c, sum(IsRefresh), avg(ResolutionWidth) by WatchID, ClientIP
diff --git a/integ-test/src/test/resources/clickbench/queries/q33.ppl b/integ-test/src/test/resources/clickbench/queries/q33.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT WatchID, ClientIP, COUNT(*) AS c, SUM(IsRefresh), AVG(ResolutionWidth)
+FROM hits GROUP BY WatchID, ClientIP ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | stats count() as c, sum(IsRefresh), avg(ResolutionWidth) by WatchID, ClientIP
 | sort - c
diff --git a/integ-test/src/test/resources/clickbench/queries/q34.ppl b/integ-test/src/test/resources/clickbench/queries/q34.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT URL, COUNT(*) AS c FROM hits GROUP BY URL ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | stats count() as c by URL
 | sort - c
diff --git a/integ-test/src/test/resources/clickbench/queries/q35.ppl b/integ-test/src/test/resources/clickbench/queries/q35.ppl
@@ -1,3 +1,6 @@
+/*
+SELECT 1, URL, COUNT(*) AS c FROM hits GROUP BY 1, URL ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | eval const = 1
 | stats count() as c by const, URL
diff --git a/integ-test/src/test/resources/clickbench/queries/q36.ppl b/integ-test/src/test/resources/clickbench/queries/q36.ppl
@@ -1,3 +1,7 @@
+/*
+SELECT ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3, COUNT(*) AS c
+FROM hits GROUP BY ClientIP, ClientIP - 1, ClientIP - 2, ClientIP - 3 ORDER BY c DESC LIMIT 10;
+*/
 source=hits
 | eval `ClientIP - 1` = ClientIP - 1, `ClientIP - 2` = ClientIP - 2, `ClientIP - 3` = ClientIP - 3
 | stats count() as c by `ClientIP`, `ClientIP - 1`, `ClientIP - 2`, `ClientIP - 3`
diff --git a/integ-test/src/test/resources/clickbench/queries/q37.ppl b/integ-test/src/test/resources/clickbench/queries/q37.ppl
@@ -1,5 +1,11 @@
+/*
+SELECT URL, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31'
+AND DontCountHits = 0 AND IsRefresh = 0 AND URL <> ''
+GROUP BY URL ORDER BY PageViews DESC LIMIT 10;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID=62 and DontCountHits = 0 and IsRefresh = 0 and URL != ''
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and DontCountHits = 0 and IsRefresh = 0 and URL != ''
 | stats count() as PageViews by URL
 | sort - PageViews
 | head 10
diff --git a/integ-test/src/test/resources/clickbench/queries/q38.ppl b/integ-test/src/test/resources/clickbench/queries/q38.ppl
@@ -1,5 +1,11 @@
+/*
+SELECT Title, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31'
+AND DontCountHits = 0 AND IsRefresh = 0 AND Title <> ''
+GROUP BY Title ORDER BY PageViews DESC LIMIT 10;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID = 62 and DontCountHits = 0 and IsRefresh = 0 and Title != ''
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and DontCountHits = 0 and IsRefresh = 0 and Title != ''
 | stats count() as PageViews by Title
 | sort - PageViews
 | head 10
diff --git a/integ-test/src/test/resources/clickbench/queries/q39.ppl b/integ-test/src/test/resources/clickbench/queries/q39.ppl
@@ -1,5 +1,11 @@
+/*
+SELECT URL, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31'
+AND IsRefresh = 0 AND IsLink <> 0 AND IsDownload = 0
+GROUP BY URL ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID = 62 and IsRefresh = 0 and IsLink != 0 and IsDownload = 0
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and IsRefresh = 0 and IsLink != 0 and IsDownload = 0
 | stats count() as PageViews by URL
 | sort - PageViews
 | head 10 from 1000
diff --git a/integ-test/src/test/resources/clickbench/queries/q4.ppl b/integ-test/src/test/resources/clickbench/queries/q4.ppl
@@ -1 +1,4 @@
+/*
+SELECT AVG(UserID) FROM hits;
+*/
 source=hits | stats avg(UserID)
diff --git a/integ-test/src/test/resources/clickbench/queries/q40.ppl b/integ-test/src/test/resources/clickbench/queries/q40.ppl
@@ -1,7 +1,11 @@
+/*
+SELECT TraficSourceID, SearchEngineID, AdvEngineID, CASE WHEN (SearchEngineID = 0 AND AdvEngineID = 0) THEN Referer ELSE '' END AS Src, URL AS Dst, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31' AND IsRefresh = 0
+GROUP BY TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst ORDER BY PageViews DESC LIMIT 10 OFFSET 1000;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID = 62 and IsRefresh = 0
-| eval Src=case(SearchEngineID = 0 and AdvEngineID = 0, Referer else '')
-| eval Dst=URL
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and IsRefresh = 0
+| eval Src=case(SearchEngineID = 0 and AdvEngineID = 0, Referer else ''), Dst=URL
 | stats count() as PageViews by TraficSourceID, SearchEngineID, AdvEngineID, Src, Dst
 | sort - PageViews
 | head 10 from 1000
diff --git a/integ-test/src/test/resources/clickbench/queries/q41.ppl b/integ-test/src/test/resources/clickbench/queries/q41.ppl
@@ -1,5 +1,11 @@
+/*
+SELECT URLHash, EventDate, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31'
+AND IsRefresh = 0 AND TraficSourceID IN (-1, 6) AND RefererHash = 3594120000172545465
+GROUP BY URLHash, EventDate ORDER BY PageViews DESC LIMIT 10 OFFSET 100;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID = 62 and IsRefresh = 0 and TraficSourceID in (-1, 6) and RefererHash = 3594120000172545465
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and IsRefresh = 0 and TraficSourceID in (-1, 6) and RefererHash = 3594120000172545465
 | stats count() as PageViews by URLHash, EventDate
 | sort - PageViews
 | head 10 from 100
diff --git a/integ-test/src/test/resources/clickbench/queries/q42.ppl b/integ-test/src/test/resources/clickbench/queries/q42.ppl
@@ -1,5 +1,11 @@
+/*
+SELECT WindowClientWidth, WindowClientHeight, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-01' AND EventDate <= '2013-07-31'
+AND IsRefresh = 0 AND DontCountHits = 0 AND URLHash = 2868770270353813622
+GROUP BY WindowClientWidth, WindowClientHeight ORDER BY PageViews DESC LIMIT 10 OFFSET 10000;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and CounterID = 62 and IsRefresh = 0 and DontCountHits = 0 and URLHash = 2868770270353813622
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-31 00:00:00' and IsRefresh = 0 and DontCountHits = 0 and URLHash = 2868770270353813622
 | stats count() as PageViews by WindowClientWidth, WindowClientHeight
 | sort - PageViews
 | head 10 from 10000
diff --git a/integ-test/src/test/resources/clickbench/queries/q43.ppl b/integ-test/src/test/resources/clickbench/queries/q43.ppl
@@ -1,7 +1,14 @@
-// EventDate >= '2013-07-01' should work in v3
+/*
+SELECT DATE_FORMAT(EventTime, '%Y-%m-%d %H:00:00') AS M, COUNT(*) AS PageViews
+FROM hits WHERE CounterID = 62 AND EventDate >= '2013-07-14' AND EventDate <= '2013-07-15'
+AND IsRefresh = 0 AND DontCountHits = 0
+GROUP BY DATE_FORMAT(EventTime, '%Y-%m-%d %H:00:00')
+ORDER BY DATE_FORMAT(EventTime, '%Y-%m-%d %H:00:00')
+LIMIT 10 OFFSET 1000;
+*/
 source=hits
-| where EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-15 00:00:00' and CounterID = 62 and IsRefresh = 0 and DontCountHits = 0
-| eval M = date_trunc('minute', EventTime)
+| where CounterID = 62 and EventDate >= '2013-07-01 00:00:00' and EventDate <= '2013-07-15 00:00:00' and IsRefresh = 0 and DontCountHits = 0
+| eval M = date_format(EventTime, '%Y-%m-%d %H:00:00')
 | stats count() as PageViews by M
 | sort M
 | head 10 from 1000
diff --git a/integ-test/src/test/resources/clickbench/queries/q5.ppl b/integ-test/src/test/resources/clickbench/queries/q5.ppl
@@ -1 +1,4 @@
+/*
+SELECT COUNT(DISTINCT UserID) FROM hits;
+*/
 source=hits | stats dc(UserID)
diff --git a/integ-test/src/test/resources/clickbench/queries/q6.ppl b/integ-test/src/test/resources/clickbench/queries/q6.ppl
@@ -1 +1,4 @@
+/*
+SELECT COUNT(DISTINCT SearchPhrase) FROM hits;
+*/
 source=hits | stats dc(SearchPhrase)
diff --git a/integ-test/src/test/resources/clickbench/queries/q7.ppl b/integ-test/src/test/resources/clickbench/queries/q7.ppl
@@ -1 +1,4 @@
+/*
+SELECT MIN(EventDate), MAX(EventDate) FROM hits;
+*/
 source=hits | stats min(EventDate), max(EventDate)
diff --git a/integ-test/src/test/resources/clickbench/queries/q8.ppl b/integ-test/src/test/resources/clickbench/queries/q8.ppl
diff --git a/integ-test/src/test/resources/clickbench/queries/q9.ppl b/integ-test/src/test/resources/clickbench/queries/q9.ppl
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/request/PredicateAnalyzer.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/request/PredicateAnalyzer.java

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`	`package org.opensearch.sql.calcite.clickbench;`
`7`	`7`
`8`		`-import java.util.Set;`
`9`	`8`	`import org.junit.FixMethodOrder;`
`10`	`9`	`import org.junit.runners.MethodSorters;`
`11`	`10`
`@@ -18,9 +17,4 @@ public void init() throws Exception {`
`18`	`17`	`enableCalcite();`
`19`	`18`	`disallowCalciteFallback();`
`20`	`19`	`}`
`21`		`-`
`22`		`- @Override`
`23`		`- protected Set<Integer> ignored() {`
`24`		`- return Set.of(29, 41, 43);`
`25`		`- }`
`26`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@ public static void reset() throws IOException {`
`48`	`48`	`System.out.println();`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ /** Ignore queries that are not supported by Calcite. */`
`51`	`52`	`protected Set<Integer> ignored() {`
`52`		`- return Set.of(29, 43);`
	`53`	`+ return Set.of(29);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`{"index":{}}`
`2`		-{"WatchID":"9110818468285196899","JavaEnable":0,"Title":"","GoodEvent":1,"EventTime":"2013-07-14 20:38:47","EventDate":"2013-07-15","CounterID":17,"ClientIP":-1216690514,"RegionID":839,"UserID":"-2461439046089301801","CounterClass":0,"OS":0,"UserAgent":0,"URL":"","Referer":"","IsRefresh":0,"RefererCategoryID":0,"RefererRegionID":0,"URLCategoryID":0,"URLRegionID":0,"ResolutionWidth":0,"ResolutionHeight":0,"ResolutionDepth":0,"FlashMajor":0,"FlashMinor":0,"FlashMinor2":"","NetMajor":0,"NetMinor":0,"UserAgentMajor":0,"UserAgentMinor":"�O","CookieEnable":0,"JavascriptEnable":0,"IsMobile":0,"MobilePhone":0,"MobilePhoneModel":"","Params":"","IPNetworkID":3793327,"TraficSourceID":4,"SearchEngineID":0,"SearchPhrase":"","AdvEngineID":0,"IsArtifical":0,"WindowClientWidth":0,"WindowClientHeight":0,"ClientTimeZone":-1,"ClientEventTime":"1971-01-01 14:16:06","SilverlightVersion1":0,"SilverlightVersion2":0,"SilverlightVersion3":0,"SilverlightVersion4":0,"PageCharset":"","CodeVersion":0,"IsLink":0,"IsDownload":0,"IsNotBounce":0,"FUniqID":"0","OriginalURL":"","HID":0,"IsOldCounter":0,"IsEvent":0,"IsParameter":0,"DontCountHits":0,"WithHash":0,"HitColor":"5","LocalEventTime":"2013-07-15 10:47:34","Age":0,"Sex":0,"Income":0,"Interests":0,"Robotness":0,"RemoteIP":-1001831330,"WindowName":-1,"OpenerName":-1,"HistoryLength":-1,"BrowserLanguage":"�","BrowserCountry":"�\f","SocialNetwork":"","SocialAction":"","HTTPError":0,"SendTiming":0,"DNSTiming":0,"ConnectTiming":0,"ResponseStartTiming":0,"ResponseEndTiming":0,"FetchTiming":0,"SocialSourceNetworkID":0,"SocialSourcePage":"","ParamPrice":"0","ParamOrderID":"","ParamCurrency":"NH\u001C","ParamCurrencyID":0,"OpenstatServiceName":"","OpenstatCampaignID":"","OpenstatAdID":"","OpenstatSourceID":"","UTMSource":"","UTMMedium":"","UTMCampaign":"","UTMContent":"","UTMTerm":"","FromTag":"","HasGCLID":0,"RefererHash":"-296158784638538920","URLHash":"-8417682003818480435","CLID":0}
	`2`	+{"WatchID":"9110818468285196899","JavaEnable":0,"Title":"","GoodEvent":1,"EventTime":"2013-07-14 20:38:47","EventDate":"2013-07-15","CounterID":17,"ClientIP":-1216690514,"RegionID":839,"UserID":"-2461439046089301801","CounterClass":0,"OS":0,"UserAgent":0,"URL":"","Referer":"https://example.org/about","IsRefresh":0,"RefererCategoryID":0,"RefererRegionID":0,"URLCategoryID":0,"URLRegionID":0,"ResolutionWidth":0,"ResolutionHeight":0,"ResolutionDepth":0,"FlashMajor":0,"FlashMinor":0,"FlashMinor2":"","NetMajor":0,"NetMinor":0,"UserAgentMajor":0,"UserAgentMinor":"�O","CookieEnable":0,"JavascriptEnable":0,"IsMobile":0,"MobilePhone":0,"MobilePhoneModel":"","Params":"","IPNetworkID":3793327,"TraficSourceID":4,"SearchEngineID":0,"SearchPhrase":"","AdvEngineID":0,"IsArtifical":0,"WindowClientWidth":0,"WindowClientHeight":0,"ClientTimeZone":-1,"ClientEventTime":"1971-01-01 14:16:06","SilverlightVersion1":0,"SilverlightVersion2":0,"SilverlightVersion3":0,"SilverlightVersion4":0,"PageCharset":"","CodeVersion":0,"IsLink":0,"IsDownload":0,"IsNotBounce":0,"FUniqID":"0","OriginalURL":"","HID":0,"IsOldCounter":0,"IsEvent":0,"IsParameter":0,"DontCountHits":0,"WithHash":0,"HitColor":"5","LocalEventTime":"2013-07-15 10:47:34","Age":0,"Sex":0,"Income":0,"Interests":0,"Robotness":0,"RemoteIP":-1001831330,"WindowName":-1,"OpenerName":-1,"HistoryLength":-1,"BrowserLanguage":"�","BrowserCountry":"�\f","SocialNetwork":"","SocialAction":"","HTTPError":0,"SendTiming":0,"DNSTiming":0,"ConnectTiming":0,"ResponseStartTiming":0,"ResponseEndTiming":0,"FetchTiming":0,"SocialSourceNetworkID":0,"SocialSourcePage":"","ParamPrice":"0","ParamOrderID":"","ParamCurrency":"NH\u001C","ParamCurrencyID":0,"OpenstatServiceName":"","OpenstatCampaignID":"","OpenstatAdID":"","OpenstatSourceID":"","UTMSource":"","UTMMedium":"","UTMCampaign":"","UTMContent":"","UTMTerm":"","FromTag":"","HasGCLID":0,"RefererHash":"-296158784638538920","URLHash":"-8417682003818480435","CLID":0}
-Original file line number
+Diff line change
@@ @@ -1 +1,4 @@ @@
 +/*
 +SELECT COUNT(*) FROM hits;
 +*/
 source=hits | stats count()