Merge branch 'secondary_part' into secondary_part

stuBirdFly · web-flow · commit 345eeedc5b3b · 2025-03-27T21:14:15.000+08:00
diff --git a/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java b/src/main/java/com/alipay/oceanbase/hbase/util/ObTableClientManager.java
@@ -22,7 +22,6 @@
 import com.google.common.base.Objects;
 import org.apache.hadoop.classification.InterfaceAudience;
 
-
 import java.io.IOException;
 import java.util.Map;
 import java.util.Properties;
@@ -37,7 +36,7 @@
 public class ObTableClientManager {
 
     public static final ConcurrentHashMap<ObTableClientKey, ReentrantLock> OB_TABLE_CLIENT_LOCK     = new ConcurrentHashMap<ObTableClientKey, ReentrantLock>();
-    public static final Map<ObTableClientKey, ObTableClient> OB_TABLE_CLIENT_INSTANCE = new ConcurrentHashMap<>();
+    public static final Map<ObTableClientKey, ObTableClient>               OB_TABLE_CLIENT_INSTANCE = new ConcurrentHashMap<ObTableClientKey, ObTableClient>();
 
     public static ObTableClient getOrCreateObTableClient(OHConnectionConfiguration connectionConfig)
                                                                                                     throws IllegalArgumentException,
@@ -58,23 +57,18 @@ public static ObTableClient getOrCreateObTableClient(OHConnectionConfiguration c
         } else {
             checkArgument(isNotBlank(connectionConfig.getParamUrl()), HBASE_OCEANBASE_PARAM_URL
                     + " is blank");
-            obTableClientKey = generateObTableClientKey(connectionConfig);
-        }
-        return getOrCreateObTableClient(obTableClientKey, connectionConfig.getRpcConnectTimeout());
-    }
-    
-    public static ObTableClientKey generateObTableClientKey(OHConnectionConfiguration connectionConfig) {
-        ObTableClientKey obTableClientKey = new ObTableClientKey();
-        String paramUrl = connectionConfig.getParamUrl();
-        if (!paramUrl.contains("database")) {
-            paramUrl += "&database=default";
-        }
-        obTableClientKey.setParamUrl(paramUrl);
-        obTableClientKey.setSysUserName(connectionConfig.getSysUsername());
-        if (connectionConfig.getSysPassword() == null) {
-            obTableClientKey.setSysPassword(Constants.EMPTY_STRING);
-        } else {
-            obTableClientKey.setSysPassword(connectionConfig.getSysPassword());
+            obTableClientKey = new ObTableClientKey();
+            String paramUrl = connectionConfig.getParamUrl();
+            if (!paramUrl.contains("database")) {
+                paramUrl += "&database=default";
+            }
+            obTableClientKey.setParamUrl(paramUrl);
+            obTableClientKey.setSysUserName(connectionConfig.getSysUsername());
+            if (connectionConfig.getSysPassword() == null) {
+                obTableClientKey.setSysPassword(Constants.EMPTY_STRING);
+            } else {
+                obTableClientKey.setSysPassword(connectionConfig.getSysPassword());
+            }
         }
         checkArgument(isNotBlank(connectionConfig.getFullUsername()),
                 HBASE_OCEANBASE_FULL_USER_NAME + " is blank");
@@ -90,7 +84,7 @@ public static ObTableClientKey generateObTableClientKey(OHConnectionConfiguratio
             obTableClientKey.getProperties().put(property.getKey(), property.getValue());
         }
         
-        return obTableClientKey;
+        return getOrCreateObTableClient(obTableClientKey, connectionConfig.getRpcConnectTimeout());
     }
 
     public static ObTableClient getOrCreateObTableClient(ObTableClientKey obTableClientKey,
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartAppendTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartAppendTest.java
@@ -54,7 +54,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
@@ -270,6 +269,5 @@ public void testAppendSeires() throws Throwable {
         List<String> series_tables = new LinkedList<String>();
         createTables(TableTemplateManager.TableType.SECONDARY_PARTITIONED_TIME_RANGE_KEY, series_tables, null, true);
         FOR_EACH(series_tables, OHTableSecondaryPartAppendTest::testAppendSeires);
-        dropTables(series_tables, null);
     }
 }
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartBatchGetTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartBatchGetTest.java
@@ -50,7 +50,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartBatchTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartBatchTest.java
@@ -52,7 +52,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartCheckAndMutateTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartCheckAndMutateTest.java
@@ -56,7 +56,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java
@@ -48,7 +48,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartGetTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartGetTest.java
@@ -57,7 +57,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartIncrementTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartIncrementTest.java
@@ -54,7 +54,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
@@ -262,6 +261,5 @@ public void testIncrementSeires() throws Throwable {
         List<String> series_tables = new LinkedList<String>();
         createTables(TableTemplateManager.TableType.SECONDARY_PARTITIONED_TIME_RANGE_KEY, series_tables, null, true);
         FOR_EACH(series_tables, OHTableSecondaryPartIncrementTest::testIncrementSeires);
-        dropTables(series_tables, null);
     }
 }
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartPutTest.java
@@ -48,7 +48,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartScanTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartScanTest.java
@@ -49,7 +49,6 @@ public static void before() throws Exception {
     @AfterClass
     public static void finish() throws Exception {
         closeDistributedExecute();
-        dropTables(tableNames, group2tableNames);
     }
 
     @Before
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableTimeSeriesGetTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableTimeSeriesGetTest.java
@@ -0,0 +1,148 @@
+/*-
+ * #%L
+ * OBKV HBase Client Framework
+ * %%
+ * Copyright (C) 2025 OceanBase Group
+ * %%
+ * OBKV HBase Client Framework  is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *          http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ * #L%
+ */
+
+package com.alipay.oceanbase.hbase.secondary;
+
+import com.alipay.oceanbase.hbase.OHTableClient;
+import com.alipay.oceanbase.hbase.util.ObHTableSecondaryPartUtil;
+import com.alipay.oceanbase.hbase.util.ObHTableTestUtil;
+import com.alipay.oceanbase.hbase.util.TableTemplateManager;
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Result;
+import org.junit.*;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static com.alipay.oceanbase.hbase.util.ObHTableSecondaryPartUtil.*;
+import static com.alipay.oceanbase.hbase.util.ObHTableTestUtil.FOR_EACH;
+import static com.alipay.oceanbase.hbase.util.TableTemplateManager.TIMESERIES_TABLES;
+import static org.apache.hadoop.hbase.util.Bytes.toBytes;
+import static org.junit.Assert.assertEquals;
+
+
+public class OHTableTimeSeriesGetTest {
+    private static List<String>              tableNames       = new LinkedList<String>();
+    private static Map<String, List<String>> group2tableNames = new LinkedHashMap<>();
+
+
+    @BeforeClass
+    public static void before() throws Exception {
+        openDistributedExecute();
+        for (TableTemplateManager.TableType type : TIMESERIES_TABLES) {
+            createTables(type, tableNames, group2tableNames, true);
+        }
+    }
+
+    @AfterClass
+    public static void finish() throws Exception {
+        closeDistributedExecute();
+    }
+
+    @Before
+    public void prepareCase() throws Exception {
+        truncateTables(tableNames, group2tableNames);
+    }
+
+
+    public static void testGetImpl(String tableName) throws Exception {
+        OHTableClient hTable = ObHTableTestUtil.newOHTableClient(getTableName(tableName));
+        hTable.init();
+
+        // 0. prepare data
+        String family = getColumnFamilyName(tableName);
+        String key = "putKey";
+        String[] columns = {"putColumn1", "putColumn2", "putColumn3"};
+        String[] columns1 = {"putColumn1", "putColumn2"};
+        String[] columns2 = {"putColumn3"};
+        String[] values = {"version1", "version2"}; // each column have two versions
+        long curTs = System.currentTimeMillis();
+        long[] ts = {curTs, curTs+1}; // each column have two versions
+        for (int i = 0; i < values.length; i++) {
+            for (int j = 0; j < columns1.length; j++) {
+                Put put = new Put(toBytes(key));
+                put.add(family.getBytes(), columns1[j].getBytes(), ts[i], toBytes(values[i]));
+                hTable.put(put);
+            }
+        }
+
+        Put put = new Put(toBytes(key));
+        for (int i = 0; i < values.length; i++) {
+            for (int j = 0; j < columns2.length; j++) {
+                put.add(family.getBytes(), columns2[j].getBytes(), ts[i], toBytes(values[i]));
+            }
+        }
+        hTable.put(put);
+
+
+        // 1. get specify column
+        {
+            int index = 0;
+            Get get = new Get(key.getBytes());
+            get.addColumn(family.getBytes(), columns[index].getBytes());
+            Result r = hTable.get(get);
+            Cell cells[] = r.rawCells();
+            assertEquals(2, cells.length);
+            sortCells(cells);
+            for (int i = values.length - 1; i >= 0; i--) {
+                AssertKeyValue(key, columns[index], ts[i], values[i], cells[values.length - 1-i]);
+            }
+        }
+
+        // 2. get do not specify column
+        {
+            Get get = new Get(key.getBytes());
+            get.addFamily(family.getBytes());
+            Result result = hTable.get(get);
+            Cell[] cells = result.rawCells();
+            assertEquals(columns.length * values.length, cells.length);
+            sortCells(cells);
+            int idx = 0;
+            for (int i = 0; i < columns.length; i++) {
+                for (int j = values.length - 1; j >= 0; j--) {
+                    ObHTableSecondaryPartUtil.AssertKeyValue(key, columns[i], ts[j], values[j], cells[idx]);
+                    idx++;
+                }
+            }
+        }
+
+        // 3. get specify time range
+        {
+            Get get = new Get(key.getBytes());
+            get.addFamily(family.getBytes());
+            get.setTimeStamp(ts[1]);
+            Result r = hTable.get(get);
+            Cell cells[] = r.rawCells();
+            assertEquals(columns.length, cells.length);
+            sortCells(cells);
+            for (int i = 0; i < columns.length; i++) {
+                AssertKeyValue(key, columns[i], values[1],cells[i]);
+            }
+        }
+
+        hTable.close();
+    }
+
+    @Test
+    public void testGet() throws Throwable {
+        FOR_EACH(tableNames, OHTableTimeSeriesGetTest::testGetImpl);
+    }
+}
diff --git a/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableTimeSeriesScanTest.java b/src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableTimeSeriesScanTest.java
diff --git a/src/test/java/com/alipay/oceanbase/hbase/util/ObHTableSecondaryPartUtil.java b/src/test/java/com/alipay/oceanbase/hbase/util/ObHTableSecondaryPartUtil.java
diff --git a/src/test/java/com/alipay/oceanbase/hbase/util/TableTemplateManager.java b/src/test/java/com/alipay/oceanbase/hbase/util/TableTemplateManager.java

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public static void before() throws Exception {`
`54`	`54`	`@AfterClass`
`55`	`55`	`public static void finish() throws Exception {`
`56`	`56`	`closeDistributedExecute();`
`57`		`- dropTables(tableNames, group2tableNames);`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`@Before`
`@@ -270,6 +269,5 @@ public void testAppendSeires() throws Throwable {`
`270`	`269`	`List<String> series_tables = new LinkedList<String>();`
`271`	`270`	`createTables(TableTemplateManager.TableType.SECONDARY_PARTITIONED_TIME_RANGE_KEY, series_tables, null, true);`
`272`	`271`	`FOR_EACH(series_tables, OHTableSecondaryPartAppendTest::testAppendSeires);`
`273`		`- dropTables(series_tables, null);`
`274`	`272`	`}`
`275`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ public static void before() throws Exception {`
`50`	`50`	`@AfterClass`
`51`	`51`	`public static void finish() throws Exception {`
`52`	`52`	`closeDistributedExecute();`
`53`		`- dropTables(tableNames, group2tableNames);`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public static void before() throws Exception {`
`52`	`52`	`@AfterClass`
`53`	`53`	`public static void finish() throws Exception {`
`54`	`54`	`closeDistributedExecute();`
`55`		`- dropTables(tableNames, group2tableNames);`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public static void before() throws Exception {`
`56`	`56`	`@AfterClass`
`57`	`57`	`public static void finish() throws Exception {`
`58`	`58`	`closeDistributedExecute();`
`59`		`- dropTables(tableNames, group2tableNames);`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ public static void before() throws Exception {`
`48`	`48`	`@AfterClass`
`49`	`49`	`public static void finish() throws Exception {`
`50`	`50`	`closeDistributedExecute();`
`51`		`- dropTables(tableNames, group2tableNames);`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ public static void before() throws Exception {`
`57`	`57`	`@AfterClass`
`58`	`58`	`public static void finish() throws Exception {`
`59`	`59`	`closeDistributedExecute();`
`60`		`- dropTables(tableNames, group2tableNames);`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public static void before() throws Exception {`
`49`	`49`	`@AfterClass`
`50`	`50`	`public static void finish() throws Exception {`
`51`	`51`	`closeDistributedExecute();`
`52`		`- dropTables(tableNames, group2tableNames);`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`@Before`