Skip to content

Commit 62de7c1

Browse files
WeiXinChanWeiXinChan
authored
Merge pull request #196 from oceanbase/secondary_part_merge_hbase_2.0
Secondary part merge hbase 2.0
2 parents 350699e + 74e8ca7 commit 62de7c1

21 files changed

+6535
-83
lines changed

‎src/main/java/com/alipay/oceanbase/hbase/OHTable.java

Lines changed: 185 additions & 33 deletions
Large diffs are not rendered by default.

‎src/test/java/com/alipay/oceanbase/hbase/HTableTestBase.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2219,7 +2219,7 @@ public void testColumnValueFilter() throws Exception {
22192219
scan.addFamily(family.getBytes());
22202220
scan.setMaxVersions(10);
22212221
filter = new ColumnValueFilter(Bytes.toBytes(family), Bytes.toBytes(column2),
2222-
CompareOperator.GREATER, Bytes.toBytes(value1));
2222+
CompareOperator.LESS, Bytes.toBytes(value1));
22232223
scan.setFilter(filter);
22242224
scanner = hTable.getScanner(scan);
22252225

@@ -2890,7 +2890,7 @@ public void testGetFilter() throws Exception {
28902890
get = new Get(toBytes(key1));
28912891
get.setMaxVersions(10);
28922892
get.addFamily(toBytes(family));
2893-
valueFilter = new ValueFilter(CompareFilter.CompareOp.GREATER, new BinaryComparator(
2893+
valueFilter = new ValueFilter(CompareFilter.CompareOp.LESS, new BinaryComparator(
28942894
toBytes(value1)));
28952895
get.setFilter(valueFilter);
28962896
r = hTable.get(get);
@@ -2908,7 +2908,7 @@ public void testGetFilter() throws Exception {
29082908
get = new Get(toBytes(key1));
29092909
get.setMaxVersions(10);
29102910
get.addFamily(toBytes(family));
2911-
valueFilter = new ValueFilter(CompareFilter.CompareOp.GREATER, new BinaryComparator(
2911+
valueFilter = new ValueFilter(CompareFilter.CompareOp.LESS, new BinaryComparator(
29122912
toBytes(value3)));
29132913
get.setFilter(valueFilter);
29142914
r = hTable.get(get);
@@ -2948,7 +2948,7 @@ public void testGetFilter() throws Exception {
29482948
get = new Get(toBytes(key1));
29492949
get.setMaxVersions(10);
29502950
get.addFamily(toBytes(family));
2951-
qualifierFilter = new QualifierFilter(CompareFilter.CompareOp.GREATER,
2951+
qualifierFilter = new QualifierFilter(CompareFilter.CompareOp.LESS,
29522952
new BinaryComparator(toBytes(column1)));
29532953
get.setFilter(qualifierFilter);
29542954
r = hTable.get(get);
@@ -3073,7 +3073,7 @@ public void testGetFilter() throws Exception {
30733073

30743074
filterList = new FilterList();
30753075
filterList.addFilter(new ColumnCountGetFilter(1));
3076-
filterList.addFilter(new QualifierFilter(CompareFilter.CompareOp.GREATER,
3076+
filterList.addFilter(new QualifierFilter(CompareFilter.CompareOp.LESS,
30773077
new BinaryComparator(toBytes(column2))));
30783078
get = new Get(toBytes(key1));
30793079
get.setMaxVersions(10);
@@ -3274,7 +3274,7 @@ public void testGetFilter() throws Exception {
32743274
Assert.assertEquals(7, r.rawCells().length);
32753275

32763276
singleColumnValueFilter = new SingleColumnValueFilter(Bytes.toBytes(family),
3277-
Bytes.toBytes(column2), CompareFilter.CompareOp.GREATER, new BinaryComparator(
3277+
Bytes.toBytes(column2), CompareFilter.CompareOp.LESS, new BinaryComparator(
32783278
toBytes(value2)));
32793279
singleColumnValueFilter.setLatestVersionOnly(false);
32803280
get = new Get(toBytes(key1));
@@ -5014,16 +5014,16 @@ public void testCheckAndPut() throws IOException, InterruptedException {
50145014
Assert.assertTrue(ret);
50155015

50165016
ret = hTable.checkAndPut(key.getBytes(), "family1".getBytes(), column.getBytes(),
5017-
CompareFilter.CompareOp.GREATER, "value1".getBytes(), put);
5017+
CompareFilter.CompareOp.LESS, "value1".getBytes(), put);
50185018
Assert.assertFalse(ret);
50195019
ret = hTable.checkAndPut(key.getBytes(), "family1".getBytes(), column.getBytes(),
5020-
CompareFilter.CompareOp.GREATER_OR_EQUAL, "value1".getBytes(), put);
5020+
CompareFilter.CompareOp.LESS_OR_EQUAL, "value1".getBytes(), put);
50215021
Assert.assertTrue(ret);
50225022
ret = hTable.checkAndPut(key.getBytes(), "family1".getBytes(), column.getBytes(),
5023-
CompareFilter.CompareOp.LESS, "".getBytes(), put);
5023+
CompareFilter.CompareOp.GREATER, "".getBytes(), put);
50245024
Assert.assertFalse(ret);
50255025
ret = hTable.checkAndPut(key.getBytes(), "family1".getBytes(), column.getBytes(),
5026-
CompareFilter.CompareOp.LESS_OR_EQUAL, "".getBytes(), put);
5026+
CompareFilter.CompareOp.GREATER_OR_EQUAL, "".getBytes(), put);
50275027
Assert.assertFalse(ret);
50285028

50295029
get = new Get(key.getBytes());
@@ -5061,16 +5061,16 @@ public void testCheckAndPut() throws IOException, InterruptedException {
50615061
});
50625062

50635063
ret = builder.qualifier(toBytes(column))
5064-
.ifMatches(CompareOperator.GREATER, toBytes("value1")).thenPut(put);
5064+
.ifMatches(CompareOperator.LESS, toBytes("value1")).thenPut(put);
50655065
Assert.assertFalse(ret);
50665066
ret = builder.qualifier(toBytes(column))
5067-
.ifMatches(CompareOperator.GREATER_OR_EQUAL, toBytes("value1")).thenPut(put);
5067+
.ifMatches(CompareOperator.LESS_OR_EQUAL, toBytes("value1")).thenPut(put);
50685068
Assert.assertTrue(ret);
5069-
ret = builder.qualifier(toBytes(column)).ifMatches(CompareOperator.LESS, toBytes(""))
5069+
ret = builder.qualifier(toBytes(column)).ifMatches(CompareOperator.GREATER, toBytes(""))
50705070
.thenPut(put);
50715071
Assert.assertFalse(ret);
50725072
ret = builder.qualifier(toBytes(column))
5073-
.ifMatches(CompareOperator.LESS_OR_EQUAL, toBytes("")).thenPut(put);
5073+
.ifMatches(CompareOperator.GREATER_OR_EQUAL, toBytes("")).thenPut(put);
50745074
Assert.assertFalse(ret);
50755075

50765076
get = new Get(key.getBytes());
@@ -5121,22 +5121,22 @@ public void testCheckAndDelete() throws IOException {
51215121
put.addColumn(family.getBytes(), column.getBytes(), "value6".getBytes());
51225122
hTable.put(put);
51235123
ret = hTable.checkAndDelete(key.getBytes(), "family1".getBytes(), column.getBytes(),
5124-
CompareFilter.CompareOp.GREATER, "value5".getBytes(), delete);
5124+
CompareFilter.CompareOp.LESS, "value5".getBytes(), delete);
51255125
Assert.assertTrue(ret);
51265126
put = new Put(key.getBytes());
51275127
put.addColumn(family.getBytes(), column.getBytes(), "value5".getBytes());
51285128
hTable.put(put);
51295129
ret = hTable.checkAndDelete(key.getBytes(), "family1".getBytes(), column.getBytes(),
5130-
CompareFilter.CompareOp.GREATER_OR_EQUAL, "value5".getBytes(), delete);
5130+
CompareFilter.CompareOp.LESS_OR_EQUAL, "value5".getBytes(), delete);
51315131
Assert.assertTrue(ret);
51325132
put = new Put(key.getBytes());
51335133
put.addColumn(family.getBytes(), column.getBytes(), "value1".getBytes());
51345134
hTable.put(put);
51355135
ret = hTable.checkAndDelete(key.getBytes(), "family1".getBytes(), column.getBytes(),
5136-
CompareFilter.CompareOp.LESS, "value1".getBytes(), delete);
5136+
CompareFilter.CompareOp.GREATER, "value1".getBytes(), delete);
51375137
Assert.assertFalse(ret);
51385138
ret = hTable.checkAndDelete(key.getBytes(), "family1".getBytes(), column.getBytes(),
5139-
CompareFilter.CompareOp.LESS_OR_EQUAL, "value1".getBytes(), delete);
5139+
CompareFilter.CompareOp.GREATER_OR_EQUAL, "value1".getBytes(), delete);
51405140
Assert.assertTrue(ret);
51415141

51425142
Get get = new Get(key.getBytes());
@@ -5209,22 +5209,22 @@ public void testCheckAndDelete() throws IOException {
52095209
put.addColumn(family.getBytes(), column.getBytes(), "value6".getBytes());
52105210
hTable.put(put);
52115211
ret = builder.qualifier(toBytes(column))
5212-
.ifMatches(CompareOperator.GREATER, toBytes("value5")).thenDelete(delete);
5212+
.ifMatches(CompareOperator.LESS, toBytes("value5")).thenDelete(delete);
52135213
Assert.assertTrue(ret);
52145214
put = new Put(key.getBytes());
52155215
put.addColumn(family.getBytes(), column.getBytes(), "value5".getBytes());
52165216
hTable.put(put);
52175217
ret = builder.qualifier(toBytes(column))
5218-
.ifMatches(CompareOperator.GREATER_OR_EQUAL, toBytes("value5")).thenDelete(delete);
5218+
.ifMatches(CompareOperator.LESS_OR_EQUAL, toBytes("value5")).thenDelete(delete);
52195219
Assert.assertTrue(ret);
52205220
put = new Put(key.getBytes());
52215221
put.addColumn(family.getBytes(), column.getBytes(), "value1".getBytes());
52225222
hTable.put(put);
5223-
ret = builder.qualifier(toBytes(column)).ifMatches(CompareOperator.LESS, toBytes("value1"))
5223+
ret = builder.qualifier(toBytes(column)).ifMatches(CompareOperator.GREATER, toBytes("value1"))
52245224
.thenDelete(delete);
52255225
Assert.assertFalse(ret);
52265226
ret = builder.qualifier(toBytes(column))
5227-
.ifMatches(CompareOperator.LESS_OR_EQUAL, toBytes("value1")).thenDelete(delete);
5227+
.ifMatches(CompareOperator.GREATER_OR_EQUAL, toBytes("value1")).thenDelete(delete);
52285228
Assert.assertTrue(ret);
52295229

52305230
get = new Get(key.getBytes());
@@ -5349,9 +5349,9 @@ public void testCheckAndMutate() throws IOException {
53495349
rowMutations.add(put1);
53505350
rowMutations.add(put2);
53515351
rowMutations.add(put3);
5352-
// test greater op
5352+
// test GREATER op
53535353
ret = hTable.checkAndMutate(key.getBytes(), family.getBytes(), column1.getBytes(),
5354-
CompareFilter.CompareOp.LESS, value1.getBytes(), rowMutations);
5354+
CompareFilter.CompareOp.GREATER, value1.getBytes(), rowMutations);
53555355
Assert.assertFalse(ret);
53565356
get = new Get(key.getBytes());
53575357
get.addFamily(family.getBytes());
@@ -5361,7 +5361,7 @@ public void testCheckAndMutate() throws IOException {
53615361

53625362
// test less op
53635363
ret = hTable.checkAndMutate(key.getBytes(), family.getBytes(), column1.getBytes(),
5364-
CompareFilter.CompareOp.LESS, value2.getBytes(), rowMutations);
5364+
CompareFilter.CompareOp.GREATER, value2.getBytes(), rowMutations);
53655365
Assert.assertTrue(ret);
53665366
get = new Get(key.getBytes());
53675367
get.addFamily(family.getBytes());
@@ -5487,7 +5487,7 @@ public void testCheckAndMutate() throws IOException {
54875487
rowMutations.add(put1);
54885488
rowMutations.add(put2);
54895489
rowMutations.add(put3);
5490-
// test greater op
5490+
// test LESS op
54915491
ret = builder.qualifier(toBytes(column1)).ifMatches(CompareOperator.LESS, toBytes(value1))
54925492
.thenMutate(rowMutations);
54935493
Assert.assertFalse(ret);
@@ -5498,7 +5498,7 @@ public void testCheckAndMutate() throws IOException {
54985498
Assert.assertEquals(6, r.rawCells().length);
54995499

55005500
// test less op
5501-
ret = builder.qualifier(toBytes(column1)).ifMatches(CompareOperator.LESS, toBytes(value2))
5501+
ret = builder.qualifier(toBytes(column1)).ifMatches(CompareOperator.GREATER, toBytes(value2))
55025502
.thenMutate(rowMutations);
55035503
Assert.assertTrue(ret);
55045504
get = new Get(key.getBytes());

0 commit comments

Comments
 (0)