Revert "opt for ObObj encodeSize and ObTableObjType"

This reverts commit b4df900.

Author: GroundWu

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/ObObj.java

@@ -21,16 +21,13 @@
 import com.alipay.oceanbase.rpc.util.ObByteBuf;
 import com.alipay.oceanbase.rpc.util.ObVString;
 import io.netty.buffer.ByteBuf;
-import static com.alipay.oceanbase.rpc.protocol.payload.impl.ObTableObjType.ObTableInvalidType;
 
 public class ObObj implements ObSimplePayload {
 
     private static ObObj MAX_OBJECT;
     private static ObObj MIN_OBJECT;
     private static long  MAX_OBJECT_VALUE = -2L;
     private static long  MIN_OBJECT_VALUE = -3L;
-    private int encodeSizeCache = -1; // use for cache encodeSize to avoid calculate repeatedly
-    private ObTableObjType tableObjTypeCache = ObTableInvalidType;
 
     static {
         MAX_OBJECT = new ObObj(ObObjType.ObExtendType.getDefaultObjMeta(), MAX_OBJECT_VALUE);
@@ -53,23 +50,6 @@ public ObObj(ObObjMeta meta, Object value) {
         setValue(value);
     }
 
-    public int getEncodeSizeCache() {
-        return encodeSizeCache;
-    }
-
-    public void setEncodeSizeCache(int encodeSizeCache) {
-        this.encodeSizeCache = encodeSizeCache;
-    }
-
-    public ObTableObjType getTableObjType() {
-        return tableObjTypeCache;
-    }
-
-    public void setTableObjType(ObTableObjType tableObjType) {
-        this.tableObjTypeCache = tableObjType;
-    }
-
-
     // 1. 序列化 meta
     private ObObjMeta meta;
     // 2. 序列化 valueLength 还是 nmb_desc_？

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/ObTableObjType.java

@@ -236,25 +236,19 @@ public void decode(ByteBuf buf, ObObj obj) {
     }
 
     public static ObTableObjType getTableObjType(ObObj obj) {
-        ObTableObjType tableObjType = null;
-        if (obj.getTableObjType() == ObTableInvalidType) {
-            ObObjType objType = obj.getMeta().getType();
-            ObCollationType objCsType = obj.getMeta().getCsType();
-            tableObjType = objTableTypeMap.get(objType);
-            if (objType == ObObjType.ObVarcharType && objCsType == ObCollationType.CS_TYPE_BINARY) {
-                tableObjType = ObTableObjType.ObTableVarbinaryType;
-            } else if (objType == ObObjType.ObExtendType) {
-                if (obj.isMinObj()) {
-                    tableObjType =  ObTableObjType.ObTableMinType;
-                } else if (obj.isMaxObj()) {
-                    tableObjType = ObTableObjType.ObTableMaxType;
-                }
-            } else if (tableObjType == null) {
-                throw new IllegalArgumentException("Cannot get ObTableObjType, invalid ob obj type: " + objType);
+        ObObjType objType = obj.getMeta().getType();
+        ObCollationType objCsType = obj.getMeta().getCsType();
+        ObTableObjType tableObjType = objTableTypeMap.get(objType);
+        if (objType == ObObjType.ObVarcharType && objCsType == ObCollationType.CS_TYPE_BINARY) {
+            tableObjType = ObTableObjType.ObTableVarbinaryType;
+        } else if (objType == ObObjType.ObExtendType) {
+            if (obj.isMinObj()) {
+                tableObjType =  ObTableObjType.ObTableMinType;
+            } else if (obj.isMaxObj()) {
+                tableObjType = ObTableObjType.ObTableMaxType;
             }
-            obj.setTableObjType(tableObjType);
-        } else {
-            tableObjType = obj.getTableObjType();
+        } else if (tableObjType == null) {
+            throw new IllegalArgumentException("Cannot get ObTableObjType, invalid ob obj type: " + objType);
         }
 
         return tableObjType;
@@ -337,15 +331,8 @@ public void decode(ByteBuf buf, ObObj obj) {
     }
 
     public int getEncodedSize(ObObj obj) {
-        int encodeSize = 0;
-        if (obj.getEncodeSizeCache() == -1) {
-            ObObjType objType = obj.getMeta().getType();
-            encodeSize = DEFAULT_TABLE_OBJ_TYPE_SIZE + objType.getEncodedSize(obj.getValue());
-            obj.setEncodeSizeCache(encodeSize);
-        } else {
-            encodeSize = obj.getEncodeSizeCache();
-        }
-        return encodeSize;
+        ObObjType objType = obj.getMeta().getType();
+        return DEFAULT_TABLE_OBJ_TYPE_SIZE + objType.getEncodedSize(obj.getValue());
     }
 
     public byte[] encodeWithMeta(ObObj obj) {