[carbondata] branch master updated: [ISSUE-4329] optimize some code smells in presto module (#4330)

[chenliang613]

This is an automated email from the ASF dual-hosted git repository.

chenliang613 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new beb426c381 [ISSUE-4329] optimize some code smells in presto module 
(#4330)
beb426c381 is described below

commit beb426c38126e6f0df6a7a02230dd033fd78ef6c
Author: Bo Xu <601450...@qq.com>
AuthorDate: Sun Oct 1 15:27:09 2023 +0800

    [ISSUE-4329] optimize some code smells in presto module (#4330)
    
    static method shouldn't be called by object, it should be call by class
---
 .../presto/PrestoCarbonVectorizedRecordReader.java           | 12 +++++++++---
 .../apache/carbondata/presto/readers/SliceStreamReader.java  |  5 +++--
 .../apache/carbondata/presto/readers/SliceStreamReader.java  |  5 +++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git 
a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
 
b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
index 66b02a90ba..027aaf222f 100644
--- 
a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
+++ 
b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
@@ -139,10 +139,14 @@ class PrestoCarbonVectorizedRecordReader extends 
AbstractRecordReader<Object> {
   public boolean nextKeyValue() {
     resultBatch();
 
-    if (returnColumnarBatch) return nextBatch();
+    if (returnColumnarBatch) {
+      return nextBatch();
+    }
 
     if (batchIdx >= numBatched) {
-      if (!nextBatch()) return false;
+      if (!nextBatch()) {
+        return false;
+      }
     }
     ++batchIdx;
     return true;
@@ -228,7 +232,9 @@ class PrestoCarbonVectorizedRecordReader extends 
AbstractRecordReader<Object> {
   }
 
   private CarbonVectorBatch resultBatch() {
-    if (columnarBatch == null) initBatch();
+    if (columnarBatch == null) {
+      initBatch();
+    }
     return columnarBatch;
   }
 
diff --git 
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/readers/SliceStreamReader.java
 
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/readers/SliceStreamReader.java
index 497b5cd1fa..0e0191f0be 100644
--- 
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/readers/SliceStreamReader.java
+++ 
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/readers/SliceStreamReader.java
@@ -22,7 +22,6 @@ import java.util.Optional;
 import org.apache.carbondata.core.metadata.datatype.DataType;
 import org.apache.carbondata.core.scan.result.vector.CarbonDictionary;
 import 
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
-import org.apache.carbondata.core.util.ByteUtil;
 
 import com.facebook.presto.spi.block.Block;
 import com.facebook.presto.spi.block.BlockBuilder;
@@ -144,7 +143,9 @@ public class SliceStreamReader extends 
CarbonColumnVectorImpl implements PrestoV
     super.putAllByteArray(data, offset, length);
     int[] lengths = getLengths();
     int[] offsets = getOffsets();
-    if (lengths == null) return;
+    if (lengths == null) {
+      return;
+    }
     for (int i = 0; i < lengths.length; i++) {
       if (offsets[i] != 0) {
         putByteArray(i, offsets[i], lengths[i], data);
diff --git 
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/SliceStreamReader.java
 
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/SliceStreamReader.java
index 4eeb331ca6..27adee965c 100644
--- 
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/SliceStreamReader.java
+++ 
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/readers/SliceStreamReader.java
@@ -22,7 +22,6 @@ import java.util.Optional;
 import org.apache.carbondata.core.metadata.datatype.DataType;
 import org.apache.carbondata.core.scan.result.vector.CarbonDictionary;
 import 
org.apache.carbondata.core.scan.result.vector.impl.CarbonColumnVectorImpl;
-import org.apache.carbondata.core.util.ByteUtil;
 
 import io.airlift.slice.Slices;
 import io.prestosql.spi.block.Block;
@@ -144,7 +143,9 @@ public class SliceStreamReader extends 
CarbonColumnVectorImpl implements PrestoV
     super.putAllByteArray(data, offset, length);
     int[] lengths = getLengths();
     int[] offsets = getOffsets();
-    if (lengths == null) return;
+    if (lengths == null) {
+      return;
+    }
     for (int i = 0; i < lengths.length; i++) {
       if (offsets[i] != 0) {
         putByteArray(i, offsets[i], lengths[i], data);