remove getPartition with only row key values

Author: JackShi148

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

@@ -2903,33 +2903,6 @@ public BatchOperation batchOperation(String tableName) {
         return new BatchOperation(this, tableName);
     }
 
-    /**
-     * get partition information and host information by row key in object list
-     * @param tableName table name
-     * @param rowKey row key values which want to query
-     * @return Partition information
-     * @throws Exception Exception
-     */
-    public Partition getPartition(String tableName, Object[] rowKey) throws Exception {
-        if (rowKey == null) {
-            throw new Exception("The input row key value can not be empty");
-        }
-        Map<String, Integer> rowKeyElements = getRowKeyElement(tableName);
-        if (rowKeyElements == null) {
-            throw new Exception(
-                "Please use addRowKeyElement before just use row key values for table" + tableName);
-        }
-        if (rowKeyElements.size() < rowKey.length) {
-            throw new Exception("The table row keys should not be less than input row keys");
-        }
-        Row row = new Row();
-        String[] rowKeyNames = rowKeyElements.keySet().toArray(new String[0]);
-        for (int i = 0; i < rowKey.length; ++i) {
-            row.add(rowKeyNames[i], rowKey[i]);
-        }
-        return getSinglePartitionInternal(tableName, row);
-    }
-
     /**
      * get partition information and host information by row key in Row
      * @param tableName table name

src/test/java/com/alipay/oceanbase/rpc/ODPGetPartitionMetaTest.java

@@ -382,7 +382,6 @@ PRIMARY KEY (`c0`, `c1`, `c2`, `c3`, `c4`, `c5`)
     public void testTwoLevelKeyPartition() throws Exception {
         client.setRunningMode(ObTableClient.RunningMode.NORMAL);
         String testTable = "testPartitionKeyComplex";
-        client.addRowKeyElement(testTable, new String[] { "c0", "c1", "c2", "c3", "c4", "c5" });
         try {
             cleanTable(testTable);
             Connection connection = ObTableClientTestUtil.getConnection();
@@ -399,8 +398,8 @@ public void testTwoLevelKeyPartition() throws Exception {
                 statement.execute("insert into " + testTable
                                   + "(c0, c1, c2, c3, c4, c5, c6) values (" + c0 + "," + c1 + ","
                                   + c2 + ",'" + c3 + "','" + c4 + "','" + c5 + "'," + "'value')");
-                Partition partition = client.getPartition(testTable, new Object[] { c0, c1, c2, c3,
-                        c4, c5 });
+                Partition partition = client.getPartition(testTable, row(colVal("c0", c0), colVal("c1", c1), colVal("c2", c2),
+                        colVal("c3", c3), colVal("c4", c4),  colVal("c5", c5)));
                 Assert.assertNotNull(partition);
                 System.out.println(partition.toString());
                 // test scan range with partition
@@ -466,7 +465,8 @@ public void testTwoLevelRangePartition() throws Exception {
                 statement.execute("insert into " + testTable + "(c1, c2, c3, c4, c5) values (" + c1
                                   + "," + c2 + ",'" + c3 + "','" + c4 + "'," + "'value')");
                 Partition partition = client.getPartition(testTable,
-                    new Object[] { c1, c2, c3, c4 });
+                        row(colVal("c1", c1), colVal("c2", c2),
+                                colVal("c3", c3), colVal("c4", c4)));
                 Assert.assertNotNull(partition);
                 System.out.println(partition.toString());
                 // test scan range with partition

src/test/java/com/alipay/oceanbase/rpc/ObGetPartitionTest.java

@@ -278,7 +278,6 @@ public void testGetPartitionInBatchOperation() throws Exception {
 
     @Test
     public void testGetPartitionWithRowKeyValues() throws Exception {
-        client.addRowKeyElement(TABLE_NAME, new String[] { "c1", "c2" });
         Object values[][] = { { 1L, "c2_val", "c3_val", 100L }, { 400L, "c2_val", "c3_val", 100L },
                 { 1001L, "c2_val", "c3_val", 100L } };
         int rowCnt = values.length;
@@ -298,10 +297,10 @@ public void testGetPartitionWithRowKeyValues() throws Exception {
                 System.out.println(partition.toString());
             }
 
-            Partition partition = client.getPartition(TABLE_NAME, new Object[] { 1L, "c2_val" });
+            Partition partition = client.getPartition(TABLE_NAME, row(colVal("c1", 1L), colVal("c2", "c2_val")));
             Assert.assertNotNull(partition.getPartitionId());
             // test get partition with partition key
-            Partition partition_prefix = client.getPartition(TABLE_NAME, new Object[] { 1L });
+            Partition partition_prefix = client.getPartition(TABLE_NAME, row(colVal("c1", 1L)));
             Assert.assertEquals(partition.getPartitionId(), partition_prefix.getPartitionId());
 
         } catch (Exception e) {
@@ -493,8 +492,8 @@ public void testWithTwoLevelPartitionWithScan() throws Exception {
                 statement.execute("insert into " + testTable
                                   + "(c0, c1, c2, c3, c4, c5, c6) values (" + c0 + "," + c1 + ","
                                   + c2 + ",'" + c3 + "','" + c4 + "','" + c5 + "'," + "'value')");
-                Partition partition = client.getPartition(testTable, new Object[] { c0, c1, c2, c3,
-                        c4, c5 });
+                Partition partition = client.getPartition(testTable,  row(colVal("c0", c0), colVal("c1", c1), colVal("c2", c2),
+                        colVal("c3", c3), colVal("c4", c4),  colVal("c5", c5)));
                 System.out.println(partition.toString());
                 QueryResultSet result = client.query(testTable)
                     .addScanRange(partition.start(), partition.end()).execute();
@@ -620,4 +619,65 @@ public void testConcurrentGetPartition() throws Exception {
             }
         }
     }
+
+    /*
+    * CREATE TABLE IF NOT EXISTS `testSubStrKey` (
+                    `K` varbinary(1024),
+                    `Q` varbinary(256),
+                    `T` bigint,
+                    `V` varbinary(1024),
+                    K_PREFIX varbinary(1024) generated always as (substring(`K`, 1, 4)),
+                    PRIMARY KEY(`K`, `Q`, `T`)
+                ) partition by key(K_PREFIX) partitions 15;
+    * */
+    @Test
+    public void testSubstrInOldBatch() throws Exception {
+        String table_name = "testSubStrKey";
+        BatchOperation batchOperation = client.batchOperation(table_name);
+        client.addRowKeyElement("testSubStrKey", new String[] { "K", "Q", "T" });
+        long timeStamp = System.currentTimeMillis();
+        Object values[][] = { { "K_val1", "Q_val1", timeStamp, "V_val1" },
+                { "K_val2", "Q_val2", timeStamp, "V_val2" },
+                { "K_val3", "Q_val3", timeStamp, "V_val3" },
+                { "K_val4", "Q_val4", timeStamp, "V_val4" },
+                { "K_val5", "Q_val5", timeStamp, "V_val5" },
+                { "K_val6", "Q_val6", timeStamp, "V_val6" },
+                { "K_val1", "Q_val2", timeStamp, "V_val1" } };
+        int rowCnt = values.length;
+        try {
+            // batch insert
+            for (int i = 0; i < rowCnt; i++) {
+                Object[] curRow = values[i];
+                InsertOrUpdate insertOrUpdate = new InsertOrUpdate();
+                insertOrUpdate.setRowKey(row(colVal("K", curRow[0]), colVal("Q", curRow[1]),
+                        colVal("T", curRow[2])));
+                insertOrUpdate.addMutateRow(row(colVal("V", curRow[3])));
+                batchOperation.addOperation(insertOrUpdate);
+            }
+            client.insert(table_name, new Object[] { "K_val1", "Q_val1", timeStamp }, new String[] { "V" }, new Object[] { "V_val1".getBytes() });
+            client.insert(table_name, new Object[] { "K_val2", "Q_val2", timeStamp }, new String[] { "V" }, new Object[] { "V_val2".getBytes() });
+
+            TableBatchOps tableBatchOps = client.batch(table_name);
+            tableBatchOps
+                    .delete(new Object[] { "K_val1", "Q_val1", timeStamp });
+            tableBatchOps.insert(
+                    new Object[] { "K_val3", "Q_val3", timeStamp },
+                    new String[] { "V" }, new Object[] { "V_val3".getBytes() });
+            tableBatchOps.replace(
+                    new Object[] { "K_val2", "Q_val2", timeStamp },
+                    new String[] { "V" }, new Object[] { "V_value2".getBytes() });
+            List<Object> batchResult = tableBatchOps.execute();
+            Assert.assertEquals(3, batchResult.size());
+            Assert.assertEquals(1L, batchResult.get(0));
+            Assert.assertEquals(1L, batchResult.get(1));
+            Assert.assertEquals(2L, batchResult.get(2));
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.assertTrue(false);
+        } finally {
+            cleanTable(table_name);
+        }
+    }
 }