Skip to content

fix batch get route bug #162

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 5, 2025
Merged

fix batch get route bug #162

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/alipay/oceanbase/hbase/OHTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2108,7 +2108,7 @@ private BatchOperation buildBatchOperation(String tableName, List<? extends Row>
obTableQuery = buildObTableQuery(get, columnFilters);
ObTableClientQueryImpl query = new ObTableClientQueryImpl(tableName, obTableQuery, obTableClient);
try {
query.setRowKey(row(colVal("K", Bytes.toString(get.getRow())), colVal("Q", null), colVal("T", null)));
query.setRowKey(row(colVal("K", Bytes.toString(get.getRow())), colVal("Q", null), colVal("T", Integer.MAX_VALUE)));
} catch (Exception e) {
logger.error("unexpected error occurs when set row key", e);
throw new IOException(e);
Expand Down
81 changes: 75 additions & 6 deletions src/test/java/com/alipay/oceanbase/hbase/OHTableSecondaryPartMcfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
package com.alipay.oceanbase.hbase;

import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.filter.CompareFilter;
import org.junit.*;

import java.sql.Connection;

Expand Down Expand Up @@ -283,4 +281,75 @@ public void testPut() throws Exception {
hTable.close();
}
}

@Test
public void testIncrement() throws Exception {
for (int i = 0; i < tableNames.length; i++) {
OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableNames[i][0]));
hTable.init();

String key = "Key";
String column = "Column";
Increment increment = new Increment(key.getBytes());
for (int j = 0; j < tableNames[i].length; j++) {
String family = getColumnFamilyName(tableNames[i][j]);
increment.addColumn(family.getBytes(), column.getBytes(), 1L);
}
hTable.increment(increment);

hTable.close();
}
}

@Test
public void testAppend() throws Exception {
for (int i = 0; i < tableNames.length; i++) {
OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableNames[i][0]));
hTable.init();

String key = "Key";
String column = "Column";
String value = "app";
Append append = new Append(key.getBytes());
for (int j = 0; j < tableNames[i].length; j++) {
String family = getColumnFamilyName(tableNames[i][j]);
KeyValue kv1 = new KeyValue(key.getBytes(), family.getBytes(), column.getBytes(), value.getBytes());
append.add(kv1);
}
hTable.append(append);

hTable.close();
}
}

@Test
public void testGet() throws Exception {
for (int i = 0; i < tableNames.length; i++) {
OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableNames[i][0]));
hTable.init();

String key = "putKey";
String column = "putColumn";
String value = "value";
long timestamp = System.currentTimeMillis();
Put put = new Put(toBytes(key));
for (int j = 0; j < tableNames[i].length; j++) {
String family = getColumnFamilyName(tableNames[i][j]);
put.add(family.getBytes(), column.getBytes(), timestamp, toBytes(value));
}
hTable.put(put);

Get get = new Get(key.getBytes());
get.setMaxVersions(Integer.MAX_VALUE);
for (int j = 0; j < tableNames[i].length; j++) {
String family = getColumnFamilyName(tableNames[i][j]);
get.addColumn(family.getBytes(), column.getBytes());
}
Result r = hTable.get(get);
Assert.assertEquals(1, r.raw().length);

hTable.close();
}
}

}
81 changes: 77 additions & 4 deletions src/test/java/com/alipay/oceanbase/hbase/OHTableSecondaryPartTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
package com.alipay.oceanbase.hbase;

import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.filter.CompareFilter;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.*;

import java.sql.Connection;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;

Expand Down Expand Up @@ -254,4 +255,76 @@ public void testCheckAndMutate() throws Exception {
hTable.close();
}
}

@Test
public void testGet() throws Exception {
for (int i = 0; i < tableNames.length; i++) {
OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableNames[i]));
hTable.init();

System.out.println("put table " + tableNames[i] + " begin");
String family = getColumnFamilyName(tableNames[i]);
String key = "putKey";
String column = "putColumn";
String value = "value";
long timestamp = System.currentTimeMillis();
Put put = new Put(toBytes(key));
put.add(family.getBytes(), column.getBytes(), timestamp, toBytes(value));
hTable.put(put);
System.out.println("put table " + tableNames[i] + " done");

System.out.println("get table " + tableNames[i] + " begin");
Get get = new Get(key.getBytes());
get.setMaxVersions(Integer.MAX_VALUE);
get.addColumn(family.getBytes(), column.getBytes());
Result r = hTable.get(get);
Assert.assertEquals(1, r.raw().length);
System.out.println("get table " + tableNames[i] + " begin");

hTable.close();
}
}

@Test
public void testBatchGet() throws Exception {
long batchSize = 10;
for (int i = 0; i < tableNames.length; i++) {
OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableNames[i]));
hTable.init();

System.out.println("put table " + tableNames[i] + " begin");
String family = getColumnFamilyName(tableNames[i]);
String column = "putColumn";
String value = "value";
long timestamp = System.currentTimeMillis();
for (int j = 0; j < batchSize; j++) {
String key = "putKey" + j;
Put put = new Put(toBytes(key));
put.add(family.getBytes(), column.getBytes(), timestamp, toBytes(value));
hTable.put(put);
}
System.out.println("put table " + tableNames[i] + " done");

System.out.println("get table " + tableNames[i] + " begin");
List<Get> gets = new ArrayList<>();
for (int j = 0; j < batchSize; j++) {
String key = "putKey" + j;
Get get = new Get(key.getBytes());
get.setMaxVersions(Integer.MAX_VALUE);
get.addColumn(family.getBytes(), column.getBytes());
gets.add(get);
}
Result[] results = hTable.get(gets);
for (Result result : results) {
for (Cell cell : result.listCells()) {
String Q = Bytes.toString(CellUtil.cloneQualifier(cell));
String V = Bytes.toString(CellUtil.cloneValue(cell));
System.out.println("Column: " + Q + ", Value: " + V);
}
}
System.out.println("get table " + tableNames[i] + " begin");

hTable.close();
}
}
}