Skip to content

Commit 5fd2081

Browse files
ahkcsahkcs
committed
fixes
Signed-off-by: Kai Huang <[email protected]>
1 parent 4fd48e7 commit 5fd2081

File tree

3 files changed

+86
-88
lines changed

3 files changed

+86
-88
lines changed

‎core/src/main/java/org/opensearch/sql/calcite/utils/CalciteToolsHelper.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,7 @@ public RelNode visit(TableScan scan) {
359359
String errorMsg = e.getMessage();
360360
if (errorMsg != null
361361
&& errorMsg.contains("Error while preparing plan")
362-
&& errorMsg.contains("WIDTH_BUCKET")
363-
&& (errorMsg.contains("OVER") || errorMsg.contains("window"))) {
362+
&& errorMsg.contains("WIDTH_BUCKET")) {
364363
throw new UnsupportedOperationException(
365364
"The 'bins' parameter on timestamp fields is not supported when pushdown is"
366365
+ " disabled.");

‎integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java‎

Lines changed: 85 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.junit.runner.RunWith;
1111
import org.junit.runners.Suite;
1212
import org.opensearch.sql.calcite.remote.*;
13+
import org.opensearch.sql.calcite.tpch.CalcitePPLTpchIT;
1314
import org.opensearch.sql.ppl.PPLIntegTestCase;
1415

1516
/**
@@ -19,90 +20,90 @@
1920
*/
2021
@RunWith(Suite.class)
2122
@Suite.SuiteClasses({
22-
// CalciteExplainIT.class,
23-
// CalciteArrayFunctionIT.class,
24-
CalciteBinCommandIT.class
25-
// CalciteConvertTZFunctionIT.class,
26-
// CalciteCsvFormatIT.class,
27-
// CalciteDataTypeIT.class,
28-
// CalciteDateTimeComparisonIT.class,
29-
// CalciteDateTimeFunctionIT.class,
30-
// CalciteDateTimeImplementationIT.class,
31-
// CalciteDedupCommandIT.class,
32-
// CalciteDescribeCommandIT.class,
33-
// CalciteExpandCommandIT.class,
34-
// CalciteFieldsCommandIT.class,
35-
// CalciteFillNullCommandIT.class,
36-
// CalciteFlattenCommandIT.class,
37-
// CalciteFlattenDocValueIT.class,
38-
// CalciteGeoIpFunctionsIT.class,
39-
// CalciteGeoPointFormatsIT.class,
40-
// CalciteHeadCommandIT.class,
41-
// CalciteInformationSchemaCommandIT.class,
42-
// CalciteIPComparisonIT.class,
43-
// CalciteIPFunctionsIT.class,
44-
// CalciteJsonFunctionsIT.class,
45-
// CalciteLegacyAPICompatibilityIT.class,
46-
// CalciteLikeQueryIT.class,
47-
// CalciteMathematicalFunctionIT.class,
48-
// CalciteMultisearchCommandIT.class,
49-
// CalciteMultiValueStatsIT.class,
50-
// CalciteNewAddedCommandsIT.class,
51-
// CalciteNowLikeFunctionIT.class,
52-
// CalciteObjectFieldOperateIT.class,
53-
// CalciteOperatorIT.class,
54-
// CalciteParseCommandIT.class,
55-
// CalcitePPLAggregationIT.class,
56-
// CalcitePPLAppendcolIT.class,
57-
// CalcitePPLAppendCommandIT.class,
58-
// CalcitePPLBasicIT.class,
59-
// CalcitePPLBuiltinDatetimeFunctionInvalidIT.class,
60-
// CalcitePPLBuiltinFunctionIT.class,
61-
// CalcitePPLBuiltinFunctionsNullIT.class,
62-
// CalcitePPLCaseFunctionIT.class,
63-
// CalcitePPLCastFunctionIT.class,
64-
// CalcitePPLConditionBuiltinFunctionIT.class,
65-
// CalcitePPLCryptographicFunctionIT.class,
66-
// CalcitePPLDedupIT.class,
67-
// CalcitePPLEventstatsIT.class,
68-
// CalciteStreamstatsCommandIT.class,
69-
// CalcitePPLExistsSubqueryIT.class,
70-
// CalcitePPLExplainIT.class,
71-
// CalcitePPLFillnullIT.class,
72-
// CalcitePPLGrokIT.class,
73-
// CalcitePPLInSubqueryIT.class,
74-
// CalcitePPLIPFunctionIT.class,
75-
// CalcitePPLJoinIT.class,
76-
// CalcitePPLJsonBuiltinFunctionIT.class,
77-
// CalcitePPLLookupIT.class,
78-
// CalcitePPLParseIT.class,
79-
// CalcitePPLPatternsIT.class,
80-
// CalcitePPLPluginIT.class,
81-
// CalcitePPLRenameIT.class,
82-
// CalcitePPLScalarSubqueryIT.class,
83-
// CalcitePPLSortIT.class,
84-
// CalcitePPLStringBuiltinFunctionIT.class,
85-
// CalcitePPLTrendlineIT.class,
86-
// CalcitePrometheusDataSourceCommandsIT.class,
87-
// CalciteQueryAnalysisIT.class,
88-
// CalciteRareCommandIT.class,
89-
// CalciteRegexCommandIT.class,
90-
// CalciteRexCommandIT.class,
91-
// CalciteRenameCommandIT.class,
92-
// CalciteReplaceCommandIT.class,
93-
// CalciteResourceMonitorIT.class,
94-
// CalciteSearchCommandIT.class,
95-
// CalciteSettingsIT.class,
96-
// CalciteShowDataSourcesCommandIT.class,
97-
// CalciteSortCommandIT.class,
98-
// CalciteStatsCommandIT.class,
99-
// CalciteSystemFunctionIT.class,
100-
// CalciteTextFunctionIT.class,
101-
// CalciteTopCommandIT.class,
102-
// CalciteTrendlineCommandIT.class,
103-
// CalciteVisualizationFormatIT.class,
104-
// CalciteWhereCommandIT.class,
105-
// CalcitePPLTpchIT.class
23+
CalciteExplainIT.class,
24+
CalciteArrayFunctionIT.class,
25+
CalciteBinCommandIT.class,
26+
CalciteConvertTZFunctionIT.class,
27+
CalciteCsvFormatIT.class,
28+
CalciteDataTypeIT.class,
29+
CalciteDateTimeComparisonIT.class,
30+
CalciteDateTimeFunctionIT.class,
31+
CalciteDateTimeImplementationIT.class,
32+
CalciteDedupCommandIT.class,
33+
CalciteDescribeCommandIT.class,
34+
CalciteExpandCommandIT.class,
35+
CalciteFieldsCommandIT.class,
36+
CalciteFillNullCommandIT.class,
37+
CalciteFlattenCommandIT.class,
38+
CalciteFlattenDocValueIT.class,
39+
CalciteGeoIpFunctionsIT.class,
40+
CalciteGeoPointFormatsIT.class,
41+
CalciteHeadCommandIT.class,
42+
CalciteInformationSchemaCommandIT.class,
43+
CalciteIPComparisonIT.class,
44+
CalciteIPFunctionsIT.class,
45+
CalciteJsonFunctionsIT.class,
46+
CalciteLegacyAPICompatibilityIT.class,
47+
CalciteLikeQueryIT.class,
48+
CalciteMathematicalFunctionIT.class,
49+
CalciteMultisearchCommandIT.class,
50+
CalciteMultiValueStatsIT.class,
51+
CalciteNewAddedCommandsIT.class,
52+
CalciteNowLikeFunctionIT.class,
53+
CalciteObjectFieldOperateIT.class,
54+
CalciteOperatorIT.class,
55+
CalciteParseCommandIT.class,
56+
CalcitePPLAggregationIT.class,
57+
CalcitePPLAppendcolIT.class,
58+
CalcitePPLAppendCommandIT.class,
59+
CalcitePPLBasicIT.class,
60+
CalcitePPLBuiltinDatetimeFunctionInvalidIT.class,
61+
CalcitePPLBuiltinFunctionIT.class,
62+
CalcitePPLBuiltinFunctionsNullIT.class,
63+
CalcitePPLCaseFunctionIT.class,
64+
CalcitePPLCastFunctionIT.class,
65+
CalcitePPLConditionBuiltinFunctionIT.class,
66+
CalcitePPLCryptographicFunctionIT.class,
67+
CalcitePPLDedupIT.class,
68+
CalcitePPLEventstatsIT.class,
69+
CalciteStreamstatsCommandIT.class,
70+
CalcitePPLExistsSubqueryIT.class,
71+
CalcitePPLExplainIT.class,
72+
CalcitePPLFillnullIT.class,
73+
CalcitePPLGrokIT.class,
74+
CalcitePPLInSubqueryIT.class,
75+
CalcitePPLIPFunctionIT.class,
76+
CalcitePPLJoinIT.class,
77+
CalcitePPLJsonBuiltinFunctionIT.class,
78+
CalcitePPLLookupIT.class,
79+
CalcitePPLParseIT.class,
80+
CalcitePPLPatternsIT.class,
81+
CalcitePPLPluginIT.class,
82+
CalcitePPLRenameIT.class,
83+
CalcitePPLScalarSubqueryIT.class,
84+
CalcitePPLSortIT.class,
85+
CalcitePPLStringBuiltinFunctionIT.class,
86+
CalcitePPLTrendlineIT.class,
87+
CalcitePrometheusDataSourceCommandsIT.class,
88+
CalciteQueryAnalysisIT.class,
89+
CalciteRareCommandIT.class,
90+
CalciteRegexCommandIT.class,
91+
CalciteRexCommandIT.class,
92+
CalciteRenameCommandIT.class,
93+
CalciteReplaceCommandIT.class,
94+
CalciteResourceMonitorIT.class,
95+
CalciteSearchCommandIT.class,
96+
CalciteSettingsIT.class,
97+
CalciteShowDataSourcesCommandIT.class,
98+
CalciteSortCommandIT.class,
99+
CalciteStatsCommandIT.class,
100+
CalciteSystemFunctionIT.class,
101+
CalciteTextFunctionIT.class,
102+
CalciteTopCommandIT.class,
103+
CalciteTrendlineCommandIT.class,
104+
CalciteVisualizationFormatIT.class,
105+
CalciteWhereCommandIT.class,
106+
CalcitePPLTpchIT.class
106107
})
107108
public class CalciteNoPushdownIT {
108109
private static boolean wasPushdownEnabled;

‎integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteBinCommandIT.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ public void testStatsWithBinsOnTimeAndTermField_Avg() throws IOException {
11301130
@Test
11311131
public void testBinsOnTimeFieldWithPushdownDisabled_ShouldFail() throws IOException {
11321132
// Verify that bins parameter on timestamp fields fails with clear error when pushdown disabled
1133-
// This is a known limitation: Calcite cannot execute window functions in expressions
11341133
enabledOnlyWhenPushdownIsDisabled();
11351134

11361135
ResponseException exception =
@@ -1142,7 +1141,6 @@ public void testBinsOnTimeFieldWithPushdownDisabled_ShouldFail() throws IOExcept
11421141

11431142
// Verify the error message clearly explains the limitation and suggests solutions
11441143
String errorMessage = exception.getMessage();
1145-
System.out.println("Debugging error message: " + errorMessage);
11461144
assertTrue(
11471145
"Expected clear error message about bins parameter not supported on timestamp fields when "
11481146
+ "pushdown is disabled, but got: "

0 commit comments

Comments
 (0)