Skip to content

4.x: Make schema agreement query pull only columns that are used #469

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

Closed
wants to merge 1 commit into from
Closed

4.x: Make schema agreement query pull only columns that are used #469

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
2 changes: 1 addition & 1 deletion .../src/main/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private void sendQueries() {
} else {
CompletionStage<AdminResult> localQuery =
query("SELECT schema_version FROM system.local WHERE key='local'");
CompletionStage<AdminResult> peersQuery = query("SELECT * FROM system.peers");
CompletionStage<AdminResult> peersQuery = query("SELECT schema_version FROM system.peers");

localQuery
.thenCombine(peersQuery, this::extractSchemaVersions)
Expand Down
19 changes: 12 additions & 7 deletions .../test/java/com/datastax/oss/driver/internal/core/metadata/SchemaAgreementCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void should_succeed_if_only_one_node() {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(/*empty*/ )));
new StubbedQuery("SELECT schema_version FROM system.peers", mockResult(/*empty*/ )));

// When
CompletionStage<Boolean> future = checker.run();
Expand All @@ -156,7 +156,8 @@ public void should_succeed_if_versions_match_on_first_try() {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));
new StubbedQuery(
"SELECT schema_version FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));

// When
CompletionStage<Boolean> future = checker.run();
Expand All @@ -174,7 +175,8 @@ public void should_ignore_down_peers() {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(mockValidPeerRow(VERSION2))));
new StubbedQuery(
"SELECT schema_version FROM system.peers", mockResult(mockValidPeerRow(VERSION2))));

// When
CompletionStage<Boolean> future = checker.run();
Expand Down Expand Up @@ -210,7 +212,7 @@ public void should_ignore_malformed_rows(AdminRow malformedPeer) {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(malformedPeer)));
new StubbedQuery("SELECT schema_version FROM system.peers", mockResult(malformedPeer)));

// When
CompletionStage<Boolean> future = checker.run();
Expand All @@ -228,13 +230,15 @@ public void should_reschedule_if_versions_do_not_match_on_first_try() {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(mockValidPeerRow(VERSION2))),
new StubbedQuery(
"SELECT schema_version FROM system.peers", mockResult(mockValidPeerRow(VERSION2))),

// Second round
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));
new StubbedQuery(
"SELECT schema_version FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));

// When
CompletionStage<Boolean> future = checker.run();
Expand All @@ -253,7 +257,8 @@ public void should_fail_if_versions_do_not_match_after_timeout() {
new StubbedQuery(
"SELECT schema_version FROM system.local WHERE key='local'",
mockResult(mockLocalRow(VERSION1))),
new StubbedQuery("SELECT * FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));
new StubbedQuery(
"SELECT schema_version FROM system.peers", mockResult(mockValidPeerRow(VERSION1))));

// When
CompletionStage<Boolean> future = checker.run();
Expand Down
Loading