Skip to content

Commit dc9cc5a

Browse files
committed
Merge branch fix_testcase into master
Title: fix:some testcases Fix some test cases included: * Partition Key Test * Throttle Test Util Link: https://code.alibaba-inc.com/oceanbase/obkv-table-client-java/codereview/11670172
2 parents 0e5c4ac + e0e46c6 commit dc9cc5a

File tree

2 files changed

+75
-20
lines changed

2 files changed

+75
-20
lines changed

src/test/java/com/alipay/oceanbase/rpc/ObTableClientPartitionKeyTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ primary key(K, Q, T)
6868
TEST_TABLE = "testKey";
6969
} else {
7070
TEST_TABLE = "testPartition";
71+
obTableClient.addRowKeyElement("testPartition", new String[] { "K", "Q", "T" });
7172
}
7273

7374
this.obTableClient = obTableClient;

src/test/java/com/alipay/oceanbase/rpc/util/ObTableHotkeyThrottleUtil.java

Lines changed: 74 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -234,39 +234,76 @@ private void runSpecifiedKey() throws Exception {
234234
}
235235

236236
private void insertTest(Row rowkey, ColumnValue... columnValues) throws Exception {
237-
MutationResult insertResult = client.insert("test_throttle").setRowKey(rowkey)
238-
.addMutateColVal(columnValues).execute();
237+
try {
238+
++unitOperationTime;
239+
MutationResult insertResult = client.insert(this.tableName).setRowKey(rowkey)
240+
.addMutateColVal(columnValues).execute();
241+
++passNum;
242+
} catch (Exception e) {
243+
if (e instanceof ObTableUnexpectedException) {
244+
if (((ObTableUnexpectedException) e).getErrorCode() == -4039) {
245+
++throttleNum;
246+
++unitBlockTime;
247+
} else {
248+
e.printStackTrace();
249+
Assert.assertNull(e);
250+
}
251+
} else {
252+
e.printStackTrace();
253+
Assert.assertNull(e);
254+
}
255+
}
239256

240257
}
241258

242259
private void updateTest(Row rowkey, ColumnValue... columnValues) throws Exception {
243-
++unitOperationTime;
244-
MutationResult updateResult = client.update("test_throttle").setRowKey(rowKey)
245-
.addMutateColVal(columnValues).execute();
246-
if (updateResult.getAffectedRows() != 1) {
247-
++unitBlockTime;
248-
++throttleNum;
249-
} else {
260+
try {
261+
++unitOperationTime;
262+
MutationResult updateResult = client.update(this.tableName).setRowKey(rowKey)
263+
.addMutateColVal(columnValues).execute();
250264
++passNum;
265+
} catch (Exception e) {
266+
if (e instanceof ObTableUnexpectedException) {
267+
if (((ObTableUnexpectedException) e).getErrorCode() == -4039) {
268+
++throttleNum;
269+
++unitBlockTime;
270+
} else {
271+
e.printStackTrace();
272+
Assert.assertNull(e);
273+
}
274+
} else {
275+
e.printStackTrace();
276+
Assert.assertNull(e);
277+
}
251278
}
252279
}
253280

254281
private void insertOrUpdateTest(Row rowkey, ColumnValue... columnValues) throws Exception {
255-
++unitOperationTime;
256-
MutationResult insertOrUpdateResult = client.insertOrUpdate("test_throttle")
257-
.setRowKey(rowkey).addMutateColVal(columnValues).execute();
258-
if (insertOrUpdateResult.getAffectedRows() != 1) {
259-
++unitBlockTime;
260-
++throttleNum;
261-
} else {
282+
try {
283+
++unitOperationTime;
284+
MutationResult insertOrUpdateResult = client.insertOrUpdate(this.tableName)
285+
.setRowKey(rowkey).addMutateColVal(columnValues).execute();
262286
++passNum;
287+
} catch (Exception e) {
288+
if (e instanceof ObTableUnexpectedException) {
289+
if (((ObTableUnexpectedException) e).getErrorCode() == -4039) {
290+
++throttleNum;
291+
++unitBlockTime;
292+
} else {
293+
e.printStackTrace();
294+
Assert.assertNull(e);
295+
}
296+
} else {
297+
e.printStackTrace();
298+
Assert.assertNull(e);
299+
}
263300
}
264301
}
265302

266303
private void queryTest(Row rowkey) throws Exception {
267304
try {
268305
++unitOperationTime;
269-
TableQuery tableQuery = client.query("test_throttle");
306+
TableQuery tableQuery = client.query(this.tableName);
270307
tableQuery.addScanRange(rowkey.getValues(), rowkey.getValues());
271308
tableQuery.select("c1", "c2", "c3", "c4");
272309
QueryResultSet result_ = tableQuery.execute();
@@ -288,8 +325,25 @@ private void queryTest(Row rowkey) throws Exception {
288325
}
289326

290327
private void queryAndMutateTest(Row rowkey, ColumnValue... columnValues) throws Exception {
291-
MutationResult updateResult = client.update("test_throttle").setRowKey(rowkey)
292-
.addMutateColVal(columnValues).execute();
328+
try {
329+
++unitOperationTime;
330+
MutationResult updateResult = client.update(this.tableName).setRowKey(rowkey)
331+
.setFilter(null).addMutateColVal(columnValues).execute();
332+
++passNum;
333+
} catch (Exception e) {
334+
if (e instanceof ObTableUnexpectedException) {
335+
if (((ObTableUnexpectedException) e).getErrorCode() == -4039) {
336+
++throttleNum;
337+
++unitBlockTime;
338+
} else {
339+
e.printStackTrace();
340+
Assert.assertNull(e);
341+
}
342+
} else {
343+
e.printStackTrace();
344+
Assert.assertNull(e);
345+
}
346+
}
293347
}
294348

295349
private List<Mutation> generateBatchOpertaionIoU() {
@@ -307,7 +361,7 @@ private List<Mutation> generateBatchOpertaionIoU() {
307361
private void batchOperationTest() throws Exception {
308362
try {
309363
++unitOperationTime;
310-
BatchOperationResult batchResult = client.batchOperation("test_throttle")
364+
BatchOperationResult batchResult = client.batchOperation(this.tableName)
311365
.addOperation(generateBatchOpertaionIoU()).execute();
312366
++passNum;
313367
} catch (Exception e) {

0 commit comments

Comments
 (0)