Commit 7d340e8
committed
Fix dedup 500 on cross-index object/scalar mapping conflict (opensearch-project#5685)
On the Calcite path, `dedup` pushes down as a composite aggregation whose
surviving row is fetched via top_hits and decoded from the nested _source.
When a wildcard spans indices that disagree on whether a path is an object
or a scalar, the merged mapping types the path as an object (STRUCT) while
some documents store a scalar there. Decoding that scalar as a struct threw
`java.sql.SQLException: ... class java.lang.String cannot be cast to
class java.util.Map`, failing the whole query (100% on the reporting
customer's `source=logs-pr172502-*`).
Guard the STRUCT branch of OpenSearchExprValueFactory.parse to degrade a
scalar-under-object value to null, completing the graceful handling opensearch-project#5618
added for the geo_point and scalar branches. The catch is scoped to
ClassCastException because this branch is also the whole-document parse
entry point and each nested object level is wrapped independently, so a
broader catch would swallow legitimate errors raised deeper in the recursion.
Adds a factory unit regression plus two CalcitePPLDedupIT cases (object-vs-
scalar and the mirror scalar-vs-object, the latter guarding opensearch-project#5618).
Signed-off-by: Kai Huang <ahkcs@amazon.com>1 parent 81997e6 commit 7d340e8
3 files changed
Lines changed: 111 additions & 1 deletion
File tree
- integ-test/src/test/java/org/opensearch/sql/calcite/remote
- opensearch/src
- main/java/org/opensearch/sql/opensearch/data/value
- test/java/org/opensearch/sql/opensearch/data/value
Lines changed: 83 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
30 | 113 | | |
31 | 114 | | |
32 | 115 | | |
| |||
Lines changed: 14 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
225 | | - | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
226 | 239 | | |
227 | 240 | | |
228 | 241 | | |
| |||
Lines changed: 14 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
728 | 728 | | |
729 | 729 | | |
730 | 730 | | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
731 | 745 | | |
732 | 746 | | |
733 | 747 | | |
| |||
0 commit comments