Commit 808411e
committed
Support Sort pushdown (opensearch-project#3620)
* Support Sort pushdown
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
Copy traits to logical index scan after pushing down sort
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
Allow pushing down multiple times
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Merge multiple sort when occurs
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Update trendline explain IT
Additionally correct merge collation method
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Re-index collations when pushing down projection
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Support sort pushdown with aggregation when aggregated fields are not in sort by fields
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Update explain_output.json
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Support multi-sort
Additionally remove sort when pushing down aggregation after adding collation by pushing down sort
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Sanitize collations when sort can't be pushed down
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Test explaining sort | stats avg
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Test sort date
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Chores: reorder util functions
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Pass null direction when pushing down sort
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Convert to keyword fields when sorting opensearch text fields
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Test explaining sort after rename
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Push down sort-then-limit, while only pushdown limit when limit-then-sort
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Fix flaky test related to irregular number in some locales in datetime IT
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
* Override existing collations where there are more than one order clauses
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
---------
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
(cherry picked from commit 870b82c)1 parent 84e464e commit 808411e
27 files changed
Lines changed: 608 additions & 28 deletions
File tree
- integ-test/src/test
- java/org/opensearch/sql
- calcite
- remote
- standalone
- ppl
- resources/expectedOutput
- calcite
- ppl
- opensearch/src/main/java/org/opensearch/sql/opensearch
- planner/physical
- storage/scan
Lines changed: 18 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
221 | 239 | | |
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
8 | 15 | | |
9 | 16 | | |
10 | 17 | | |
| |||
14 | 21 | | |
15 | 22 | | |
16 | 23 | | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
17 | 32 | | |
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
439 | 439 | | |
440 | 440 | | |
441 | 441 | | |
| 442 | + | |
442 | 443 | | |
443 | 444 | | |
444 | 445 | | |
445 | 446 | | |
446 | 447 | | |
447 | | - | |
| 448 | + | |
| 449 | + | |
448 | 450 | | |
449 | 451 | | |
450 | 452 | | |
| |||
1040 | 1042 | | |
1041 | 1043 | | |
1042 | 1044 | | |
1043 | | - | |
1044 | | - | |
| 1045 | + | |
| 1046 | + | |
1045 | 1047 | | |
1046 | 1048 | | |
1047 | 1049 | | |
| |||
Lines changed: 112 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
77 | | - | |
78 | 77 | | |
79 | 78 | | |
80 | 79 | | |
| |||
89 | 88 | | |
90 | 89 | | |
91 | 90 | | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
92 | 202 | | |
93 | 203 | | |
94 | 204 | | |
| |||
240 | 350 | | |
241 | 351 | | |
242 | 352 | | |
| 353 | + | |
243 | 354 | | |
244 | 355 | | |
245 | 356 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
155 | 155 | | |
156 | 156 | | |
157 | 157 | | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
158 | 165 | | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
0 commit comments