Skip to content

Don't return empty routing key when partition key is unbound #1620

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

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Don't return empty routing key when partition key is unbound #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion core/src/main/java/com/datastax/oss/driver/internal/core/cql/DefaultBoundStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,8 @@ public ByteBuffer getRoutingKey() {
if (indices.isEmpty()) {
return null;
} else if (indices.size() == 1) {
return getBytesUnsafe(indices.get(0));
int index = indices.get(0);
return isSet(index) ? getBytesUnsafe(index) : null;
} else {
ByteBuffer[] components = new ByteBuffer[indices.size()];
for (int i = 0; i < components.length; i++) {
Expand Down
19 changes: 19 additions & 0 deletions integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,25 @@ private void should_infer_routing_information_when_partition_key_is_bound(String
assertThat(tokenFactory.hash(boundStatement.getRoutingKey())).isEqualTo(expectedToken);
}

@Test
public void should_return_null_routing_information_when_single_partition_key_is_unbound() {
should_return_null_routing_information_when_single_partition_key_is_unbound(
"SELECT a FROM prepared_statement_test WHERE a = ?");
should_return_null_routing_information_when_single_partition_key_is_unbound(
"INSERT INTO prepared_statement_test (a) VALUES (?)");
should_return_null_routing_information_when_single_partition_key_is_unbound(
"UPDATE prepared_statement_test SET b = 1 WHERE a = ?");
should_return_null_routing_information_when_single_partition_key_is_unbound(
"DELETE FROM prepared_statement_test WHERE a = ?");
}

private void should_return_null_routing_information_when_single_partition_key_is_unbound(
String queryString) {
CqlSession session = sessionRule.session();
BoundStatement boundStatement = session.prepare(queryString).bind();
assertThat(boundStatement.getRoutingKey()).isNull();
}

private static Iterable<Row> firstPageOf(CompletionStage<AsyncResultSet> stage) {
return CompletableFutures.getUninterruptibly(stage).currentPage();
}
Expand Down