revise code structure

timeplus-io · Jul 31, 2024 · 4d5379c · 4d5379c
1 parent 8127ada
commit 4d5379c
Show file tree

Hide file tree

Showing 43 changed files with 55 additions and 263 deletions.
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/AbstractColumn.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/AbstractColumn.java
@@ -70,10 +70,18 @@ public ColumnWriterBuffer getColumnWriterBuffer() {
     }
 
     @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean now) throws IOException, SQLException {
-        SerializeBulkPrefix(serializer);
-        SerializeBulk(serializer, now);
-        SerializeBulkSuffix(serializer);
+    public void SerializeBulkPrefix(BinarySerializer serializer) throws IOException, SQLException {
+
+    }
+
+    @Override
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
+
+    }
+
+    @Override
+    public void SerializeBulkSuffix(BinarySerializer serializer) throws IOException, SQLException {
+
     }
 
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/Block.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/Block.java
@@ -44,7 +44,9 @@ public static Block readFrom(BinaryDeserializer deserializer,
             String type = deserializer.readUTF8StringBinary();
 
             IDataType dataType = DataTypeFactory.get(type, serverContext);
-            Object[] arr = dataType.deserializeBinaryFromStream(rowCnt, deserializer);
+            dataType.deserializeBinaryPrefix(rowCnt, deserializer);
+            Object[] arr = dataType.deserializeBinaryBulk(rowCnt, deserializer);
+            dataType.deserializeBinarySuffix(rowCnt, deserializer);
             columns[i] = ColumnFactory.createColumn(name, dataType, arr);
         }
 
@@ -126,7 +128,9 @@ public void writeTo(BinarySerializer serializer) throws IOException, SQLExceptio
         for (IColumn column : columns) {
             serializer.writeUTF8StringBinary(column.name());
             serializer.writeUTF8StringBinary(column.type().name());
-            column.flushToSerializer(serializer, true);
+            column.SerializeBulkPrefix(serializer);
+            column.SerializeBulk(serializer, true);
+            column.SerializeBulkSuffix(serializer);
         }
     }
 

diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/Column.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/Column.java
@@ -32,18 +32,7 @@ public void write(Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean now) throws IOException, SQLException {
-        super.flushToSerializer(serializer, now);
-    }
-
-    @Override
-    public void SerializeBulkPrefix(BinarySerializer serializer) { }
-
-    @Override
-    public void SerializeBulkSuffix(BinarySerializer serializer) { }
-
-    @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean now) throws IOException, SQLException {
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
         if (now) {
             buffer.writeTo(serializer);
         }

diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnArray.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnArray.java
@@ -45,17 +45,11 @@ public void write(Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-        super.flushToSerializer(serializer, immediate);
-    }
-
-    @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
         flushOffsets(serializer);
         data.SerializeBulk(serializer, false);
 
-        if (immediate) {
+        if (now) {
             buffer.writeTo(serializer);
         }
     }

diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnLowCardinality.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnLowCardinality.java
@@ -70,9 +70,8 @@ public void write(Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean immediate) throws IOException, SQLException {
-        /// The data layout: [version][index_type][dictionary][indexes]
-        // serializer.writeLong(version);
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
+        /// The data layout: [index_type][dictionary][indexes]
         serializer.writeLong(IndexType.UInt64.getValue() | IndexType.HasAdditionalKeysBit.getValue());
         serializer.writeLong(dict.size());
         for (int i = 0; i < dict.size(); i++) {
@@ -99,18 +98,7 @@ public void clear() {
 
     @Override
     public void SerializeBulkPrefix(BinarySerializer serializer)  throws IOException, SQLException {
-        /// The data layout: [version][index_type][dictionary][indexes]
         serializer.writeLong(version);
     }
 
-    @Override
-    public void SerializeBulkSuffix(BinarySerializer serializer) {
-    }
-
-    @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-        super.flushToSerializer(serializer, immediate);
-    }
-
-
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnMap.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnMap.java
@@ -57,7 +57,7 @@ public void write(Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean now) throws IOException, SQLException {
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
 
         flushOffsets(serializer);
 
@@ -100,12 +100,5 @@ public void SerializeBulkPrefix(BinarySerializer serializer) throws SQLException
         }
     }
 
-    @Override
-    public void SerializeBulkSuffix(BinarySerializer serializer) {
-    }
 
-    @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-        super.flushToSerializer(serializer, immediate);
-    }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnNullable.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnNullable.java
@@ -47,12 +47,12 @@ public void write(@Nullable Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean immediate) throws IOException {
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
         for (byte sign : nullableSign) {
             serializer.writeByte(sign);
         }
 
-        if (immediate)
+        if (now)
             buffer.writeTo(serializer);
     }
 
@@ -62,18 +62,4 @@ public void setColumnWriterBuffer(ColumnWriterBuffer buffer) {
         data.setColumnWriterBuffer(buffer);
     }
 
-    @Override
-    public void SerializeBulkPrefix(BinarySerializer serializer) {
-
-    }
-
-    @Override
-    public void SerializeBulkSuffix(BinarySerializer serializer) {
-
-    }
-
-    @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-        super.flushToSerializer(serializer, immediate);
-    }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnTuple.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/ColumnTuple.java
@@ -45,12 +45,7 @@ public void write(Object object) throws IOException, SQLException {
     }
 
     @Override
