[iotdb] 05/06: improve code style

[ro...@apache.org]

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

rong pushed a commit to branch iotdb-1400
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 10506accc535c2b0acc0c0d6f5b2ff87806105f5
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri May 28 10:45:20 2021 +0800

    improve code style
---
 .../java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java | 13 +++++--------
 .../udf/core/transformer/ArithmeticBinaryTransformer.java   |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
index 79226f5..610b2c4 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/dataset/UDTFDataSet.java
@@ -39,7 +39,6 @@ import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
 import org.apache.iotdb.db.query.udf.core.input.InputLayer;
 import org.apache.iotdb.db.query.udf.core.reader.LayerPointReader;
 import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticAdditionTransformer;
-import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticBinaryTransformer;
 import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticDivisionTransformer;
 import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticModuloTransformer;
 import org.apache.iotdb.db.query.udf.core.transformer.ArithmeticMultiplicationTransformer;
@@ -205,37 +204,35 @@ public abstract class UDTFDataSet extends QueryDataSet {
     }
 
     // binary expression
-    ArithmeticBinaryTransformer transformer;
     BinaryExpression binaryExpression = (BinaryExpression) expression;
     if (binaryExpression instanceof AdditionExpression) {
-      transformer =
+      transformers[columnIndex] =
           new ArithmeticAdditionTransformer(
               constructPointReaderBySeriesName(binaryExpression.getLeftExpression().toString()),
               constructPointReaderBySeriesName(binaryExpression.getRightExpression().toString()));
     } else if (binaryExpression instanceof SubtractionExpression) {
-      transformer =
+      transformers[columnIndex] =
           new ArithmeticSubtractionTransformer(
               constructPointReaderBySeriesName(binaryExpression.getLeftExpression().toString()),
               constructPointReaderBySeriesName(binaryExpression.getRightExpression().toString()));
     } else if (binaryExpression instanceof MultiplicationExpression) {
-      transformer =
+      transformers[columnIndex] =
           new ArithmeticMultiplicationTransformer(
               constructPointReaderBySeriesName(binaryExpression.getLeftExpression().toString()),
               constructPointReaderBySeriesName(binaryExpression.getRightExpression().toString()));
     } else if (binaryExpression instanceof DivisionExpression) {
-      transformer =
+      transformers[columnIndex] =
           new ArithmeticDivisionTransformer(
               constructPointReaderBySeriesName(binaryExpression.getLeftExpression().toString()),
               constructPointReaderBySeriesName(binaryExpression.getRightExpression().toString()));
     } else if (binaryExpression instanceof ModuloExpression) {
-      transformer =
+      transformers[columnIndex] =
           new ArithmeticModuloTransformer(
               constructPointReaderBySeriesName(binaryExpression.getLeftExpression().toString()),
               constructPointReaderBySeriesName(binaryExpression.getRightExpression().toString()));
     } else {
       throw new UnsupportedOperationException(binaryExpression.toString());
     }
-    transformers[columnIndex] = transformer;
   }
 
   private void constructRawQueryTransformer(int columnIndex) {
diff --git a/server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticBinaryTransformer.java b/server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticBinaryTransformer.java
index d29e2da..ae46158 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticBinaryTransformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticBinaryTransformer.java
@@ -55,7 +55,7 @@ public abstract class ArithmeticBinaryTransformer extends Transformer {
   }
 
   /**
-   * Find the smallest, unconsumed timestamp that exists in both {@code leftPointReader} and {@code
+   * finds the smallest, unconsumed timestamp that exists in both {@code leftPointReader} and {@code
    * rightPointReader} and then cache it in {@code cachedTime}.
    *
    * @return true if there has a timestamp that meets the requirements