Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Array values are preserved (#1300) #3095

Merged
merged 6 commits into from
Oct 24, 2024
+282 −61
Merged

Array values are preserved (#1300) #3095

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32e7e73
Array values are preserved
normanj-bitquill Oct 22, 2024
e93cc5f
Added a setting to control array handling
normanj-bitquill Oct 23, 2024
1fba9ec
Fixed some more tests
normanj-bitquill Oct 23, 2024
bd462c7
Reworked to move pass the configuration through OpenSearchExprValueFa…
normanj-bitquill Oct 24, 2024
d58b6dc
Code cleanup and adding more tests
normanj-bitquill Oct 24, 2024
69226c8
Removed some unused code
normanj-bitquill Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/user/beyond/partiql.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ Selecting top level for object fields, object fields of array value and nested f

os> SELECT city, accounts, projects FROM people;
fetched rows / total rows = 1/1
+-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------+
| city | accounts | projects |
|-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------|
| {'name': 'Seattle', 'location': {'latitude': 10.5}} | {'id': 1} | [{'name': 'AWS Redshift Spectrum querying'},{'name': 'AWS Redshift security'},{'name': 'AWS Aurora security'}] |
+-----------------------------------------------------+-----------+----------------------------------------------------------------------------------------------------------------+
+-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------+
| city | accounts | projects |
|-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------|
| {'name': 'Seattle', 'location': {'latitude': 10.5}} | [{'id': 1},{'id': 2}] | [{'name': 'AWS Redshift Spectrum querying'},{'name': 'AWS Redshift security'},{'name': 'AWS Aurora security'}] |
+-----------------------------------------------------+-----------------------+----------------------------------------------------------------------------------------------------------------+

Example 2: Selecting Deeper Levels
----------------------------------
Expand Down
10 changes: 5 additions & 5 deletions docs/user/ppl/general/datatypes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ Select deeper level for object fields of array value which returns the first ele

os> source = people | fields accounts, accounts.id;
fetched rows / total rows = 1/1
+-----------+-------------+
| accounts | accounts.id |
|-----------+-------------|
| {'id': 1} | 1 |
+-----------+-------------+
+-----------------------+-------------+
| accounts | accounts.id |
|-----------------------+-------------|
| [{'id': 1},{'id': 2}] | 1 |
+-----------------------+-------------+
2 changes: 1 addition & 1 deletion integ-test/src/test/java/org/opensearch/sql/legacy/ObjectFieldSelectIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void testSelectObjectFieldOfArrayValuesItself() {
JSONObject response = new JSONObject(query("SELECT accounts FROM %s"));

// Only the first element of the list of is returned.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comments

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the default behaviour is to only use the first element of an array, this comment is still valid.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the comment.

verifyDataRows(response, rows(new JSONObject("{\"id\": 1}")));
verifyDataRows(response, rows(new JSONArray("[{\"id\":1},{\"id\":2}]")));
penghuo marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void test_nested_in_where_as_predicate_expression_with_multiple_condition
+ " nested(message.dayOfWeek) >= 4";
JSONObject result = executeJdbcRequest(query);
assertEquals(2, result.getInt("total"));
verifyDataRows(result, rows("c", "ab", 4), rows("zz", "aa", 6));
verifyDataRows(result, rows("c", "ab", 4), rows("zz", new JSONArray(List.of("aa", "bb")), 6));
}

@Test
Expand Down
7 changes: 1 addition & 6 deletions opensearch/src/main/java/org/opensearch/sql/opensearch/response/OpenSearchResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,7 @@ public Iterator<ExprValue> iterator() {
*/
private void addParsedHitsToBuilder(
ImmutableMap.Builder<String, ExprValue> builder, SearchHit hit) {
builder.putAll(
exprValueFactory
.construct(
hit.getSourceAsString(),
!(hit.getInnerHits() == null || hit.getInnerHits().isEmpty()))
.tupleValue());
builder.putAll(exprValueFactory.construct(hit.getSourceAsString(), true).tupleValue());
}

/**
Expand Down
1 change: 0 additions & 1 deletion opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ void search() {
new SearchHits(
new SearchHit[] {searchHit}, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0F));
when(searchHit.getSourceAsString()).thenReturn("{\"id\", 1}");
when(searchHit.getInnerHits()).thenReturn(null);
when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue);

// Mock second scroll request followed
Expand Down
1 change: 0 additions & 1 deletion opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchRestClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ void search() throws IOException {
new SearchHits(
new SearchHit[] {searchHit}, new TotalHits(1L, TotalHits.Relation.EQUAL_TO), 1.0F));
when(searchHit.getSourceAsString()).thenReturn("{\"id\", 1}");
when(searchHit.getInnerHits()).thenReturn(null);
when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue);

// Mock second scroll request followed
Expand Down
10 changes: 0 additions & 10 deletions opensearch/src/test/java/org/opensearch/sql/opensearch/response/OpenSearchResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ void iterator() {

when(searchHit1.getSourceAsString()).thenReturn("{\"id1\", 1}");
when(searchHit2.getSourceAsString()).thenReturn("{\"id1\", 2}");
when(searchHit1.getInnerHits()).thenReturn(null);
when(searchHit2.getInnerHits()).thenReturn(null);
when(factory.construct(any(), anyBoolean()))
.thenReturn(exprTupleValue1)
.thenReturn(exprTupleValue2);
Expand Down Expand Up @@ -254,14 +252,6 @@ void iterator_with_inner_hits() {
new SearchHit[] {searchHit1},
new TotalHits(2L, TotalHits.Relation.EQUAL_TO),
1.0F));
when(searchHit1.getInnerHits())
.thenReturn(
Map.of(
"innerHit",
new SearchHits(
new SearchHit[] {searchHit1},
new TotalHits(2L, TotalHits.Relation.EQUAL_TO),
1.0F)));

when(factory.construct(any(), anyBoolean())).thenReturn(exprTupleValue1);

Expand Down