-    public void SerializeBulk(BinarySerializer serializer, boolean now) throws SQLException, IOException {
-        // if (isExported()) {
-        //     serializer.writeUTF8StringBinary(name);
-        //     serializer.writeUTF8StringBinary(type.name());
-        // }
-
+    public void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException {
         // we should to flush all the nested data to serializer
         // because they are using separate buffers.
         for (IColumn data : columnDataArray) {
@@ -82,13 +77,4 @@ public void SerializeBulkPrefix(BinarySerializer serializer) throws SQLException
         }
     }
 
-    @Override
-    public void SerializeBulkSuffix(BinarySerializer serializer) {
-
-    }
-
-    @Override
-    public void flushToSerializer(BinarySerializer serializer, boolean immediate) throws SQLException, IOException {
-        super.flushToSerializer(serializer, immediate);
-    }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/IColumn.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/IColumn.java
@@ -31,26 +31,23 @@ public interface IColumn {
 
     void write(Object object) throws IOException, SQLException;
 
+    void clear();
 
-    void SerializeBulkPrefix(BinarySerializer serializer) throws IOException, SQLException;
+    void setColumnWriterBuffer(ColumnWriterBuffer buffer);
 
+    ColumnWriterBuffer getColumnWriterBuffer();
     /**
      * Flush to socket output stream
      *
      * @param serializer is serializer wrapper of tcp socket
      * @param now        means we should flush all the buffer to serializer now
      */
-    void flushToSerializer(BinarySerializer serializer, boolean now) throws IOException, SQLException;
-
-    void SerializeBulkSuffix(BinarySerializer serializer) throws IOException, SQLException;
-
-    void SerializeBulk(BinarySerializer serializer, boolean now) throws IOException, SQLException;
-
-    void clear();
+    void SerializeBulkPrefix(BinarySerializer serializer) throws IOException, SQLException;
 
-    void setColumnWriterBuffer(ColumnWriterBuffer buffer);
+    void SerializeBulk(BinarySerializer serializer, Boolean now) throws IOException, SQLException;
 
-    ColumnWriterBuffer getColumnWriterBuffer();
+    void SerializeBulkSuffix(BinarySerializer serializer) throws IOException, SQLException;
 }
 
 
+
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/IDataType.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/IDataType.java
@@ -84,14 +84,12 @@ default Object[] deserializeBinaryBulk(int rows, BinaryDeserializer deserializer
         return data;
     }
 
-    void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException;
+    default void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException {
 
-    void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException;
-
-    default Object[] deserializeBinaryFromStream(int rows, BinaryDeserializer deserializer) throws SQLException, IOException {
-        deserializeBinaryPrefix(rows, deserializer);
-        Object[] arr = deserializeBinaryBulk(rows, deserializer);
-        deserializeBinarySuffix(rows, deserializer);
-        return arr;
     }
+
+    default void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException {
+
+    }
+
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeBool.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeBool.java
@@ -68,9 +68,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeDate.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeDate.java
@@ -98,9 +98,4 @@ public LocalDate deserializeText(SQLLexer lexer) throws SQLException {
         return LocalDate.of(year, month, day);
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeDate32.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeDate32.java
@@ -99,9 +99,4 @@ public LocalDate deserializeText(SQLLexer lexer) throws SQLException {
         return LocalDate.of(year, month, day);
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeFloat32.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeFloat32.java
@@ -80,9 +80,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeFloat64.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeFloat64.java
@@ -80,9 +80,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeIPv4.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeIPv4.java
@@ -75,9 +75,4 @@ public Long deserializeText(SQLLexer lexer) throws SQLException {
         return lexer.numberLiteral().longValue() & 0xffffffffL;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeIPv6.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeIPv6.java
@@ -88,9 +88,4 @@ private static String convertIPv6ToHexadecimalString(String ipv6) {
         return ipv6.replace(":", "");
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt128.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt128.java
@@ -73,10 +73,5 @@ public BigInteger deserializeText(SQLLexer lexer) throws SQLException {
         return new BigInteger(Integer128, 10);
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt16.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt16.java
@@ -69,9 +69,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt256.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt256.java
@@ -73,9 +73,4 @@ public BigInteger deserializeText(SQLLexer lexer) throws SQLException {
         return new BigInteger(Integer256, 10);
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt32.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt32.java
@@ -68,9 +68,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt64.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt64.java
@@ -68,9 +68,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt8.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeInt8.java
@@ -68,9 +68,4 @@ public boolean isSigned() {
         return true;
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException { }
 }
diff --git a/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeUInt128.java b/timeplus-native-jdbc/src/main/java/com/timeplus/data/type/DataTypeUInt128.java
@@ -70,13 +70,4 @@ public BigInteger deserializeText(SQLLexer lexer) throws SQLException {
         return new BigInteger(Uinteger128, 10);
     }
 
-    @Override
-    public void deserializeBinaryPrefix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException {
-
-    }
-
-    @Override
-    public void deserializeBinarySuffix(int rows, BinaryDeserializer deserializer) throws SQLException, IOException {
-
-    }
 }