[incubator-iotdb] branch master updated: fix javadoc format

[qi...@apache.org]

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

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f427f9  fix javadoc format
3f427f9 is described below

commit 3f427f9f9865a29f490f9ac9424d77663e45c66c
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Apr 1 19:48:43 2020 +0800

    fix javadoc format
---
 .../iotdb/tsfile/read/query/timegenerator/TimeGenerator.java       | 7 ++++---
 .../apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java
index 8c11b4b..d5e9710 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGenerator.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.tsfile.read.query.timegenerator;
 
 import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
 import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.read.common.TimeColumn;
 import org.apache.iotdb.tsfile.read.expression.ExpressionType;
 import org.apache.iotdb.tsfile.read.expression.IBinaryExpression;
 import org.apache.iotdb.tsfile.read.expression.IExpression;
@@ -30,12 +29,14 @@ import org.apache.iotdb.tsfile.read.query.timegenerator.node.LeafNode;
 import org.apache.iotdb.tsfile.read.query.timegenerator.node.Node;
 import org.apache.iotdb.tsfile.read.query.timegenerator.node.OrNode;
 import org.apache.iotdb.tsfile.read.reader.IBatchReader;
-
 import java.io.IOException;
 import java.util.*;
 
 /**
- * All SingleSeriesExpression involved in a IExpression will be transferred to a TimeGenerator tree whose leaf nodes are all SeriesReaders, The TimeGenerator tree can generate the next timestamp that satisfies the filter condition. Then we use this timestamp to get values in other series that are not included in IExpression
+ * All SingleSeriesExpression involved in a IExpression will be transferred to a TimeGenerator tree
+ * whose leaf nodes are all SeriesReaders, The TimeGenerator tree can generate the next timestamp
+ * that satisfies the filter condition. Then we use this timestamp to get values in other series
+ * that are not included in IExpression
  */
 public abstract class TimeGenerator {
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java
index e44c383..89b6ed7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/AndNode.java
@@ -71,9 +71,6 @@ public class AndNode implements Node {
     return false;
   }
 
-  /**
-   * If there is no value in current Node, -1 will be returned if {@code next()} is invoked.
-   */
   @Override
   public long next() throws IOException {
     if (hasNext()) {