Cherry-pick 161a7ce (contains conflicts)

This commit contains unresolved conflicts that need manual resolution.

Author: maochongxin

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

@@ -65,6 +65,7 @@
 import org.apache.hadoop.hbase.util.VersionInfo;
 import org.slf4j.Logger;
 
+import javax.swing.plaf.synth.Region;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;
@@ -193,7 +194,23 @@ public class OHTable implements Table {
      */
     private final Configuration  configuration;
 
+<<<<<<< HEAD
     private int                  scannerTimeout;
+=======
+    private int                   scannerTimeout;
+
+    /**
+     * the bufferedMutator to execute Puts
+     */
+    private OHBufferedMutatorImpl mutator;
+    
+    private RegionLocator          regionLocator;
+
+    /**
+     * flag for whether closed
+     */
+    private boolean               isClosed               = false;
+>>>>>>> 161a7ce (fix delete family version result error)
 
     /**
      * Creates an object to access a HBase table.
@@ -2112,7 +2129,7 @@ private QueryAndMutate buildDeleteQueryAndMutate(KeyValue kv,
                     if (!isTableGroup) {
                         filter = buildObHTableFilter(null, null, Integer.MAX_VALUE);
                     } else {
-                        filter = buildObHTableFilter(null, null, Integer.MAX_VALUE);
+                        filter = buildObHTableFilter(null, null, Integer.MAX_VALUE, kv.getQualifier());
                     }
                 } else {
                     range.setStartKey(ObRowKey.getInstance(CellUtil.cloneRow(kv), ObObj.getMin(),
@@ -2134,18 +2151,34 @@ private QueryAndMutate buildDeleteQueryAndMutate(KeyValue kv,
                         ObObj.getMin()));
                     range.setEndKey(ObRowKey.getInstance(CellUtil.cloneRow(kv), ObObj.getMax(),
                         ObObj.getMax()));
-                    filter = buildObHTableFilter(null, null, Integer.MAX_VALUE);
+                    // [MAX_VALUE, MAX_VALUE), delete nothing
+                    filter = buildObHTableFilter(null, new TimeRange(Long.MAX_VALUE), Integer.MAX_VALUE);
                 } else {
+<<<<<<< HEAD
                     range.setStartKey(ObRowKey.getInstance(CellUtil.cloneRow(kv), ObObj.getMin(),
+=======
+                    TimeRange timeRange = new TimeRange(kv.getTimestamp(), kv.getTimestamp() + 1);
+                    range.setStartKey(ObRowKey.getInstance(kv.getRow(), ObObj.getMin(),
+>>>>>>> 161a7ce (fix delete family version result error)
                         ObObj.getMin()));
                     range.setEndKey(ObRowKey.getInstance(CellUtil.cloneRow(kv), ObObj.getMax(),
                         ObObj.getMax()));
                     if (!isTableGroup) {
+<<<<<<< HEAD
                         filter = buildObHTableFilter(null, new TimeRange(0, kv.getTimestamp() + 1),
                             Integer.MAX_VALUE);
                     } else {
                         filter = buildObHTableFilter(null, new TimeRange(0, kv.getTimestamp() + 1),
                             Integer.MAX_VALUE, CellUtil.cloneQualifier(kv));
+=======
+                        filter = buildObHTableFilter(null,
+                                timeRange,
+                            Integer.MAX_VALUE);
+                    } else {
+                        filter = buildObHTableFilter(null,
+                                timeRange,
+                            Integer.MAX_VALUE, kv.getQualifier());
+>>>>>>> 161a7ce (fix delete family version result error)
                     }
                 }
                 break;
@@ -2461,27 +2494,27 @@ public void refreshTableEntry(String familyString, boolean hasTestLoad) throws E
     }
 
     public byte[][] getStartKeys() throws IOException {
-        byte[][] startKeys = new byte[0][];
-        try {
-            startKeys = obTableClient.getHBaseTableStartKeys(tableNameString);
-        } catch (Exception e) {
-            throw new IOException("Fail to get start keys of HBase Table: " + tableNameString, e);
+        if (regionLocator == null) {
+            OHRegionLocatorExecutor executor = new OHRegionLocatorExecutor(tableNameString, obTableClient);
+            regionLocator = executor.getRegionLocator(tableNameString);
         }
-        return startKeys;
+        return regionLocator.getStartKeys();
     }
 
     public byte[][] getEndKeys() throws IOException {
-        byte[][] endKeys = new byte[0][];
-        try {
-            endKeys = obTableClient.getHBaseTableEndKeys(tableNameString);
-        } catch (Exception e) {
-            throw new IOException("Fail to get start keys of HBase Table: " + tableNameString, e);
+        if (regionLocator == null) {
+            OHRegionLocatorExecutor executor = new OHRegionLocatorExecutor(tableNameString, obTableClient);
+            regionLocator = executor.getRegionLocator(tableNameString);
         }
-        return endKeys;
+        return regionLocator.getEndKeys();
     }
 
     public Pair<byte[][], byte[][]> getStartEndKeys() throws IOException {
-        return new Pair<>(getStartKeys(), getEndKeys());
+        if (regionLocator == null) {
+            OHRegionLocatorExecutor executor = new OHRegionLocatorExecutor(tableNameString, obTableClient);
+            regionLocator = executor.getRegionLocator(tableNameString);
+        }
+        return regionLocator.getStartEndKeys();
     }
 
     public static CompareFilter.CompareOp getCompareOp(CompareOperator cmpOp) {

src/main/java/com/alipay/oceanbase/hbase/util/OHRegionLocatorExecutor.java

@@ -39,7 +39,7 @@ public class OHRegionLocatorExecutor extends AbstractObTableMetaExecutor<OHRegio
     private final String        tableName;
     private final ObTableClient client;
 
-    OHRegionLocatorExecutor(String tableName, ObTableClient client) {
+    public OHRegionLocatorExecutor(String tableName, ObTableClient client) {
         this.tableName = tableName;
         this.client = client;
     }

src/test/java/com/alipay/oceanbase/hbase/secondary/OHTableSecondaryPartDeleteTest.java

@@ -482,7 +482,23 @@ public static void testMultiCFDeleteFamilyVersionImpl(Map.Entry<String, List<Str
             get.addColumn(toBytes(family), toBytes(column + family));
         }
         Result result = hTable.get(get);
-        Assert(entry.getValue(), ()->Assert.assertEquals(6, result.size()));
+        // (ts1, ts3, ts4) * 3
+        Result finalResult = result;
+        Assert(entry.getValue(), ()->Assert.assertEquals(3 * entry.getValue().size(), finalResult.size()));
+        
+        put = new Put(toBytes(key));
+        delete = new Delete(toBytes(key));
+        for (String tableName : entry.getValue()) {
+            String family = getColumnFamilyName(tableName);
+            Long ts = Long.MAX_VALUE;
+            put.addColumn(toBytes(family), toBytes(column + family), ts, toBytes(value + ts));
+            delete.addFamilyVersion(family.getBytes(), Long.MAX_VALUE); // do nothing
+        }
+        hTable.put(put);
+        hTable.delete(delete);
+        result = hTable.get(get);
+        Result finalResult1 = result;
+        Assert(entry.getValue(), ()->Assert.assertEquals(4 * entry.getValue().size(), finalResult1.size()));
         hTable.close();
     }