Skip to content

Commit 5439c28

Browse files
authored
[2.19-dev] Disable Calcite by default (#4920)
* [2.19-dev] Disable Calcite by default Signed-off-by: Lantao Jin <ltjin@amazon.com> * Add config in yaml tests Signed-off-by: Lantao Jin <ltjin@amazon.com> --------- Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent eae0be0 commit 5439c28

8 files changed

Lines changed: 93 additions & 1 deletion

File tree

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4513.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
bulk:
49
index: test
@@ -10,6 +15,15 @@ setup:
1015
- '{"value": "2"}'
1116
- '{"index": {"_id": "3"}}'
1217
- '{"value": "3"}'
18+
19+
---
20+
teardown:
21+
- do:
22+
query.settings:
23+
body:
24+
transient:
25+
plugins.calcite.enabled : false
26+
1327
---
1428
"handle agg script push down on metadata field":
1529
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4550.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
indices.create:
49
index: test_data_2023
@@ -25,6 +30,14 @@ setup:
2530
- '{"index":{}}'
2631
- '{"@timestamp":"2023-10-08T10:00:02.000Z","packets":30}'
2732

33+
---
34+
teardown:
35+
- do:
36+
query.settings:
37+
body:
38+
transient:
39+
plugins.calcite.enabled : false
40+
2841
---
2942
"timechart with millisecond span":
3043
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4581.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
indices.create:
49
index: opensearch-sql_test_index_otel_logs
@@ -33,6 +38,14 @@ setup:
3338
- '{"index":{}}'
3439
- '{"@timestamp":"2023-10-08T10:00:07.000Z","severityNumber":9,"flags":1}'
3540

41+
---
42+
teardown:
43+
- do:
44+
query.settings:
45+
body:
46+
transient:
47+
plugins.calcite.enabled : false
48+
3649
---
3750
"timechart with grouping by non-string field":
3851
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4582.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
indices.create:
49
index: opensearch-sql_test_index_otel_logs
@@ -33,6 +38,14 @@ setup:
3338
- '{"index":{}}'
3439
- '{"@timestamp":"2024-01-15T10:00:07.000Z","severityNumber":18,"severityText":"TRACE10"}'
3540

41+
---
42+
teardown:
43+
- do:
44+
query.settings:
45+
body:
46+
transient:
47+
plugins.calcite.enabled : false
48+
3649
---
3750
"timechart with limit should use max aggregation for OTHER category":
3851
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4632.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled: true
27
- do:
38
indices.create:
49
index: events
@@ -33,6 +38,14 @@ setup:
3338
- '{"index":{}}'
3439
- '{"@timestamp":"2023-01-01T10:35:00Z","host":"server2","packets":90}'
3540

41+
---
42+
teardown:
43+
- do:
44+
query.settings:
45+
body:
46+
transient:
47+
plugins.calcite.enabled : false
48+
3649
---
3750
"timechart count() by field should not return empty buckets":
3851
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4644.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
indices.create:
49
index: timechart-eval-bug
@@ -23,6 +28,14 @@ setup:
2328
- '{"index":{}}'
2429
- '{"@timestamp":"2024-05-03T00:20:00Z","user":"bob"}'
2530

31+
---
32+
teardown:
33+
- do:
34+
query.settings:
35+
body:
36+
transient:
37+
plugins.calcite.enabled : false
38+
2639
---
2740
"timechart with eval on @timestamp field":
2841
- skip:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/4740.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
setup:
2+
- do:
3+
query.settings:
4+
body:
5+
transient:
6+
plugins.calcite.enabled : true
27
- do:
38
indices.create:
49
index: test_binning_4740
@@ -29,6 +34,14 @@ setup:
2934
- '{"index":{}}'
3035
- '{"@timestamp":"2024-01-01T00:20:00.000Z","age":"45","balance":"5000.0","name":"Eve"}'
3136

37+
---
38+
teardown:
39+
- do:
40+
query.settings:
41+
body:
42+
transient:
43+
plugins.calcite.enabled : false
44+
3245
---
3346
"bin with numeric field using WIDTH_BUCKET - issue 4740":
3447
- skip:

opensearch/src/main/java/org/opensearch/sql/opensearch/setting/OpenSearchSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public class OpenSearchSettings extends Settings {
170170
public static final Setting<?> CALCITE_ENGINE_ENABLED_SETTING =
171171
Setting.boolSetting(
172172
Key.CALCITE_ENGINE_ENABLED.getKeyValue(),
173-
true,
173+
false,
174174
Setting.Property.NodeScope,
175175
Setting.Property.Dynamic);
176176

0 commit comments

Comments
 (0)