Skip to content

Commit 0cdd38e

Browse files
dkropachevdkropachev
committed
1
1 parent 15a2e89 commit 0cdd38e

File tree

1 file changed

+34
-88
lines changed

1 file changed

+34
-88
lines changed

‎integration-tests/src/test/java/com/datastax/oss/driver/core/metadata/DefaultMetadataTabletMapIT.java‎

Lines changed: 34 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.nio.ByteBuffer;
2020
import java.time.Duration;
2121
import java.util.ArrayList;
22-
import java.util.Collections;
2322
import java.util.HashMap;
2423
import java.util.List;
2524
import java.util.Map;
@@ -85,137 +84,76 @@ public class DefaultMetadataTabletMapIT {
8584
+ " (pk int, ck int, val int, PRIMARY KEY(pk, ck));";
8685

8786
private static final SimpleStatement STMT_INSERT =
88-
SimpleStatement.builder(
89-
String.format("INSERT INTO %s.%s (pk, ck) VALUES (?, ?);", KEYSPACE_NAME, TABLE_NAME))
90-
.build();
87+
buildStatement("INSERT INTO %s.%s (pk, ck) VALUES (?, ?);");
9188

9289
private static final SimpleStatement STMT_INSERT_NO_KS =
93-
SimpleStatement.builder(String.format("INSERT INTO %s (pk,ck) VALUES (?,?);", TABLE_NAME))
94-
.build();
90+
buildStatement("INSERT INTO %s (pk, ck) VALUES (?, ?);");
9591

9692
private static final SimpleStatement STMT_INSERT_CONCRETE =
97-
SimpleStatement.builder(
98-
String.format("INSERT INTO %s.%s (pk,ck) VALUES (1,1);", KEYSPACE_NAME, TABLE_NAME))
99-
.build();
93+
buildStatement("INSERT INTO %s.%s (pk, ck) VALUES (1, 1);");
10094

10195
private static final SimpleStatement STMT_INSERT_PK_CONCRETE =
102-
SimpleStatement.builder(
103-
String.format("INSERT INTO %s.%s (pk,ck) VALUES (1,?);", KEYSPACE_NAME, TABLE_NAME))
104-
.build();
96+
buildStatement("INSERT INTO %s.%s (pk, ck) VALUES (1, ?);");
10597

10698
private static final SimpleStatement STMT_INSERT_CK_CONCRETE =
107-
SimpleStatement.builder(
108-
String.format("INSERT INTO %s.%s (pk,ck) VALUES (?,1);", KEYSPACE_NAME, TABLE_NAME))
109-
.build();
99+
buildStatement("INSERT INTO %s.%s (pk, ck) VALUES (?, 1);");
110100

111101
private static final SimpleStatement STMT_INSERT_LWT_IF_NOT_EXISTS =
112-
SimpleStatement.builder(
113-
String.format(
114-
"INSERT INTO %s.%s (pk, ck) VALUES (?, ?) IF NOT EXISTS;",
115-
KEYSPACE_NAME, TABLE_NAME))
116-
.build();
102+
buildStatement("INSERT INTO %s.%s (pk, ck) VALUES (?, ?) IF NOT EXISTS;");
117103

118104
private static final SimpleStatement STMT_SELECT =
119-
SimpleStatement.builder(
120-
String.format(
121-
"SELECT pk,ck FROM %s.%s WHERE pk = ? AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
122-
.build();
105+
buildStatement("SELECT pk,ck FROM %s.%s WHERE pk = ? AND ck = ?");
123106

124107
private static final SimpleStatement STMT_SELECT_NO_KS =
125-
SimpleStatement.builder(
126-
String.format("SELECT pk,ck FROM %s WHERE pk = ? AND ck = ?", TABLE_NAME))
127-
.build();
108+
buildStatement("SELECT pk, ck FROM %s WHERE pk = ? AND ck = ?");
128109

129110
private static final SimpleStatement STMT_SELECT_CONCRETE =
130-
SimpleStatement.builder(
131-
String.format(
132-
"SELECT pk,ck FROM %s.%s WHERE pk = 1 AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
133-
.build();
111+
buildStatement("SELECT pk,ck FROM %s.%s WHERE pk = 1 AND ck = 1");
134112

135113
private static final SimpleStatement STMT_SELECT_PK_CONCRETE =
136-
SimpleStatement.builder(
137-
String.format(
138-
"SELECT pk,ck FROM %s.%s WHERE pk = 1 AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
139-
.build();
114+
buildStatement("SELECT pk, ck FROM %s.%s WHERE pk = 1 AND ck = ?");
140115

141116
private static final SimpleStatement STMT_SELECT_CK_CONCRETE =
142-
SimpleStatement.builder(
143-
String.format(
144-
"SELECT pk,ck FROM %s.%s WHERE pk = ? AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
145-
.build();
117+
buildStatement("SELECT pk, ck FROM %s.%s WHERE pk = ? AND ck = 1");
146118

147119
private static final SimpleStatement STMT_UPDATE =
148-
SimpleStatement.builder(
149-
String.format(
150-
"UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
151-
.build();
120+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ?");
152121

153122
private static final SimpleStatement STMT_UPDATE_NO_KS =
154-
SimpleStatement.builder(
155-
String.format("UPDATE %s SET val = 1 WHERE pk = ? AND ck = ?", TABLE_NAME))
156-
.build();
123+
buildStatement("UPDATE %s SET val = 1 WHERE pk = ? AND ck = ?");
157124

158125
private static final SimpleStatement STMT_UPDATE_CONCRETE =
159-
SimpleStatement.builder(
160-
String.format(
161-
"UPDATE %s.%s SET val = 1 WHERE pk = 1 AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
162-
.build();
126+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = 1 AND ck = 1");
163127

164128
private static final SimpleStatement STMT_UPDATE_PK_CONCRETE =
165-
SimpleStatement.builder(
166-
String.format(
167-
"UPDATE %s.%s SET val = 1 WHERE pk = 1 AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
168-
.build();
129+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = 1 AND ck = ?");
169130

170131
private static final SimpleStatement STMT_UPDATE_CK_CONCRETE =
171-
SimpleStatement.builder(
172-
String.format(
173-
"UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
174-
.build();
132+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = 1");
175133

176134
private static final SimpleStatement STMT_UPDATE_LWT_IF_EXISTS =
177-
SimpleStatement.builder(
178-
String.format(
179-
"UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ? IF EXISTS",
180-
KEYSPACE_NAME, TABLE_NAME))
181-
.build();
135+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ? IF EXISTS");
182136

183137
private static final SimpleStatement STMT_UPDATE_LWT_IF_VAL =
184-
SimpleStatement.builder(
185-
String.format(
186-
"UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ? IF val = 2",
187-
KEYSPACE_NAME, TABLE_NAME))
188-
.build();
138+
buildStatement("UPDATE %s.%s SET val = 1 WHERE pk = ? AND ck = ? IF val = 2");
189139

190140
private static final SimpleStatement STMT_DELETE =
191-
SimpleStatement.builder(
192-
String.format("DELETE FROM %s.%s WHERE pk = ? AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
193-
.build();
141+
buildStatement("DELETE FROM %s.%s WHERE pk = ? AND ck = ?");
194142

195143
private static final SimpleStatement STMT_DELETE_NO_KS =
196-
SimpleStatement.builder(String.format("DELETE FROM %s WHERE pk = ? AND ck = ?", TABLE_NAME))
197-
.build();
144+
buildStatement("DELETE FROM %s WHERE pk = ? AND ck = ?");
198145

199146
private static final SimpleStatement STMT_DELETE_CONCRETE =
200-
SimpleStatement.builder(
201-
String.format("DELETE FROM %s.%s WHERE pk = 1 AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
202-
.build();
147+
buildStatement("DELETE FROM %s.%s WHERE pk = 1 AND ck = 1");
203148

204149
private static final SimpleStatement STMT_DELETE_PK_CONCRETE =
205-
SimpleStatement.builder(
206-
String.format("DELETE FROM %s.%s WHERE pk = 1 AND ck = ?", KEYSPACE_NAME, TABLE_NAME))
207-
.build();
150+
buildStatement("DELETE FROM %s.%s WHERE pk = 1 AND ck = ?");
208151

209152
private static final SimpleStatement STMT_DELETE_CK_CONCRETE =
210-
SimpleStatement.builder(
211-
String.format("DELETE FROM %s.%s WHERE pk = ? AND ck = 1", KEYSPACE_NAME, TABLE_NAME))
212-
.build();
153+
buildStatement("DELETE FROM %s.%s WHERE pk = ? AND ck = 1");
213154

214155
private static final SimpleStatement STMT_DELETE_IF_EXISTS =
215-
SimpleStatement.builder(
216-
String.format(
217-
"DELETE FROM %s.%s WHERE pk = ? AND ck = ? IF EXISTS", KEYSPACE_NAME, TABLE_NAME))
218-
.build();
156+
buildStatement("DELETE FROM %s.%s WHERE pk = ? AND ck = ? IF EXISTS");
219157

220158
@BeforeClass
221159
public static void setup() {
@@ -294,6 +232,8 @@ public void every_statement_should_deliver_tablet_info() {
294232
continue;
295233
}
296234
CqlSession session = sessionEntry.getValue().get();
235+
// Empty out tablets information
236+
session.getMetadata().getTabletMap().removeByKeyspace(CqlIdentifier.fromCql(KEYSPACE_NAME));
297237
Statement stmt;
298238
try {
299239
stmt = stmtEntry.getValue().apply(session);
@@ -310,7 +250,7 @@ public void every_statement_should_deliver_tablet_info() {
310250
if (!executeOnAllHostsAndReturnIfResultHasTabletsInfo(session, stmt)) {
311251
testErrors.add(
312252
String.format(
313-
"Statement %s on session %s got no tablet into",
253+
"Statement %s on session %s got no tablet info",
314254
stmtEntry.getKey(), sessionEntry.getKey()));
315255
continue;
316256
}
@@ -411,7 +351,6 @@ private static boolean isSessionLearnedTabletInfo(CqlSession session) {
411351
if (tab.getReplicaNodes().size() >= REPLICATION_FACTOR) {
412352
return true;
413353
}
414-
;
415354
}
416355
return false;
417356
}
@@ -450,4 +389,11 @@ private static boolean executeAndReturnIfResultHasTabletsInfo(
450389
.getIncomingPayload()
451390
.containsKey(TabletInfo.TABLETS_ROUTING_V1_CUSTOM_PAYLOAD_KEY);
452391
}
392+
393+
private static SimpleStatement buildStatement(String statement) {
394+
if (statement.contains("%s.%s")) {
395+
return SimpleStatement.builder(String.format(statement, KEYSPACE_NAME, TABLE_NAME)).build();
396+
}
397+
return SimpleStatement.builder(String.format(statement, TABLE_NAME)).build();
398+
}
453399
}

0 commit comments

Comments
 (0)