Skip to content

Bugfix/sql and conflict fixes #69

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
shenyunlong merged 4 commits into from
Sep 18, 2024
Merged

Bugfix/sql and conflict fixes #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56b852d
add sql for multi-cf test; fix conflict error
maochongxin Sep 18, 2024
b012b91
fix buffered mutation family_violation check
maochongxin Sep 18, 2024
039c400
Remove multi-family checks for buffered mutations
maochongxin Sep 18, 2024
ddcd202
fix check family empty
maochongxin Sep 18, 2024
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
32 changes: 20 additions & 12 deletions 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 @@ -512,7 +512,7 @@ public Result get(final Get get) throws IOException {
if (get.getFamilyMap().keySet() == null || get.getFamilyMap().keySet().isEmpty()) {
// check nothing, use table group;
} else {
checkFamilyViolation(get.getFamilyMap().keySet());
checkFamilyViolation(get.getFamilyMap().keySet(), false);
}

ServerCallable<Result> serverCallable = new ServerCallable<Result>(configuration,
Expand Down Expand Up @@ -590,7 +590,7 @@ public ResultScanner getScanner(final Scan scan) throws IOException {
if (scan.getFamilyMap().keySet().isEmpty()) {
// check nothing, use table group;
} else {
checkFamilyViolation(scan.getFamilyMap().keySet());
checkFamilyViolation(scan.getFamilyMap().keySet(), false);
}

//be careful about the packet size ,may the packet exceed the max result size ,leading to error
Expand Down Expand Up @@ -681,7 +681,7 @@ private void doPut(List<Put> puts) throws IOException {
int n = 0;
for (Put put : puts) {
validatePut(put);
checkFamilyViolation(put.getFamilyMap().keySet());
checkFamilyViolation(put.getFamilyMap().keySet(), true);
writeBuffer.add(put);
currentWriteBufferSize += put.heapSize();

Expand Down Expand Up @@ -778,7 +778,7 @@ private void innerDelete(Delete delete) throws IOException {
BatchOperationResult results = null;

try {
checkFamilyViolation(delete.getFamilyMap().keySet());
checkFamilyViolation(delete.getFamilyMap().keySet(), false);
if (delete.getFamilyMap().isEmpty()) {
// For a Delete operation without any qualifiers, we construct a DeleteFamily request.
// The server then performs the operation on all column families.
Expand All @@ -801,7 +801,7 @@ private void innerDelete(Delete delete) throws IOException {
} else {
for (Map.Entry<byte[], List<KeyValue>> entry : delete.getFamilyMap().entrySet()) {
BatchOperation batch = buildBatchOperation(
getTargetTableName(tableNameString, Bytes.toString(entry.getKey())),
getTargetTableName(tableNameString, Bytes.toString(entry.getKey()), configuration),
entry.getValue(), false, null);
results = batch.execute();
}
Expand Down Expand Up @@ -830,7 +830,7 @@ private void innerDelete(Delete delete) throws IOException {

@Override
public void delete(Delete delete) throws IOException {
checkFamilyViolation(delete.getFamilyMap().keySet());
checkFamilyViolation(delete.getFamilyMap().keySet(), false);
innerDelete(delete);
}

Expand Down Expand Up @@ -1419,7 +1419,7 @@ private ObHTableFilter buildObHTableFilter(Filter filter, TimeRange timeRange, i
ObHTableFilter obHTableFilter = new ObHTableFilter();

if (filter != null) {
obHTableFilter.setFilterString(HBaseFilterUtils.toParseableString(filter).getBytes());
obHTableFilter.setFilterString(HBaseFilterUtils.toParseableString(filter));
}

if (timeRange != null) {
Expand Down Expand Up @@ -1459,7 +1459,7 @@ private ObHTableFilter buildObHTableFilter(String filterString, TimeRange timeRa
ObHTableFilter obHTableFilter = new ObHTableFilter();

if (filterString != null) {
obHTableFilter.setFilterString(filterString.getBytes());
obHTableFilter.setFilterString(filterString);
}

if (timeRange != null) {
Expand Down Expand Up @@ -1753,9 +1753,15 @@ private ObTableQueryAndMutateRequest buildObTableQueryAndMutateRequest(ObTableQu
return request;
}

public static void checkFamilyViolation(Collection<byte[]> families) {
public static void checkFamilyViolation(Collection<byte[]> families, boolean check_empty_family) {
if (check_empty_family && (families == null || families.isEmpty())) {
throw new FeatureNotSupportedException("family is empty");
}

for (byte[] family : families) {
if (isBlank(Bytes.toString(family))) {
if (family == null || family.length == 0) {
throw new IllegalArgumentException("family is empty");
} else if (isBlank(Bytes.toString(family))) {
throw new IllegalArgumentException("family is blank");
}
}
Expand All @@ -1765,7 +1771,7 @@ public static void checkFamilyViolation(Collection<byte[]> families) {
// This method is currently only used for append and increment operations.
// It restricts these two methods to use multi-column family operations.
// Note: After completing operations on multiple column families, they are deleted using the method described above.
private void checkFamilyViolationForOneFamily(Collection<byte[]> families) {
public static void checkFamilyViolationForOneFamily(Collection<byte[]> families) {
if (families == null || families.size() == 0) {
throw new FeatureNotSupportedException("family is empty.");
}
Expand All @@ -1774,7 +1780,9 @@ private void checkFamilyViolationForOneFamily(Collection<byte[]> families) {
throw new FeatureNotSupportedException("multi family is not supported yet.");
}
for (byte[] family : families) {
if (isBlank(Bytes.toString(family))) {
if (family == null || family.length == 0) {
throw new IllegalArgumentException("family is empty");
} else if (isBlank(Bytes.toString(family))) {
throw new IllegalArgumentException("family is blank");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/alipay/oceanbase/hbase/util/OHBufferedMutatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void mutate(List<? extends Mutation> mutations) throws IOException {
// check if every mutation's family is the same
// check if mutations are the same type
for (Mutation m : mutations) {
OHTable.checkFamilyViolation(m.getFamilyMap().keySet());
OHTable.checkFamilyViolation(m.getFamilyMap().keySet(), true);
validateInsUpAndDelete(m);
Class<?> curType = m.getClass();
// set the type of this BufferedMutator
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/unit_test_db.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,30 @@ CREATE TABLE `test_t$family_with_local_index` (
key `idx1`(T) local,
PRIMARY KEY (`K`, `Q`, `T`)
);


CREATE TABLEGROUP test_multi_cf SHARDING = 'ADAPTIVE';

CREATE TABLE `test_multi_cf$family_with_group1` (
`K` varbinary(1024) NOT NULL,
`Q` varbinary(256) NOT NULL,
`T` bigint(20) NOT NULL,
`V` varbinary(1024) DEFAULT NULL,
PRIMARY KEY (`K`, `Q`, `T`)
) TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;

CREATE TABLE `test_multi_cf$family_with_group2` (
`K` varbinary(1024) NOT NULL,
`Q` varbinary(256) NOT NULL,
`T` bigint(20) NOT NULL,
`V` varbinary(1024) DEFAULT NULL,
PRIMARY KEY (`K`, `Q`, `T`)
) TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;

CREATE TABLE `test_multi_cf$family_with_group3` (
`K` varbinary(1024) NOT NULL,
`Q` varbinary(256) NOT NULL,
`T` bigint(20) NOT NULL,
`V` varbinary(1024) DEFAULT NULL,
PRIMARY KEY (`K`, `Q`, `T`)
) TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;