You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/01/18 02:51:07 UTC
[iotdb] branch cq-oom created (now f71d252)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch cq-oom
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at f71d252 fix conflicts
This branch includes the following new commits:
new ea5f717 ServiceProvider.SESSION_MANAGER.requestQueryId
new f71d252 fix conflicts
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 02/02: fix conflicts
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch cq-oom
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f71d252cfb7cb5ac1c325c842d063057f622772b
Merge: ea5f717 d67bd62
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Tue Jan 18 10:26:10 2022 +0800
fix conflicts
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 43 ++-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 81 +++--
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 18 +-
.../org/apache/iotdb/cli/utils/JlineUtils.java | 15 +-
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 2 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 50 ++-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 23 +-
.../apache/iotdb/cluster/query/ClusterPlanner.java | 44 +--
.../query/ClusterUDTFQueryExecutorTest.java | 9 +-
docs/SystemDesign/SchemaManager/SchemaManager.md | 8 +-
docs/UserGuide/Appendix/Config-Manual.md | 150 ++++++++-
docs/UserGuide/Appendix/Keywords.md | 212 ++++++++++++
.../DML-Data-Manipulation-Language.md | 245 +++++++++-----
.../IoTDB-SQL-Language/Syntax-Conventions.md | 196 +++++++----
.../UserGuide/System-Tools/Load-External-Tsfile.md | 10 +-
docs/UserGuide/System-Tools/Metric-Tool.md | 2 +-
.../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +-
docs/zh/UserGuide/Appendix/Config-Manual.md | 207 +++++++-----
docs/zh/UserGuide/Appendix/Keywords.md | 212 ++++++++++++
.../DML-Data-Manipulation-Language.md | 247 +++++++++-----
.../IoTDB-SQL-Language/Syntax-Conventions.md | 199 +++++++----
.../UserGuide/System-Tools/Load-External-Tsfile.md | 12 +-
docs/zh/UserGuide/System-Tools/Metric-Tool.md | 2 +-
example/kafka/pom.xml | 8 +-
example/kafka/readme.md | 30 +-
.../main/java/org/apache/iotdb/kafka/Constant.java | 68 ++--
.../main/java/org/apache/iotdb/kafka/Consumer.java | 129 ++++++++
.../org/apache/iotdb/kafka/ConsumerThread.java | 159 +++++++++
.../java/org/apache/iotdb/kafka/KafkaConsumer.java | 90 -----
.../apache/iotdb/kafka/KafkaConsumerThread.java | 104 ------
.../kafka/{KafkaProducer.java => Producer.java} | 34 +-
.../iotdb/integration/env/ClusterEnvBase.java | 27 ++
.../iotdb/integration/env/RemoteServerEnv.java | 26 ++
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 4 +
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 46 +++
.../iotdb/db/integration/IoTDBFuzzyQueryIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 8 +-
.../db/integration/IoTDBInsertMultiRowIT.java | 18 +
.../db/integration/IoTDBNewTsFileCompactionIT.java | 4 +
.../db/integration/IoTDBQueryWithIDTableIT.java | 5 +-
.../db/integration/IoTDBSyntaxConventionIT.java | 288 ++++++++++++++++
.../iotdb/db/integration/IoTDBTagAlterIT.java | 7 +-
.../apache/iotdb/db/integration/IoTDBTagIT.java | 15 +-
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 2 +-
.../aggregation/IoTDBUDFNestAggregationIT.java | 8 +-
.../IoTDBUserDefinedAggregationFunctionIT.java | 17 +-
.../aligned/IOTDBInsertAlignedValuesIT.java | 14 +
.../iotdb/db/integration/env/StandaloneEnv.java | 18 +
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 365 +++++++++++++++++++++
.../IoTDBDeletionVersionAdaptionIT.java | 301 +++++++++++++++++
.../IoTDBQueryVersionAdaptionIT.java | 319 ++++++++++++++++++
.../IoTDBSyntaxConventionVersionAdaptionIT.java | 84 +++++
.../iotdb/session/IoTDBSessionComplexIT.java | 6 +-
.../main/java/org/apache/iotdb/jdbc/Config.java | 2 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 9 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 8 +
metrics/ReadMe.md | 10 +-
.../reporter/prometheus/PrometheusReporter.java | 4 +-
.../main/assembly/resources/conf/iotdb-metric.yml | 2 +-
.../apache/iotdb/metrics/CompositeReporter.java | 4 +-
.../java/org/apache/iotdb/metrics/type/Gauge.java | 2 +
.../apache/iotdb/metrics/utils/ReporterType.java | 2 +-
.../iotdb/metrics/config/MetricConfigTest.java | 9 +-
.../src/{main => }/test/resources/iotdb-metric.yml | 3 +-
.../org.apache.iotdb.metrics.MetricManager | 2 +-
pom.xml | 2 +-
server/pom.xml | 11 +
.../resources/conf/iotdb-engine.properties | 13 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 26 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 10 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 30 +-
.../cross/inplace/InplaceCompactionSelector.java | 41 +--
.../cross/inplace/manage/MergeManager.java | 3 +-
.../cross/inplace/task/CrossSpaceMergeTask.java | 2 +-
.../storagegroup/IDTableFlushTimeManager.java | 207 ++++++++++++
.../engine/storagegroup/ILastFlushTimeManager.java | 12 +-
.../engine/storagegroup/LastFlushTimeManager.java | 12 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 24 +-
.../org/apache/iotdb/db/metadata/MManager.java | 130 ++++++--
.../apache/iotdb/db/metadata/idtable/IDTable.java | 16 +
.../db/metadata/idtable/IDTableHashmapImpl.java | 39 ++-
.../db/metadata/idtable/entry/DeviceEntry.java | 68 ++++
.../db/metadata/idtable/entry/DeviceIDFactory.java | 16 +-
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 134 +++++++-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 5 +
.../apache/iotdb/db/metadata/path/PartialPath.java | 28 ++
.../apache/iotdb/db/metadata/tag/TagManager.java | 13 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 4 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 40 ++-
.../reporter/DropwizardIoTDBReporter.java | 74 +++++
.../metrics/dropwizard/reporter/IoTDBReporter.java | 233 +++++++++++++
.../org/apache/iotdb/db/metrics/metricsUtils.java | 61 ++++
.../micrometer/registry/IoTDBMeterRegistry.java | 150 +++++++++
.../micrometer/registry/IoTDBRegistryConfig.java | 16 +-
.../reporter/MicrometerIoTDBReporter.java | 94 ++++++
.../rest/handler/RequestValidationHandler.java | 6 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 16 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 105 +++---
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 78 +++--
.../org/apache/iotdb/db/qp/logical/Operator.java | 14 +
.../db/qp/logical/crud/DeleteDataOperator.java | 14 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 2 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 33 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 16 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 14 +
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 232 +++++++++----
.../iotdb/db/qp/strategy/LogicalGenerator.java | 12 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 1 +
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 19 +-
.../apache/iotdb/db/qp/utils/WildcardsRemover.java | 16 +-
.../iotdb/db/query/control/SessionManager.java | 4 +
.../db/service/thrift/impl/TSServiceImpl.java | 30 +-
.../services/org.apache.iotdb.metrics.Reporter | 3 +-
.../db/metadata/idtable/IDTableFlushTimeTest.java | 226 +++++++++++++
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 7 +-
site/src/main/.vuepress/config.js | 6 +-
.../test/java/org/apache/iotdb/db/sql/Cases.java | 12 +-
117 files changed, 5430 insertions(+), 1202 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
index f4c0bba,caf37aa..ce009a3
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
@@@ -109,18 -110,7 +109,7 @@@ public class RestApiServiceImpl extend
return response;
}
- // set max row limit to avoid OOM
- Integer rowLimitInRequest = sql.getRowLimit();
- if (rowLimitInRequest == null) {
- rowLimitInRequest = defaultQueryRowLimit;
- }
- int rowLimitInQueryPlan = queryPlan.getRowLimit();
- if (rowLimitInQueryPlan <= 0) {
- rowLimitInQueryPlan = defaultQueryRowLimit;
- }
- final int actualRowSizeLimit = Math.min(rowLimitInRequest, rowLimitInQueryPlan);
-
- final long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ final long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
QueryContext queryContext =
serviceProvider.genQueryContext(
[iotdb] 01/02: ServiceProvider.SESSION_MANAGER.requestQueryId
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch cq-oom
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ea5f717411a4da9ffe74c622aed0b393921b79b8
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Tue Jan 18 10:24:16 2022 +0800
ServiceProvider.SESSION_MANAGER.requestQueryId
---
.../main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java | 3 +--
.../apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java | 3 +--
.../apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java | 5 ++---
.../org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java | 3 +--
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java b/server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java
index 23bb596..9fd6e6c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cq/ContinuousQueryTask.java
@@ -34,7 +34,6 @@ import org.apache.iotdb.db.qp.physical.crud.InsertMultiTabletPlan;
import org.apache.iotdb.db.qp.physical.sys.CreateContinuousQueryPlan;
import org.apache.iotdb.db.qp.strategy.LogicalGenerator;
import org.apache.iotdb.db.query.context.QueryContext;
-import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.basic.ServiceProvider;
import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
@@ -98,7 +97,7 @@ public class ContinuousQueryTask extends WrappedRunnable {
}
// construct query dataset
- final long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ final long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
final QueryContext queryContext =
serviceProvider.genQueryContext(
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java
index 59bdad1..36e1d35 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManager.java
@@ -31,7 +31,6 @@ import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan;
import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
import org.apache.iotdb.db.qp.physical.sys.SetStorageGroupPlan;
import org.apache.iotdb.db.query.context.QueryContext;
-import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.basic.ServiceProvider;
import org.apache.iotdb.tsfile.exception.filter.QueryFilterOptimizationException;
@@ -71,7 +70,7 @@ public class InfluxDBMetaManager {
}
public void recover() {
- long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
QueryPlan queryPlan = (QueryPlan) planner.parseSQLToPhysicalPlan(SELECT_TAG_INFO_SQL);
QueryContext queryContext =
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
index 5aa536b..778ff4e 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
@@ -33,7 +33,6 @@ import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
import org.apache.iotdb.db.qp.physical.sys.ShowPlan;
import org.apache.iotdb.db.query.context.QueryContext;
-import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.basic.ServiceProvider;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -92,7 +91,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService {
return response;
}
- final long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ final long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
QueryContext queryContext =
serviceProvider.genQueryContext(
@@ -148,7 +147,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService {
return response;
}
- final long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ final long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
QueryContext queryContext =
serviceProvider.genQueryContext(
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
index 1308d2a..f4c0bba 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
@@ -34,7 +34,6 @@ import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan;
import org.apache.iotdb.db.qp.physical.crud.QueryPlan;
import org.apache.iotdb.db.query.context.QueryContext;
-import org.apache.iotdb.db.query.control.QueryResourceManager;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.basic.ServiceProvider;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -121,7 +120,7 @@ public class RestApiServiceImpl extends RestApiService {
}
final int actualRowSizeLimit = Math.min(rowLimitInRequest, rowLimitInQueryPlan);
- final long queryId = QueryResourceManager.getInstance().assignQueryId(true);
+ final long queryId = ServiceProvider.SESSION_MANAGER.requestQueryId(true);
try {
QueryContext queryContext =
serviceProvider.genQueryContext(