You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/12/29 09:21:13 UTC
[iotdb] 02/05: add interface in ISession & ISessionPool
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/querySession
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a0db9be0fb37bc54a181a08b37ee589cc9acb381
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Wed Dec 28 16:38:16 2022 +0800
add interface in ISession & ISessionPool
---
.../java/org/apache/iotdb/isession/ISession.java | 21 +++++++++++++
.../apache/iotdb/isession/pool/ISessionPool.java | 23 ++++++++++++++-
.../apache/iotdb/isession/util/Aggregation.java | 33 +++++++++++++++++++++
.../java/org/apache/iotdb/session/Session.java | 34 ++++++++++++++++++++++
.../org/apache/iotdb/session/pool/SessionPool.java | 34 ++++++++++++++++++++++
5 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/isession/src/main/java/org/apache/iotdb/isession/ISession.java b/isession/src/main/java/org/apache/iotdb/isession/ISession.java
index 59b2f072bc..3b26c5a89e 100644
--- a/isession/src/main/java/org/apache/iotdb/isession/ISession.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/ISession.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.isession;
import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.Aggregation;
import org.apache.iotdb.isession.util.SystemStatus;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
@@ -157,6 +158,26 @@ public interface ISession extends AutoCloseable {
SessionDataSet executeLastDataQuery(List<String> paths)
throws StatementExecutionException, IoTDBConnectionException;
+ SessionDataSet executeAggregationQuery(List<String> paths, List<Aggregation> aggregations);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations, long startTime, long endTime);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval,
+ long slidingStep);
+
void insertRecord(
String deviceId,
long time,
diff --git a/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java b/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
index 020f98eb2e..0367b72b97 100644
--- a/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
+++ b/isession/src/main/java/org/apache/iotdb/isession/pool/ISessionPool.java
@@ -18,7 +18,9 @@
*/
package org.apache.iotdb.isession.pool;
+import org.apache.iotdb.isession.SessionDataSet;
import org.apache.iotdb.isession.template.Template;
+import org.apache.iotdb.isession.util.Aggregation;
import org.apache.iotdb.isession.util.SystemStatus;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
@@ -407,7 +409,6 @@ public interface ISessionPool {
void executeNonQueryStatement(String sql)
throws StatementExecutionException, IoTDBConnectionException;
- @SuppressWarnings("squid:S2095") // Suppress wrapper not closed warning
SessionDataSetWrapper executeRawDataQuery(
List<String> paths, long startTime, long endTime, long timeOut)
throws IoTDBConnectionException, StatementExecutionException;
@@ -418,6 +419,26 @@ public interface ISessionPool {
SessionDataSetWrapper executeLastDataQuery(List<String> paths)
throws StatementExecutionException, IoTDBConnectionException;
+ SessionDataSet executeAggregationQuery(List<String> paths, List<Aggregation> aggregations);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations, long startTime, long endTime);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval);
+
+ SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval,
+ long slidingStep);
+
int getMaxSize();
String getHost();
diff --git a/isession/src/main/java/org/apache/iotdb/isession/util/Aggregation.java b/isession/src/main/java/org/apache/iotdb/isession/util/Aggregation.java
new file mode 100644
index 0000000000..264032cf02
--- /dev/null
+++ b/isession/src/main/java/org/apache/iotdb/isession/util/Aggregation.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.isession.util;
+
+public enum Aggregation {
+ COUNT,
+ AVG,
+ SUM,
+ FIRST_VALUE,
+ LAST_VALUE,
+ MAX_TIME,
+ MIN_TIME,
+ MAX_VALUE,
+ MIN_VALUE,
+ EXTREME;
+}
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 f41401d5ad..196b98f2ef 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -23,6 +23,7 @@ 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.Aggregation;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.BatchExecutionException;
import org.apache.iotdb.rpc.IoTDBConnectionException;
@@ -837,6 +838,39 @@ public class Session implements ISession {
return executeLastDataQuery(paths, time, queryTimeoutInMs);
}
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations, long startTime, long endTime) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval,
+ long slidingStep) {
+ return null;
+ }
+
/**
* insert data in one row, if you want to improve your performance, please use insertRecords
* method or insertTablet method
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 661193a731..89590cb81f 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
@@ -24,6 +24,7 @@ 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.Aggregation;
import org.apache.iotdb.isession.util.Version;
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.StatementExecutionException;
@@ -2554,6 +2555,39 @@ public class SessionPool implements ISessionPool {
return null;
}
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths, List<Aggregation> aggregations, long startTime, long endTime) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval) {
+ return null;
+ }
+
+ @Override
+ public SessionDataSet executeAggregationQuery(
+ List<String> paths,
+ List<Aggregation> aggregations,
+ long startTime,
+ long endTime,
+ long interval,
+ long slidingStep) {
+ return null;
+ }
+
@Override
public int getMaxSize() {
return maxSize;