You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/12/23 01:18:34 UTC
[iotdb] branch rel/1.0 updated: [To rel/1.0][IOTDB-5127] add some deprecated methods on ISession ISessionPool and rename package name (#8578)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.0 by this push:
new 2444ca7668 [To rel/1.0][IOTDB-5127] add some deprecated methods on ISession ISessionPool and rename package name (#8578)
2444ca7668 is described below
commit 2444ca76681e11e6397e3f697f2793264b8889b3
Author: Zhijia Cao <ca...@126.com>
AuthorDate: Fri Dec 23 09:18:29 2022 +0800
[To rel/1.0][IOTDB-5127] add some deprecated methods on ISession ISessionPool and rename package name (#8578)
---
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 2 +-
.../java/org/apache/iotdb/tool/ExportTsFile.java | 2 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 2 +-
.../iotdb/AlignedTimeseriesSessionExample.java | 4 +--
.../org/apache/iotdb/DataMigrationExample.java | 4 +--
.../iotdb/HybridTimeseriesSessionExample.java | 2 +-
.../org/apache/iotdb/SessionConcurrentExample.java | 2 +-
.../main/java/org/apache/iotdb/SessionExample.java | 8 ++---
.../java/org/apache/iotdb/SessionPoolExample.java | 4 +--
.../iotdb/SyntaxConventionRelatedExample.java | 4 +--
.../java/org/apache/iotdb/flink/IoTDBSource.java | 2 +-
.../iotdb/influxdb/session/InfluxDBSession.java | 2 +-
integration-test/import-control.xml | 1 +
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 4 +--
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 2 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 6 ++--
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 6 ++--
.../iotdb/session/it/IoTDBConnectionInfoIT.java | 2 +-
.../session/it/IoTDBSessionAlignedInsertIT.java | 4 +--
.../iotdb/session/it/IoTDBSessionComplexIT.java | 4 +--
.../it/IoTDBSessionDisableMemControlIT.java | 4 +--
.../iotdb/session/it/IoTDBSessionInsertNullIT.java | 4 +--
.../IoTDBSessionInsertWithTriggerExecutionIT.java | 2 +-
.../session/it/IoTDBSessionSchemaTemplateIT.java | 6 ++--
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 4 +--
.../session/it/IoTDBSessionSyntaxConventionIT.java | 4 +--
.../org/apache/iotdb/session/it/SessionIT.java | 4 +--
.../iotdb/session/it/pool/SessionPoolIT.java | 6 ++--
.../session/IoTDBSessionAlignedABDeviceIT.java | 1 +
.../session/IoTDBSessionAlignedAggregationIT.java | 1 +
.../IoTDBSessionAlignedAggregationWithUnSeqIT.java | 1 +
.../iotdb/session/IoTDBSessionIteratorIT.java | 3 +-
.../iotdb/{session => isession}/ISession.java | 33 ++++++++++++++++--
.../iotdb/{session => isession}/SessionConfig.java | 4 +--
.../{session => isession}/SessionDataSet.java | 2 +-
.../{session => isession}/pool/ISessionPool.java | 39 ++++++++++++++++++++--
.../pool/SessionDataSetWrapper.java | 20 ++++++++---
.../{session => isession}/template/Template.java | 2 +-
.../template/TemplateNode.java | 2 +-
.../util/SystemStatus.java} | 19 +++++++----
.../iotdb/{session => isession}/util/Version.java | 2 +-
.../reporter/iotdb/SessionIoTDBReporter.java | 2 +-
.../java/org/apache/iotdb/session/Session.java | 7 ++--
.../apache/iotdb/session/SessionConnection.java | 2 ++
.../org/apache/iotdb/session/pool/SessionPool.java | 18 +++++-----
.../iotdb/session/template/InternalNode.java | 1 +
.../iotdb/session/template/MeasurementNode.java | 1 +
.../apache/iotdb/session/SessionCacheLeaderUT.java | 1 +
.../test/java/org/apache/iotdb/db/sql/Cases.java | 2 +-
49 files changed, 179 insertions(+), 85 deletions(-)
diff --git a/cli/src/main/java/org/apache/iotdb/tool/ExportCsv.java b/cli/src/main/java/org/apache/iotdb/tool/ExportCsv.java
index a63595d25a..22d83c8af0 100644
--- a/cli/src/main/java/org/apache/iotdb/tool/ExportCsv.java
+++ b/cli/src/main/java/org/apache/iotdb/tool/ExportCsv.java
@@ -21,11 +21,11 @@ package org.apache.iotdb.tool;
import org.apache.iotdb.cli.utils.JlineUtils;
import org.apache.iotdb.exception.ArgsErrorException;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.RowRecord;
diff --git a/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java b/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
index 3bad8f1982..312556d765 100644
--- a/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
+++ b/cli/src/main/java/org/apache/iotdb/tool/ExportTsFile.java
@@ -21,10 +21,10 @@ package org.apache.iotdb.tool;
import org.apache.iotdb.cli.utils.JlineUtils;
import org.apache.iotdb.exception.ArgsErrorException;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
diff --git a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
index 71b14915a6..d009125b83 100644
--- a/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
+++ b/cli/src/main/java/org/apache/iotdb/tool/ImportCsv.java
@@ -25,10 +25,10 @@ import org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.qp.constant.SQLConstant;
import org.apache.iotdb.db.qp.utils.DateTimeUtils;
import org.apache.iotdb.exception.ArgsErrorException;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Field;
diff --git a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
index 5d9b8cedda..eecceb15ca 100644
--- a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
@@ -19,13 +19,13 @@
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.template.Template;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.session.template.InternalNode;
import org.apache.iotdb.session.template.MeasurementNode;
-import org.apache.iotdb.session.template.Template;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
index 188f87bab4..a3b8bf44ff 100644
--- a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet.DataIterator;
+import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.SessionDataSet.DataIterator;
-import org.apache.iotdb.session.pool.SessionDataSetWrapper;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Path;
diff --git a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
index d630482ec4..86184f677b 100644
--- a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
index 9de931bda2..5011272f65 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
@@ -19,11 +19,11 @@
package org.apache.iotdb;
+import org.apache.iotdb.isession.template.Template;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
import org.apache.iotdb.session.template.MeasurementNode;
-import org.apache.iotdb.session.template.Template;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 67c2c788bd..3f77f67324 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -19,15 +19,15 @@
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.SessionDataSet.DataIterator;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
-import org.apache.iotdb.session.SessionDataSet.DataIterator;
import org.apache.iotdb.session.template.MeasurementNode;
-import org.apache.iotdb.session.template.Template;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
index 23a1895c22..f3c70178ef 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionPoolExample.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet.DataIterator;
+import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.SessionDataSet.DataIterator;
-import org.apache.iotdb.session.pool.SessionDataSetWrapper;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
index a296f98e01..dde5cbc635 100644
--- a/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SyntaxConventionRelatedExample.java
@@ -18,12 +18,12 @@
*/
package org.apache.iotdb;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBSource.java b/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBSource.java
index a8f821769b..264317c9f7 100644
--- a/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBSource.java
+++ b/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBSource.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.flink;
import org.apache.iotdb.flink.options.IoTDBSourceOptions;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.flink.configuration.Configuration;
diff --git a/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java b/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
index 01ab105691..9de7a1fde3 100644
--- a/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
+++ b/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.influxdb.session;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.protocol.influxdb.util.JacksonUtils;
+import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxCloseSessionReq;
import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxCreateDatabaseReq;
import org.apache.iotdb.protocol.influxdb.rpc.thrift.InfluxDBService;
@@ -34,7 +35,6 @@ import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.RpcTransportFactory;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.SessionConfig;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
diff --git a/integration-test/import-control.xml b/integration-test/import-control.xml
index 9e7bee380d..cd981ac13e 100644
--- a/integration-test/import-control.xml
+++ b/integration-test/import-control.xml
@@ -90,6 +90,7 @@
<allow class="org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp" />
<allow class="org.apache.iotdb.service.rpc.thrift.TSConnectionType" />
<allow pkg="org\.apache\.iotdb\.session.*" regex="true" />
+ <allow pkg="org\.apache\.iotdb\.isession.*" regex="true" />
<allow pkg="org\.apache\.iotdb\.tsfile\.write.*" regex="true" />
<allow pkg="org\.apache\.iotdb\.tsfile\.read.*" regex="true" />
<allow pkg="org\.apache\.iotdb\.tsfile\.utils.*" regex="true" />
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
index 86cc649615..855ff1b7e3 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
@@ -25,6 +25,8 @@ import org.apache.iotdb.commons.cluster.NodeStatus;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.db.client.DataNodeClientPoolFactory;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.it.framework.IoTDBTestLogger;
import org.apache.iotdb.itbase.env.BaseEnv;
import org.apache.iotdb.itbase.runtime.ClusterTestConnection;
@@ -37,9 +39,7 @@ import org.apache.iotdb.jdbc.Constant;
import org.apache.iotdb.jdbc.IoTDBConnection;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.TSStatusCode;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionConfig;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.thrift.TException;
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/RemoteServerEnv.java b/integration-test/src/main/java/org/apache/iotdb/it/env/RemoteServerEnv.java
index ba62c5e0c4..2bfc6eadab 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/RemoteServerEnv.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/RemoteServerEnv.java
@@ -23,11 +23,11 @@ import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.db.client.DataNodeClientPoolFactory;
+import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.itbase.env.BaseEnv;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.Constant;
import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.Session;
import java.io.IOException;
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseEnv.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseEnv.java
index ad57243849..bfb8c82aca 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseEnv.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseEnv.java
@@ -19,15 +19,15 @@
package org.apache.iotdb.itbase.env;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.it.env.ConfigNodeWrapper;
import org.apache.iotdb.it.env.DataNodeWrapper;
import org.apache.iotdb.jdbc.Constant;
import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionConfig;
import org.apache.iotdb.session.pool.SessionPool;
-import org.apache.iotdb.session.util.Version;
import java.io.IOException;
import java.sql.Connection;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnv.java b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnv.java
index ac2ca63976..74f1eb5b68 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnv.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnv.java
@@ -20,16 +20,16 @@ package org.apache.iotdb.db.it.env;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.it.env.ConfigNodeWrapper;
import org.apache.iotdb.it.env.DataNodeWrapper;
import org.apache.iotdb.itbase.env.BaseEnv;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.Constant;
import org.apache.iotdb.rpc.IoTDBConnectionException;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionConfig;
-import org.apache.iotdb.session.util.Version;
import java.io.IOException;
import java.sql.Connection;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBConnectionInfoIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBConnectionInfoIT.java
index 9a45ea93ed..d8396df872 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBConnectionInfoIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBConnectionInfoIT.java
@@ -18,12 +18,12 @@
*/
package org.apache.iotdb.session.it;
+import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp;
import org.apache.iotdb.service.rpc.thrift.TSConnectionType;
-import org.apache.iotdb.session.ISession;
import org.junit.After;
import org.junit.Before;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
index 32ba0c1310..cf08b31366 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionAlignedInsertIT.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.ConfigFactory;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
@@ -26,8 +28,6 @@ import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.write.record.Tablet;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
index 38e8b97dad..6e5a47d29c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
@@ -20,6 +20,8 @@ package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.DataNodeWrapper;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
@@ -27,8 +29,6 @@ import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java
index 8b4d80f4ba..c88f693e06 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionDisableMemControlIT.java
@@ -19,14 +19,14 @@
package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.ConfigFactory;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNullIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNullIT.java
index d96a4a5f48..7eb52a5ffb 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNullIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertNullIT.java
@@ -19,14 +19,14 @@
package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertWithTriggerExecutionIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertWithTriggerExecutionIT.java
index 823e5294cf..b0ac6ae476 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertWithTriggerExecutionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionInsertWithTriggerExecutionIT.java
@@ -19,12 +19,12 @@
package org.apache.iotdb.session.it;
+import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java
index f7231492fb..5915a8b8e6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java
@@ -20,16 +20,16 @@
package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.template.TemplateNode;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.template.MeasurementNode;
-import org.apache.iotdb.session.template.Template;
-import org.apache.iotdb.session.template.TemplateNode;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
index 9fe147ce37..f01c8db7af 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
@@ -21,6 +21,8 @@ package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.OperationType;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
@@ -29,8 +31,6 @@ import org.apache.iotdb.rpc.BatchExecutionException;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java
index f0417d0500..83dd913f3b 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSyntaxConventionIT.java
@@ -19,13 +19,13 @@
package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java
index 351285f730..975119bd91 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/SessionIT.java
@@ -18,12 +18,12 @@
*/
package org.apache.iotdb.session.it;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/pool/SessionPoolIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/pool/SessionPoolIT.java
index 1c75737997..5fb331e7f1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/pool/SessionPoolIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/pool/SessionPoolIT.java
@@ -19,14 +19,14 @@
package org.apache.iotdb.session.it.pool;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.SessionConfig;
-import org.apache.iotdb.session.pool.SessionDataSetWrapper;
import org.apache.iotdb.session.pool.SessionPool;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.junit.After;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
index 2afeb5d23d..197b21d647 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.session;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
index 6387c97ba8..685c844401 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.session;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
index 108e4c5112..c1ce505497 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.session;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java
index 0a25fe8a13..fd7ecb6276 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionIteratorIT.java
@@ -20,10 +20,11 @@ package org.apache.iotdb.session;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.SessionDataSet.DataIterator;
import org.apache.iotdb.itbase.category.LocalStandaloneTest;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.SessionDataSet.DataIterator;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/isession/src/main/java/org/apache/iotdb/session/ISession.java b/isession/src/main/java/org/apache/iotdb/isession/ISession.java
similarity index 94%
rename from isession/src/main/java/org/apache/iotdb/session/ISession.java
rename to isession/src/main/java/org/apache/iotdb/isession/ISession.java
index 8666797a36..59b2f072bc 100644
--- a/isession/src/main/java/org/apache/iotdb/session/ISession.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/ISession.java
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session;
+package org.apache.iotdb.isession;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.SystemStatus;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.service.rpc.thrift.TSBackupConfigurationResp;
import org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp;
-import org.apache.iotdb.session.template.Template;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
@@ -32,6 +33,7 @@ import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.thrift.TException;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.util.List;
import java.util.Map;
@@ -462,4 +464,29 @@ public interface ISession extends AutoCloseable {
void setQueryTimeout(long timeoutInMs);
long getQueryTimeout();
+
+ @Deprecated
+ default SystemStatus getSystemStatus() {
+ return SystemStatus.NORMAL;
+ }
+
+ @Deprecated
+ default void createTimeseriesOfTemplateOnPath(String path)
+ throws IoTDBConnectionException, StatementExecutionException {}
+
+ @Deprecated
+ default void deactivateTemplateOn(String templateName, String prefixPath)
+ throws IoTDBConnectionException, StatementExecutionException {}
+
+ @Deprecated
+ default void operationSyncTransmit(ByteBuffer buffer)
+ throws IoTDBConnectionException, StatementExecutionException {}
+
+ @Deprecated
+ default boolean isEnableCacheLeader() {
+ return true;
+ }
+
+ @Deprecated
+ default void setEnableCacheLeader(boolean enableCacheLeader) {}
}
diff --git a/isession/src/main/java/org/apache/iotdb/session/SessionConfig.java b/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
similarity index 96%
rename from isession/src/main/java/org/apache/iotdb/session/SessionConfig.java
rename to isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
index 581d28d1c3..e043f9e894 100644
--- a/isession/src/main/java/org/apache/iotdb/session/SessionConfig.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/SessionConfig.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session;
+package org.apache.iotdb.isession;
-import org.apache.iotdb.session.util.Version;
+import org.apache.iotdb.isession.util.Version;
public class SessionConfig {
diff --git a/isession/src/main/java/org/apache/iotdb/session/SessionDataSet.java b/isession/src/main/java/org/apache/iotdb/isession/SessionDataSet.java
similarity index 99%
rename from isession/src/main/java/org/apache/iotdb/session/SessionDataSet.java
rename to isession/src/main/java/org/apache/iotdb/isession/SessionDataSet.java
index 55c6d4b5fb..e07a3c933f 100644
--- a/isession/src/main/java/org/apache/iotdb/session/SessionDataSet.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/SessionDataSet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session;
+package org.apache.iotdb.isession;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.IoTDBRpcDataSet;
diff --git a/isession/src/main/java/org/apache/iotdb/session/pool/ISessionPool.java b/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
similarity index 93%
rename from isession/src/main/java/org/apache/iotdb/session/pool/ISessionPool.java
rename to isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
index d6c299cb2a..020f98eb2e 100644
--- a/isession/src/main/java/org/apache/iotdb/session/pool/ISessionPool.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
@@ -16,20 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session.pool;
+package org.apache.iotdb.isession.pool;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.SystemStatus;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.service.rpc.thrift.TSBackupConfigurationResp;
import org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp;
-import org.apache.iotdb.session.template.Template;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.record.Tablet;
import java.io.IOException;
+import java.nio.ByteBuffer;
import java.time.ZoneId;
import java.util.List;
import java.util.Map;
@@ -460,4 +462,35 @@ public interface ISessionPool {
void setQueryTimeout(long timeoutInMs);
long getQueryTimeout();
+
+ @Deprecated
+ default void createTimeseriesOfTemplateOnPath(String path)
+ throws IoTDBConnectionException, StatementExecutionException {}
+
+ @Deprecated
+ default void deactivateTempalte(String templateName, String prefixPath)
+ throws IoTDBConnectionException, StatementExecutionException {}
+
+ @Deprecated
+ default SessionDataSetWrapper executeRawDataQuery(
+ List<String> paths, long startTime, long endTime)
+ throws IoTDBConnectionException, StatementExecutionException {
+ return null;
+ }
+
+ @Deprecated
+ default boolean operationSyncTransmit(ByteBuffer buffer)
+ throws IoTDBConnectionException, StatementExecutionException {
+ return false;
+ }
+
+ @Deprecated
+ default SystemStatus getSystemStatus() throws IoTDBConnectionException {
+ return SystemStatus.NORMAL;
+ }
+
+ @Deprecated
+ default boolean isEnableCacheLeader() {
+ return false;
+ }
}
diff --git a/isession/src/main/java/org/apache/iotdb/session/pool/SessionDataSetWrapper.java b/isession/src/main/java/org/apache/iotdb/isession/pool/SessionDataSetWrapper.java
similarity index 86%
rename from isession/src/main/java/org/apache/iotdb/session/pool/SessionDataSetWrapper.java
rename to isession/src/main/java/org/apache/iotdb/isession/pool/SessionDataSetWrapper.java
index 840150040d..a25d9735cc 100644
--- a/isession/src/main/java/org/apache/iotdb/session/pool/SessionDataSetWrapper.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/pool/SessionDataSetWrapper.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session.pool;
+package org.apache.iotdb.isession.pool;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.ISession;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import java.util.List;
@@ -38,7 +38,7 @@ public class SessionDataSetWrapper implements AutoCloseable {
this.pool = pool;
}
- protected ISession getSession() {
+ public ISession getSession() {
return session;
}
@@ -95,4 +95,16 @@ public class SessionDataSetWrapper implements AutoCloseable {
public void close() {
pool.closeResultSet(this);
}
+
+ public void setSession(ISession session) {
+ this.session = session;
+ }
+
+ public SessionDataSet getSessionDataSet() {
+ return sessionDataSet;
+ }
+
+ public void setSessionDataSet(SessionDataSet sessionDataSet) {
+ this.sessionDataSet = sessionDataSet;
+ }
}
diff --git a/isession/src/main/java/org/apache/iotdb/session/template/Template.java b/isession/src/main/java/org/apache/iotdb/isession/template/Template.java
similarity index 98%
rename from isession/src/main/java/org/apache/iotdb/session/template/Template.java
rename to isession/src/main/java/org/apache/iotdb/isession/template/Template.java
index ed12b27639..0582d8e0cd 100644
--- a/isession/src/main/java/org/apache/iotdb/session/template/Template.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/template/Template.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session.template;
+package org.apache.iotdb.isession.template;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
diff --git a/isession/src/main/java/org/apache/iotdb/session/template/TemplateNode.java b/isession/src/main/java/org/apache/iotdb/isession/template/TemplateNode.java
similarity index 97%
rename from isession/src/main/java/org/apache/iotdb/session/template/TemplateNode.java
rename to isession/src/main/java/org/apache/iotdb/isession/template/TemplateNode.java
index e47ce56a41..c408b4ecdc 100644
--- a/isession/src/main/java/org/apache/iotdb/session/template/TemplateNode.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/template/TemplateNode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.session.template;
+package org.apache.iotdb.isession.template;
import org.apache.iotdb.rpc.StatementExecutionException;
diff --git a/isession/src/main/java/org/apache/iotdb/session/util/Version.java b/isession/src/main/java/org/apache/iotdb/isession/util/SystemStatus.java
similarity index 65%
copy from isession/src/main/java/org/apache/iotdb/session/util/Version.java
copy to isession/src/main/java/org/apache/iotdb/isession/util/SystemStatus.java
index 118c326949..318e493b6f 100644
--- a/isession/src/main/java/org/apache/iotdb/session/util/Version.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/util/SystemStatus.java
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -16,10 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.iotdb.isession.util;
-package org.apache.iotdb.session.util;
-
-public enum Version {
- V_0_12,
- V_0_13
+/** Status of current system */
+public enum SystemStatus {
+ /** System can read and write normally */
+ NORMAL,
+ /** Only query statements are permitted */
+ READ_ONLY,
+ /**
+ * Unrecoverable errors occur, system will be read-only or exit according to the param
+ * allow_read_only_when_errors_occur
+ */
+ ERROR,
}
diff --git a/isession/src/main/java/org/apache/iotdb/session/util/Version.java b/isession/src/main/java/org/apache/iotdb/isession/util/Version.java
similarity index 95%
rename from isession/src/main/java/org/apache/iotdb/session/util/Version.java
rename to isession/src/main/java/org/apache/iotdb/isession/util/Version.java
index 118c326949..31f3880439 100644
--- a/isession/src/main/java/org/apache/iotdb/session/util/Version.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/util/Version.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.session.util;
+package org.apache.iotdb.isession.util;
public enum Version {
V_0_12,
diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/SessionIoTDBReporter.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/SessionIoTDBReporter.java
index 5b7f271952..23dfb2925c 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/SessionIoTDBReporter.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/reporter/iotdb/SessionIoTDBReporter.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.metrics.reporter.iotdb;
+import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
import org.apache.iotdb.metrics.AbstractMetricManager;
import org.apache.iotdb.metrics.config.MetricConfig;
import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
@@ -28,7 +29,6 @@ import org.apache.iotdb.metrics.utils.MetricInfo;
import org.apache.iotdb.metrics.utils.ReporterType;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
-import org.apache.iotdb.session.pool.SessionDataSetWrapper;
import org.apache.iotdb.session.pool.SessionPool;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java
index ebecbfa62e..f41401d5ad 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -19,6 +19,11 @@
package org.apache.iotdb.session;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.BatchExecutionException;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.NoValidValueException;
@@ -48,11 +53,9 @@ import org.apache.iotdb.service.rpc.thrift.TSQueryTemplateResp;
import org.apache.iotdb.service.rpc.thrift.TSSetSchemaTemplateReq;
import org.apache.iotdb.service.rpc.thrift.TSUnsetSchemaTemplateReq;
import org.apache.iotdb.session.template.MeasurementNode;
-import org.apache.iotdb.session.template.Template;
import org.apache.iotdb.session.template.TemplateQueryType;
import org.apache.iotdb.session.util.SessionUtils;
import org.apache.iotdb.session.util.ThreadUtils;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.exception.write.UnSupportedDataTypeException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
index 889257b615..8f6d9306f2 100644
--- a/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
+++ b/session/src/main/java/org/apache/iotdb/session/SessionConnection.java
@@ -21,6 +21,8 @@ package org.apache.iotdb.session;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.RedirectException;
import org.apache.iotdb.rpc.RpcTransportFactory;
diff --git a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
index 6f9754dd9e..661193a731 100644
--- a/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
+++ b/session/src/main/java/org/apache/iotdb/session/pool/SessionPool.java
@@ -18,16 +18,18 @@
*/
package org.apache.iotdb.session.pool;
+import org.apache.iotdb.isession.ISession;
+import org.apache.iotdb.isession.SessionConfig;
+import org.apache.iotdb.isession.SessionDataSet;
+import org.apache.iotdb.isession.pool.ISessionPool;
+import org.apache.iotdb.isession.pool.SessionDataSetWrapper;
+import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.service.rpc.thrift.TSBackupConfigurationResp;
import org.apache.iotdb.service.rpc.thrift.TSConnectionInfoResp;
-import org.apache.iotdb.session.ISession;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionConfig;
-import org.apache.iotdb.session.SessionDataSet;
-import org.apache.iotdb.session.template.Template;
-import org.apache.iotdb.session.util.Version;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
@@ -530,14 +532,14 @@ public class SessionPool implements ISessionPool {
public void closeResultSet(SessionDataSetWrapper wrapper) {
boolean putback = true;
try {
- wrapper.sessionDataSet.closeOperationHandle();
+ wrapper.getSessionDataSet().closeOperationHandle();
} catch (IoTDBConnectionException | StatementExecutionException e) {
tryConstructNewSession();
putback = false;
} finally {
- ISession session = occupied.remove(wrapper.session);
+ ISession session = occupied.remove(wrapper.getSession());
if (putback && session != null) {
- putBack(wrapper.session);
+ putBack(wrapper.getSession());
}
}
}
diff --git a/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java b/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
index b5ac030f72..9361eab46f 100644
--- a/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
+++ b/session/src/main/java/org/apache/iotdb/session/template/InternalNode.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.session.template;
+import org.apache.iotdb.isession.template.TemplateNode;
import org.apache.iotdb.rpc.StatementExecutionException;
import java.util.HashMap;
diff --git a/session/src/main/java/org/apache/iotdb/session/template/MeasurementNode.java b/session/src/main/java/org/apache/iotdb/session/template/MeasurementNode.java
index a989dd6cb9..0a5f6997a3 100644
--- a/session/src/main/java/org/apache/iotdb/session/template/MeasurementNode.java
+++ b/session/src/main/java/org/apache/iotdb/session/template/MeasurementNode.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.session.template;
+import org.apache.iotdb.isession.template.TemplateNode;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
diff --git a/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java b/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
index 48ba3b3dc6..2852d7a884 100644
--- a/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
+++ b/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.session;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+import org.apache.iotdb.isession.SessionConfig;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.RedirectException;
import org.apache.iotdb.rpc.StatementExecutionException;
diff --git a/testcontainer/src/test/java/org/apache/iotdb/db/sql/Cases.java b/testcontainer/src/test/java/org/apache/iotdb/db/sql/Cases.java
index 84401210a5..30eaaa845f 100644
--- a/testcontainer/src/test/java/org/apache/iotdb/db/sql/Cases.java
+++ b/testcontainer/src/test/java/org/apache/iotdb/db/sql/Cases.java
@@ -25,11 +25,11 @@ import org.apache.iotdb.db.qp.physical.sys.CreateFunctionPlan;
import org.apache.iotdb.db.qp.physical.sys.DropFunctionPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowFunctionsPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowPlan;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.rpc.BatchExecutionException;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.session.Session;
-import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;