Commit 1cf9dcd
committed
Re-base PPL coverage bundle wiring onto main
Hand-port the analytics-engine compatibility test toggles from
the original ahkcs/feature/ppl-coverage-bundle branch (which was
based on the now-merged feature/mustang-ppl-integration). Most of the
bundle's commits were squash-merged into main via opensearch-project#5430; what remains
are the test-infra toggles for force-routing every IT through the
analytics-engine path with parquet-backed indices.
Changes:
- Add CALCITE_ANALYTICS_FORCE_ROUTING cluster setting key in
common Settings + register it in OpenSearchSettings.
- RestUnifiedQueryAction.isAnalyticsIndex() short-circuits to true
when the setting is on (the test-only knob; default false).
- PPLIntegTestCase.init() reads -Dtests.analytics.force_routing and
flips the cluster setting on at setup. Provides static helpers
enable/disableAnalyticsForceRouting().
- TestUtils.createIndexByRestClient honors -Dtests.analytics.parquet_indices
by switching every test-created index to a single-shard composite/parquet
store. Bulk loads on those indices use refresh=true (workaround for
LuceneCommitter.getSafeCommitInfo TODO that hangs refresh=wait_for).
Run via:
./gradlew :integ-test:integTestRemote \
-Dtests.rest.cluster=localhost:9200 \
-Dtests.cluster=localhost:9300 \
-Dtests.clustername=runTask \
-Dtests.analytics.force_routing=true \
-Dtests.analytics.parquet_indices=true \
--tests "<class>"
Signed-off-by: Kai Huang <huangkaics@gmail.com>1 parent f1f39ef commit 1cf9dcd
5 files changed
Lines changed: 101 additions & 2 deletions
File tree
- common/src/main/java/org/opensearch/sql/common/setting
- integ-test/src/test/java/org/opensearch/sql
- legacy
- ppl
- opensearch/src/main/java/org/opensearch/sql/opensearch/setting
- plugin/src/main/java/org/opensearch/sql/plugin/rest
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
48 | 57 | | |
49 | 58 | | |
50 | 59 | | |
| |||
Lines changed: 46 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
40 | 50 | | |
41 | 51 | | |
42 | 52 | | |
| |||
48 | 58 | | |
49 | 59 | | |
50 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
51 | 64 | | |
52 | 65 | | |
53 | 66 | | |
| |||
69 | 82 | | |
70 | 83 | | |
71 | 84 | | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
72 | 107 | | |
73 | 108 | | |
74 | 109 | | |
| |||
116 | 151 | | |
117 | 152 | | |
118 | 153 | | |
119 | | - | |
120 | | - | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
121 | 165 | | |
122 | 166 | | |
123 | 167 | | |
| |||
Lines changed: 27 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
45 | 52 | | |
46 | 53 | | |
47 | 54 | | |
48 | 55 | | |
49 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
50 | 77 | | |
51 | 78 | | |
52 | 79 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
189 | 196 | | |
190 | 197 | | |
191 | 198 | | |
| |||
467 | 474 | | |
468 | 475 | | |
469 | 476 | | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
470 | 483 | | |
471 | 484 | | |
472 | 485 | | |
| |||
658 | 671 | | |
659 | 672 | | |
660 | 673 | | |
| 674 | + | |
661 | 675 | | |
662 | 676 | | |
663 | 677 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| 40 | + | |
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| |||
88 | 89 | | |
89 | 90 | | |
90 | 91 | | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
91 | 96 | | |
92 | 97 | | |
93 | 98 | | |
| |||
0 commit comments