Skip to content

fix unstable case #176

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
WeiXinChan merged 1 commit into from
Mar 19, 2025
Merged

fix unstable case #176

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
4 changes: 2 additions & 2 deletions src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class OHTableSecondaryPartDeleteTest {
@BeforeClass
public static void before() throws Exception {
openDistributedExecute();
for (TableTemplateManager.TableType type : TableTemplateManager.TableType.values()) {
for (TableTemplateManager.TableType type : TableTemplateManager.NORMAL_TABLES) {
createTables(type, tableNames, group2tableNames, true);
}
}
Expand Down Expand Up @@ -163,7 +163,7 @@ public static void testDeleteColumnImpl(String tableName) throws Exception {
get.addColumn(toBytes(family), toBytes(column));
get.setMaxVersions();
Result result = hTable.get(get);
Assert(tableName, ()->Assert.assertEquals(2, result.size())); // ts1, ts2, ts3 is deleted
Assert(tableName, ()->Assert.assertEquals(1, result.size())); // ts1, ts2, ts3 is deleted
Assert.assertEquals(Arrays.toString((value + ts4).getBytes()), Arrays.toString(result.getValue(family.getBytes(), column.getBytes())));
for (Cell cell : result.rawCells()) {
Assert.assertTrue(cell.getTimestamp() != ts1);
Expand Down
13 changes: 6 additions & 7 deletions src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ public class OHTableSecondaryPartPutTest {
@BeforeClass
public static void before() throws Exception {
openDistributedExecute();
for (TableTemplateManager.TableType type : TableTemplateManager.TableType.values()) {
if (!type.name().contains("TIME")) {
createTables(type, tableNames, group2tableNames, true);
}
for (TableTemplateManager.TableType type : TableTemplateManager.NORMAL_TABLES) {
createTables(type, tableNames, group2tableNames, true);
}
}

Expand Down Expand Up @@ -84,11 +82,10 @@ public static void testPutImpl(String tableName) throws Exception {
Assert(tableName, ()->Assert.assertTrue(ObHTableTestUtil.secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
Assert(tableName, ()->Assert.assertTrue(ObHTableTestUtil.secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
}

{ // put exist key and get
long timestamp = System.currentTimeMillis();
Put put = new Put(toBytes(key));
put.add(family.getBytes(), column1.getBytes(), toBytes(column1 + value + timestamp));
put.add(family.getBytes(), column1.getBytes(), timestamp, toBytes(column1 + value + timestamp));
hTable.put(put);

Get get = new Get(toBytes(key));
Expand All @@ -112,7 +109,7 @@ public static void testPutImpl(String tableName) throws Exception {
Assert(tableName, ()->Assert.assertEquals(timestamp, r.rawCells()[0].getTimestamp()));

Put put1 = new Put(toBytes(key));
put1.add(family.getBytes(), column1.getBytes(), toBytes(column1 + value));
put1.add(family.getBytes(), column1.getBytes(), timestamp + 100, toBytes(column1 + value));
hTable.put(put1);

Result r2 = hTable.get(get);
Expand Down Expand Up @@ -236,6 +233,7 @@ public static void testMultiCFPutImpl(Map.Entry<String, List<String>> entry) thr
}
for (String tableName : entry.getValue()) {
String family = getColumnFamilyName(tableName);
// TODO: Get/Scan返回的结果Q 带了cf, 这里预期跑不过
Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column1 + value).getBytes(), r.getValue(family.getBytes(), column1.getBytes()))));
Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column2 + value).getBytes(), r.getValue(family.getBytes(), column2.getBytes()))));
}
Expand Down Expand Up @@ -273,6 +271,7 @@ public static void testMltiCFPutBatchImpl(Map.Entry<String, List<String>> entry)
}
for (String tableName : entry.getValue()) {
String family = getColumnFamilyName(tableName);
// TODO: Get/Scan返回的结果Q 带了cf, 这里预期跑不过
Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column1 + value + timestamp).getBytes(), result.getValue(family.getBytes(), column1.getBytes()))));
Assert(entry.getValue(), () -> Assert.assertTrue(secureCompare((column2 + value + timestamp).getBytes(), result.getValue(family.getBytes(), column2.getBytes()))));
}
Expand Down