Skip to content

Fix #2446: improve table $push $position error #2464

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

Open
erichare wants to merge 3 commits into
base: main
Choose a base branch
from
+38 −1
Open

Fix #2446: improve table $push $position error #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83a01f4
fix: Better error message for extraneous field
erichare May 7, 2026
9c755be
Address review: quote extraneous push field
erichare May 7, 2026
91cbdf4
Merge branch 'main' into fix/push-table-position-error
erichare May 8, 2026
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
23 changes: 22 additions & 1 deletion src/main/java/io/stargate/sgv2/jsonapi/service/resolver/update/TableUpdatePushResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,19 @@ private ArrayNode getValidEachRHS(
}

// only allowed to have $each in the json object.
if (objectNode.size() != 1 || !(eachOpRHS instanceof ArrayNode arrayNode)) {
if (objectNode.size() != 1) {
throw UpdateException.Code.INVALID_PUSH_OPERATOR_USAGE.get(
errVars(
tableSchemaObject,
map -> {
map.put(
"reason",
"extraneous '%s' field encountered"
.formatted(firstFieldOtherThanEach(objectNode)));
}));
}

if (!(eachOpRHS instanceof ArrayNode arrayNode)) {
throw UpdateException.Code.INVALID_PUSH_OPERATOR_USAGE.get(
errVars(
tableSchemaObject,
Expand All @@ -241,6 +253,15 @@ private ArrayNode getValidEachRHS(
return arrayNode;
}

private String firstFieldOtherThanEach(ObjectNode objectNode) {
for (var field : objectNode.properties()) {
if (!UpdateOperatorModifier.EACH.apiName().equals(field.getKey())) {
return field.getKey();
}
}
throw new IllegalStateException("Expected a field other than $each");
}

/**
* The map $each array can be an array of tuples or an array of entries:
*
Expand Down
16 changes: 16 additions & 0 deletions ...ava/io/stargate/sgv2/jsonapi/service/resolver/update/TableUpdateOperatorResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ static Stream<Arguments> pushOperations() {
Map.of("key1", "value1"),
null,
null),
Arguments.of(
"""
{"%s": {"$each": [["key1", "value1"]], "$position": 1}}
"""
.formatted(names().CQL_MAP_COLUMN),
null,
UpdateException.Code.INVALID_PUSH_OPERATOR_USAGE,
"extraneous '$position' field encountered"),
Arguments.of(
"""
{"%s": {"$each": ["abc"]}}
Expand All @@ -176,6 +184,14 @@ static Stream<Arguments> pushOperations() {
List.of("abc"),
null,
null),
Arguments.of(
"""
{"%s": {"$each": ["abc"], "$position": 1}}
"""
.formatted(names().CQL_LIST_COLUMN),
null,
UpdateException.Code.INVALID_PUSH_OPERATOR_USAGE,
"extraneous '$position' field encountered"),
Arguments.of(
"""
{"%s": {"$each": ["abc"]}}
Expand Down
Loading