[Chore] format & bugfix (#96)

oceanbase · Feb 21, 2024 · cee1bc6 · cee1bc6
1 parent 8e49cc2
commit cee1bc6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Import the dependency for your maven project:
 <dependency>
     <groupId>com.oceanbase</groupId>
     <artifactId>obkv-table-client</artifactId>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
 </dependency>
 ```
 

diff --git a/src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java b/src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java
@@ -300,7 +300,7 @@ private void initProperties() {
         tableEntryRefreshLockTimeout = parseToLong(TABLE_ENTRY_REFRESH_LOCK_TIMEOUT.getKey(),
             tableEntryRefreshLockTimeout);
 
-        tableEntryRefreshTryTimes = parseToInt(TABLE_ENTRY_REFRESH_TYE_TIMES.getKey(),
+        tableEntryRefreshTryTimes = parseToInt(TABLE_ENTRY_REFRESH_TRY_TIMES.getKey(),
             tableEntryRefreshTryTimes);
 
         tableEntryRefreshContinuousFailureCeiling = parseToInt(

diff --git a/src/main/java/com/alipay/oceanbase/rpc/property/Property.java b/src/main/java/com/alipay/oceanbase/rpc/property/Property.java
@@ -76,7 +76,7 @@ public enum Property {
 
     TABLE_ENTRY_REFRESH_LOCK_TIMEOUT("table.entry.refresh.lock.timeout", 4000L, "刷新TABLE地址的锁超时时间"),
 
-    TABLE_ENTRY_REFRESH_TYE_TIMES("table.entry.refresh.try.times", 3, "刷新TABLE地址的尝试次数"),
+    TABLE_ENTRY_REFRESH_TRY_TIMES("table.entry.refresh.try.times", 3, "刷新TABLE地址的尝试次数"),
 
     TABLE_ENTRY_REFRESH_CONTINUOUS_FAILURE_CEILING(
                                                    "table.entry.refresh.continuous.failure.ceiling",

diff --git a/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/ResultCodes.java b/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/ResultCodes.java
@@ -727,8 +727,7 @@ public enum ResultCodes {
     OB_KV_ROWKEY_COUNT_NOT_MATCH(-10510), //
     OB_KV_COLUMN_TYPE_NOT_MATCH(-10511), //
     OB_KV_COLLATION_MISMATCH(-10512), //
-    OB_KV_SCAN_RANGE_MISSING(-10513),
-    OB_KV_FILTER_PARSE_ERROR(-10514);
+    OB_KV_SCAN_RANGE_MISSING(-10513), OB_KV_FILTER_PARSE_ERROR(-10514);
 
     public final int errorCode;
 

diff --git a/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/ObTableObjType.java b/src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/ObTableObjType.java
@@ -220,6 +220,8 @@ public static ObObjType getObjType(ObTableObjType tableObjType) {
             return ObObjType.ObTimestampType;
         } else if (tableObjType == ObTableDateTimeType) {
             return ObObjType.ObDateTimeType;
+        } else if (tableObjType == ObTableMinType || tableObjType == ObTableMaxType) {
+            return ObObjType.ObExtendType;
         }
 
         throw new IllegalArgumentException("cannot get ObTableObjType, invalid table obj type: "

diff --git a/src/main/java/com/alipay/oceanbase/rpc/table/AbstractObTableClient.java b/src/main/java/com/alipay/oceanbase/rpc/table/AbstractObTableClient.java
@@ -56,7 +56,7 @@ public abstract class AbstractObTableClient extends AbstractTable {
     protected boolean         tableEntryRefreshIntervalWait             = TABLE_ENTRY_REFRESH_INTERVAL_WAIT
                                                                             .getDefaultBoolean();
 
-    protected int             tableEntryRefreshTryTimes                 = TABLE_ENTRY_REFRESH_TYE_TIMES
+    protected int             tableEntryRefreshTryTimes                 = TABLE_ENTRY_REFRESH_TRY_TIMES
                                                                             .getDefaultInt();
 
     protected long            tableEntryRefreshLockTimeout              = TABLE_ENTRY_REFRESH_LOCK_TIMEOUT