This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ty/TableModelGrammar by this
push:
new d292ead5ec0 use TsFile project as dependence
d292ead5ec0 is described below
commit d292ead5ec0294b8096140d50b6d9eef173a4eb2
Author: HTHou <[email protected]>
AuthorDate: Tue May 28 12:16:19 2024 +0800
use TsFile project as dependence
---
.../iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java | 3 ++-
.../iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java | 3 ++-
.../db/queryengine/plan/relational/planner/node/ProjectNode.java | 3 ++-
iotdb-core/relational-parser/pom.xml | 4 ++--
.../iotdb/db/relational/sql/tree/ArithmeticBinaryExpression.java | 3 +--
.../iotdb/db/relational/sql/tree/ArithmeticUnaryExpression.java | 3 +--
.../java/org/apache/iotdb/db/relational/sql/tree/BinaryLiteral.java | 2 +-
.../java/org/apache/iotdb/db/relational/sql/tree/BooleanLiteral.java | 2 +-
.../src/main/java/org/apache/iotdb/db/relational/sql/tree/Cast.java | 3 +--
.../org/apache/iotdb/db/relational/sql/tree/ComparisonExpression.java | 3 +--
.../java/org/apache/iotdb/db/relational/sql/tree/DecimalLiteral.java | 2 +-
.../java/org/apache/iotdb/db/relational/sql/tree/DoubleLiteral.java | 2 +-
.../main/java/org/apache/iotdb/db/relational/sql/tree/Expression.java | 3 ++-
.../java/org/apache/iotdb/db/relational/sql/tree/FunctionCall.java | 3 +--
.../java/org/apache/iotdb/db/relational/sql/tree/GenericLiteral.java | 3 ++-
.../main/java/org/apache/iotdb/db/relational/sql/tree/Identifier.java | 3 +--
.../org/apache/iotdb/db/relational/sql/tree/InListExpression.java | 3 +--
.../org/apache/iotdb/db/relational/sql/tree/LogicalExpression.java | 3 +--
.../java/org/apache/iotdb/db/relational/sql/tree/LongLiteral.java | 3 ++-
.../java/org/apache/iotdb/db/relational/sql/tree/QualifiedName.java | 3 +--
.../java/org/apache/iotdb/db/relational/sql/tree/StringLiteral.java | 2 +-
.../java/org/apache/iotdb/db/relational/sql/tree/SymbolReference.java | 3 +--
22 files changed, 29 insertions(+), 33 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java
index 6b7178a28e4..f224ba9152f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/LimitNode.java
@@ -21,7 +21,8 @@ import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java
index c16e66f1f32..beb680b6842 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/OffsetNode.java
@@ -20,7 +20,8 @@ import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
index d86fc346234..045ab8458fd 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/ProjectNode.java
@@ -22,7 +22,8 @@ import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChil
import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.relational.sql.tree.Expression;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/iotdb-core/relational-parser/pom.xml
b/iotdb-core/relational-parser/pom.xml
index 8257f4551e9..1750111d570 100644
--- a/iotdb-core/relational-parser/pom.xml
+++ b/iotdb-core/relational-parser/pom.xml
@@ -57,9 +57,9 @@
<version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.iotdb</groupId>
+ <groupId>org.apache.tsfile</groupId>
<artifactId>tsfile</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>${tsfile.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticBinaryExpression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticBinaryExpression.java
index 5879fa40018..fc32a5a359b 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticBinaryExpression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticBinaryExpression.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nonnull;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticUnaryExpression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticUnaryExpression.java
index 1b1425975c1..a6576126d9b 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticUnaryExpression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ArithmeticUnaryExpression.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nonnull;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BinaryLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BinaryLiteral.java
index cbaae8740f2..403f60d2791 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BinaryLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BinaryLiteral.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.db.relational.sql.tree;
import org.apache.iotdb.db.relational.sql.parser.ParsingException;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import com.google.common.base.CharMatcher;
import com.google.common.io.BaseEncoding;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BooleanLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BooleanLiteral.java
index 72af330efbb..a7337b56afb 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BooleanLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/BooleanLiteral.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Cast.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Cast.java
index 8a28001bc01..30ba1ddaf57 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Cast.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Cast.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nonnull;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ComparisonExpression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ComparisonExpression.java
index 37dd245fb19..1be5aaa44fe 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ComparisonExpression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/ComparisonExpression.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nonnull;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DecimalLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DecimalLiteral.java
index 69156e9a7f9..06a5bf1a4b0 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DecimalLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DecimalLiteral.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DoubleLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DoubleLiteral.java
index df1f0ea624c..18af8a4f6b3 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DoubleLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/DoubleLiteral.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Expression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Expression.java
index 5059c2af3e4..fd0e5e8178f 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Expression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Expression.java
@@ -20,7 +20,8 @@
package org.apache.iotdb.db.relational.sql.tree;
import org.apache.iotdb.db.relational.sql.util.ExpressionFormatter;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nullable;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/FunctionCall.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/FunctionCall.java
index 5bbff720ece..47914bfe237 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/FunctionCall.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/FunctionCall.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/GenericLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/GenericLiteral.java
index 60a5906a0ea..fc3f116988e 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/GenericLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/GenericLiteral.java
@@ -20,7 +20,8 @@
package org.apache.iotdb.db.relational.sql.tree;
import org.apache.iotdb.db.relational.sql.parser.ParsingException;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Identifier.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Identifier.java
index 43b5d3f83f5..c5d68a60b29 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Identifier.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/Identifier.java
@@ -19,11 +19,10 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/InListExpression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/InListExpression.java
index 53c0c96f7d3..264c81914fa 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/InListExpression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/InListExpression.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LogicalExpression.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LogicalExpression.java
index 63e70b05f88..a20f9647449 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LogicalExpression.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LogicalExpression.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LongLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LongLiteral.java
index 768c29d9203..9412e913ae9 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LongLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/LongLiteral.java
@@ -20,7 +20,8 @@
package org.apache.iotdb.db.relational.sql.tree;
import org.apache.iotdb.db.relational.sql.parser.ParsingException;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/QualifiedName.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/QualifiedName.java
index 71971e0c4e5..0941100b036 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/QualifiedName.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/QualifiedName.java
@@ -19,10 +19,9 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nullable;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/StringLiteral.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/StringLiteral.java
index 106e7a5346b..48ba9e5ee25 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/StringLiteral.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/StringLiteral.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/SymbolReference.java
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/SymbolReference.java
index de49e8a23c5..02eef61d72a 100644
---
a/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/SymbolReference.java
+++
b/iotdb-core/relational-parser/src/main/java/org/apache/iotdb/db/relational/sql/tree/SymbolReference.java
@@ -19,9 +19,8 @@
package org.apache.iotdb.db.relational.sql.tree;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
-
import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.utils.ReadWriteIOUtils;
import java.io.DataOutputStream;
import java.io.IOException;
