Skip to content

Commit b8d26db

Browse files
JackShi148stuBirdFlymiyuan-ljr
authored
Keep the same sql script with the 1.x version and add create database script (#102)
* add DepentdentFilter and SingleColumnValueExcludeFilter * add singleColumnValueExcludeFilter and DependentColumnFilter; add test cases and optimize bufferedMutator test cases * hbase support batch (#84) * Add DeleteFamilyVersion function and corresponding test cases (#85) * add DepentdentFilter and SingleColumnValueExcludeFilter * add singleColumnValueExcludeFilter and DependentColumnFilter; add test cases and optimize bufferedMutator test cases * add single cf timerange setting in Get * single cf setColumnFamilyTimeRange in Get and Scan * optimize code * add DeleteFamilyVersion and test cases * add DeleteFamilyVersion; optimize test cases * add DeleteFamilyVersion test case and pass * format code * delete useless self-defined table * remove DeleteFamilyVersion file and move all cases to MultiColumnFamilyTest * hbase support batchCallBack (#86) * adjust bufferdMutatorImpl 1.x to new batch * bufferedMutator do not retry, batch retry in table client * hbase support batch (#84) * add rpcTimeout and operationTimetout setting in bufferedMutator * fix test * Add DeleteFamilyVersion function and corresponding test cases (#85) * add DepentdentFilter and SingleColumnValueExcludeFilter * add singleColumnValueExcludeFilter and DependentColumnFilter; add test cases and optimize bufferedMutator test cases * add single cf timerange setting in Get * single cf setColumnFamilyTimeRange in Get and Scan * optimize code * add DeleteFamilyVersion and test cases * add DeleteFamilyVersion; optimize test cases * add DeleteFamilyVersion test case and pass * format code * delete useless self-defined table * hbase support batchCallBack (#86) * fix test * fix test * init hbase_2.0 bufferedMutatorImpl * pass single bufferedMutator test * remove useless comments * format code * add inherited interface in bufferedMutator; fix concurrent bug in bufferedMuator execution * fix typo * fix exception erros message * update time to wait pool to shutdown * add import * pass test cases after merge * keep the same test case and sql with 1.x version --------- Co-authored-by: stuBirdFly <84010733+stuBirdFly@users.noreply.github.com> Co-authored-by: miyuan-ljr <miyuan.ljr@antgroup.com>
1 parent 24bc2e4 commit b8d26db

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/test/java/com/alipay/oceanbase/hbase/OHConnectionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ public void testBufferedMutatorUseNameSpaceWithFlush() throws Exception {
450450

451451
// test Delete
452452
Delete del = new Delete(toBytes(key));
453-
// test without setting family, delete all
453+
del.addFamily(toBytes(family));
454454
bufferMutator.mutate(del);
455455
bufferMutator.flush();
456456

src/test/java/unit_test_db.sql

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@ CREATE TABLE `test$family'1` (
168168
`T` bigint(20) NOT NULL,
169169
`V` varbinary(1024) DEFAULT NULL,
170170
PRIMARY KEY (`K`, `Q`, `T`)
171-
);
171+
) TABLEGROUP = test;
172172

173173
CREATE TABLE `test_t$family'1` (
174174
`K` varbinary(1024) NOT NULL,
175175
`Q` varbinary(256) NOT NULL,
176176
`T` bigint(20) NOT NULL,
177177
`V` varbinary(1024) DEFAULT NULL,
178178
PRIMARY KEY (`K`, `Q`, `T`)
179-
);
179+
) TABLEGROUP = test_t;
180180

181181
CREATE TABLEGROUP test_multi_cf SHARDING = 'ADAPTIVE';
182182

@@ -204,7 +204,6 @@ CREATE TABLE `test_multi_cf$family_with_group3` (
204204
PRIMARY KEY (`K`, `Q`, `T`)
205205
) TABLEGROUP = test_multi_cf PARTITION BY KEY(`K`) PARTITIONS 3;
206206

207-
---------------------------- n1 database ----------------------------
208207
CREATE DATABASE IF NOT EXISTS `n1`;
209208
USE `n1`;
210209
CREATE TABLE `n1:test$family1` (
@@ -230,7 +229,7 @@ CREATE TABLE `n1:test$family'1` (
230229
`T` bigint(20) NOT NULL,
231230
`V` varbinary(1024) DEFAULT NULL,
232231
PRIMARY KEY (`K`, `Q`, `T`)
233-
);
232+
) TABLEGROUP = `n1:test`;
234233

235234
CREATE TABLE `n1:test$family_with_local_index` (
236235
`K` varbinary(1024) NOT NULL,
@@ -256,4 +255,3 @@ CREATE TABLE `n1:test$partitionFamily1` (
256255
`V` varbinary(1024) DEFAULT NULL,
257256
PRIMARY KEY (`K`, `Q`, `T`)
258257
) partition by key(`K`) partitions 17;
259-

0 commit comments

Comments
 (0)