Skip to content

Commit

Permalink
Update upsert handling
Browse files Browse the repository at this point in the history 
Signed-off-by: Andy Kwok <[email protected]>
  • Loading branch information
@andy-k-improving
andy-k-improving committed Feb 7, 2025
1 parent 24eec27 commit ca79ffc
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 60 deletions.
20 changes: 7 additions & 13 deletions core/src/main/java/org/opensearch/sql/utils/JsonUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,25 +144,19 @@ private static ExprValue processJsonNode(JsonNode jsonNode) {
/** Converts a JSON encoded string to an Expression object. */
public static ExprValue setJson(ExprValue json, ExprValue path, ExprValue valueToInsert) {

String jsonUnquoted = json.stringValue();
String pathUnquoted = path.stringValue();
Object valueUnquoted = valueToInsert.value();
String jsonString = json.stringValue();
String jsonPathString = path.stringValue();
Object valueToInsertObj = valueToInsert.value();
Configuration conf =
Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS);
try {
JsonPath jsonPath = JsonPath.compile(pathUnquoted);
DocumentContext docContext = JsonPath.using(conf).parse(jsonUnquoted);
JsonPath jsonPath = JsonPath.compile(jsonPathString);
DocumentContext docContext = JsonPath.using(conf).parse(jsonString);
Object readResult = docContext.read(jsonPath);
if (readResult == null) {
recursiveCreate(docContext, pathUnquoted, valueUnquoted).jsonString();
} else if (readResult instanceof String) {
docContext.set(pathUnquoted, valueUnquoted).jsonString();
recursiveCreate(docContext, jsonPathString, valueToInsertObj);
} else {
if (((List<?>) readResult).isEmpty()) {
docContext.add(pathUnquoted, valueUnquoted).jsonString();
} else {
docContext.set(pathUnquoted, valueUnquoted).jsonString();
}
docContext.set(jsonPathString, valueToInsertObj);
}
return new ExprStringValue(docContext.jsonString());

Expand Down
85 changes: 38 additions & 47 deletions core/src/test/java/org/opensearch/sql/expression/json/JsonFunctionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,137 +171,128 @@ void json_returnsSemanticCheckException() {
@Test
void json_set_InsertByte() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal((byte) 'a'));
assertEquals("[97]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal((byte) 'a'));
assertEquals("{\"test\":97}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertShort() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(Short.valueOf("123")));
assertEquals("[123]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(Short.valueOf("123")));
assertEquals("{\"test\":123}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertInt() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(123));
assertEquals("[123]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(123));
assertEquals("{\"test\":123}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertLong() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(123L));
assertEquals("[123]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(123L));
assertEquals("{\"test\":123}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertFloat() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(123.123F));
assertEquals("[123.123]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(123.123F));
assertEquals("{\"test\":123.123}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertDouble() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(123.123));
assertEquals("[123.123]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(123.123));
assertEquals("{\"test\":123.123}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertString() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal("test_value"));
assertEquals("[\"test_value\"]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal("test_value"));
assertEquals("{\"test\":\"test_value\"}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertBoolean() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.literal(Boolean.TRUE));
assertEquals("[true]", functionExpression.valueOf().stringValue());
DSL.jsonSet(DSL.literal("{}"), DSL.literal("$.test"), DSL.literal(Boolean.TRUE));
assertEquals("{\"test\":true}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertDate() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.date(DSL.literal(new ExprDateValue("2020-08-17"))));
assertEquals("[\"2020-08-17\"]", functionExpression.valueOf().stringValue());
assertEquals("{\"test\":\"2020-08-17\"}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertTime() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.time(DSL.literal(new ExprTimeValue("01:01:01"))));
assertEquals("[\"01:01:01\"]", functionExpression.valueOf().stringValue());
assertEquals("{\"test\":\"01:01:01\"}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertTimestamp() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"), DSL.literal("$"), DSL.timestamp(DSL.literal("2008-05-15 22:00:00")));
assertEquals("[\"2008-05-15 22:00:00\"]", functionExpression.valueOf().stringValue());
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.timestamp(DSL.literal("2008-05-15 22:00:00")));
assertEquals("{\"test\":\"2008-05-15 22:00:00\"}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertInterval() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.interval(DSL.literal(1), DSL.literal("second")));
assertEquals("[{\"seconds\":1}]", functionExpression.valueOf().stringValue());
assertEquals("{\"test\":{\"seconds\":1}}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertIp() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[]"), DSL.literal("$"), DSL.castIp(DSL.literal("192.168.1.1")));
assertEquals("[\"192.168.1.1\"]", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertList() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal(
new ExprCollectionValue(
List.of(new ExprStringValue("123"), new ExprStringValue("456")))));
assertEquals("[[\"123\",\"456\"]]", functionExpression.valueOf().stringValue());
DSL.literal("{}"), DSL.literal("$.test"), DSL.castIp(DSL.literal("192.168.1.1")));
assertEquals("{\"test\":\"192.168.1.1\"}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertMap() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.literal(
ExprTupleValue.fromExprValueMap(Map.of("name", new ExprStringValue("alice")))));
assertEquals("[{\"name\":\"alice\"}]", functionExpression.valueOf().stringValue());
assertEquals("{\"test\":{\"name\":\"alice\"}}", functionExpression.valueOf().stringValue());
}

@Test
void json_set_InsertArray() {
FunctionExpression functionExpression =
DSL.jsonSet(
DSL.literal("[]"),
DSL.literal("$"),
DSL.literal("{}"),
DSL.literal("$.test"),
DSL.literal(
new ExprCollectionValue(
List.of(new ExprStringValue("Alice"), new ExprStringValue("Ben")))));
assertEquals("[[\"Alice\",\"Ben\"]]", functionExpression.valueOf().stringValue());
assertEquals("{\"test\":[\"Alice\",\"Ben\"]}", functionExpression.valueOf().stringValue());
}

@Test
Expand Down Expand Up @@ -329,7 +320,7 @@ void json_set_insert_invalid_path() {
@Test
void json_set_insert_invalid_jsonObject() {
FunctionExpression functionExpression =
DSL.jsonSet(DSL.literal("[xxxx}}}}}"), DSL.literal("$"), DSL.literal("18"));
DSL.jsonSet(DSL.literal("[xxxx}}}}}"), DSL.literal("$.test"), DSL.literal("18"));
assertThrows(SemanticCheckException.class, () -> functionExpression.valueOf());
}

Expand Down

0 comments on commit ca79ffc

Please sign in to comment.