You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/06/07 12:16:06 UTC
[iotdb] branch removeTokenType updated (656b2d8 -> cdfbd31)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch removeTokenType
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 656b2d8 Fix insert and udf bug:
add 245f188 enable the client library test for all changes (#3328)
add 6c4b801 [IOTDB-1400] Support arithmetic operations in SELECT clauses (#3288)
add f9d9cba [ISSUE-3335] Fix the bug of start-cli.sh -e mode can't work with wildcard * (#3336)
add 22d8e0d Fix bug in disable align it (#3333)
add d55a204 Try to fix sg dead lock (#3340)
add e700129 [ISSUE-3132]modify pom to avoid download moquette-broker from Bintary (#3345)
add 4bb101c upgrade netty and claim exclusion for enforcer check (#3347)
add 52f7248 fix file name format issue in tests (#3351)
add 73d37e6 [WIP] Fix dictionary encoding test bug (#3357)
add ce3f42b Enable coveralls check for the commit pushed into master branch (#3360)
add 11c942a [IOTDB-1405] Refactor MManager for new vector interfaces (#3300)
add 28cccc6 [IOTDB-1422] Support partial insert for new vector interfaces (#3361)
add 6e80aa0 Session example create time series method use attributes (#3363)
add dc3fc32 move pull schema methods from CMManagercode to MetaPuller (#3325)
add f059700 [IOTDB-1396] Restructure logical query operator (#3267)
add 80f5aff Fix compaction lock with query (#3365)
new cdfbd31 Merge master and fix conflict
The 1 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.
Summary of changes:
.github/workflows/client.yml | 15 +-
.github/workflows/sonar-coveralls.yml | 4 +-
LICENSE-binary | 22 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 5 +
cli/src/assembly/resources/sbin/start-cli.sh | 1 +
client-cpp/src/main/Session.cpp | 8 +-
cluster/pom.xml | 13 -
.../iotdb/cluster/coordinator/Coordinator.java | 2 +
.../cluster/log/applier/AsyncDataLogApplier.java | 2 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 8 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 4 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 229 +++-----------
.../apache/iotdb/cluster/metadata/MetaPuller.java | 173 +++++++++++
.../iotdb/cluster/query/ClusterPlanRouter.java | 13 +-
.../cluster/server/member/DataGroupMember.java | 4 +
.../iotdb/cluster/utils/ClusterQueryUtils.java | 5 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 2 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 2 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 6 +-
.../cluster/log/applier/DataLogApplierTest.java | 8 +-
.../cluster/log/logtypes/SerializeLogTest.java | 2 +-
.../cluster/server/member/DataGroupMemberTest.java | 10 +-
.../cluster/server/member/MetaGroupMemberTest.java | 6 +-
distribution/pom.xml | 13 -
.../DML-Data-Manipulation-Language.md | 42 +++
.../DML-Data-Manipulation-Language.md | 44 +++
...e.java => AlignedTimeseriesSessionExample.java} | 110 +++++--
.../main/java/org/apache/iotdb/SessionExample.java | 2 +-
hadoop/pom.xml | 18 ++
hive-connector/pom.xml | 4 +
pom.xml | 8 +-
server/pom.xml | 21 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 33 ++-
.../db/engine/cache/TimeSeriesMetadataCache.java | 2 +
.../db/engine/compaction/TsFileManagement.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 30 +-
.../engine/storagegroup/StorageGroupProcessor.java | 115 +++----
.../db/engine/storagegroup/TsFileProcessor.java | 17 +-
.../db/engine/storagegroup/TsFileResource.java | 58 ++--
.../virtualSg/VirtualStorageGroupManager.java | 14 +-
.../apache/iotdb/db/metadata/MLogTxtWriter.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 199 ++++++-------
.../java/org/apache/iotdb/db/metadata/MTree.java | 129 ++++----
.../org/apache/iotdb/db/metadata/MetaUtils.java | 15 +-
.../iotdb/db/metadata/logfile/MLogWriter.java | 8 +-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 16 +-
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 26 +-
.../iotdb/db/metadata/template/Template.java | 34 +--
.../org/apache/iotdb/db/monitor/StatMonitor.java | 7 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 2 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 1 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 103 ++++---
.../iotdb/db/qp/logical/crud/WhereComponent.java | 1 +
.../sys/ShowLockInfoOperator.java} | 14 +-
.../db/qp/physical/crud/CreateTemplatePlan.java | 32 +-
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 51 +++-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 95 ++++--
.../physical/crud/InsertRowsOfOneDevicePlan.java | 12 +-
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 2 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 37 ++-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 5 +-
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 68 +++--
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 28 +-
...StorageGroupPlan.java => ShowLockInfoPlan.java} | 6 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../db/qp/physical/sys/StorageGroupMNodePlan.java | 4 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 17 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 4 +
.../apache/iotdb/db/query/dataset/UDTFDataSet.java | 160 +++++++---
.../iotdb/db/query/executor/LastQueryExecutor.java | 4 +-
.../db/query/executor/fill/LastPointReader.java | 1 +
.../iotdb/db/query/expression/Expression.java | 5 -
.../query/expression/binary/BinaryExpression.java | 18 +-
.../query/expression/unary/FunctionExpression.java | 20 --
...inusExpression.java => NegationExpression.java} | 14 +-
.../query/expression/unary/TimeSeriesOperand.java | 10 -
.../transformer/ArithmeticAdditionTransformer.java | 30 +-
.../transformer/ArithmeticBinaryTransformer.java | 110 +++++++
.../transformer/ArithmeticDivisionTransformer.java | 30 +-
.../transformer/ArithmeticModuloTransformer.java} | 20 +-
.../ArithmeticMultiplicationTransformer.java | 30 +-
...mer.java => ArithmeticNegationTransformer.java} | 22 +-
.../ArithmeticSubtractionTransformer.java | 30 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 47 +--
.../iotdb/db/sink/local/LocalIoTDBHandler.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 16 +-
.../db/engine/memtable/MemTableTestUtils.java | 6 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 4 +-
.../db/integration/IOTDBInsertAlignedValuesIT.java | 4 +
...iltinFunctionIT.java => IoTDBArithmeticIT.java} | 214 +++++++------
.../iotdb/db/metadata/MManagerBasicTest.java | 330 +++++++++------------
.../iotdb/db/qp/physical/InsertRowPlanTest.java | 50 ++--
.../iotdb/db/qp/physical/InsertTabletPlanTest.java | 38 +--
.../java/org/apache/iotdb/session/Session.java | 124 +++++---
.../apache/iotdb/session/SessionConnection.java | 16 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 31 +-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 4 +-
.../java/org/apache/iotdb/session/SessionUT.java | 17 +-
spark-iotdb-connector/pom.xml | 26 ++
.../test/java/org/apache/iotdb/db/sql/Cases.java | 155 +++++-----
.../java/org/apache/iotdb/db/sql/ClusterIT.java | 2 +
thrift/src/main/thrift/rpc.thrift | 25 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 12 +-
.../apache/iotdb/tsfile/write/record/Tablet.java | 74 +++--
.../write/schema/VectorMeasurementSchema.java | 93 +++---
.../iotdb/tsfile/file/metadata/utils/Utils.java | 73 -----
zeppelin-interpreter/pom.xml | 6 +
111 files changed, 2109 insertions(+), 1779 deletions(-)
rename example/session/src/main/java/org/apache/iotdb/{VectorSessionExample.java => AlignedTimeseriesSessionExample.java} (74%)
copy server/src/main/java/org/apache/iotdb/db/qp/{physical/sys/ShowStorageGroupPlan.java => logical/sys/ShowLockInfoOperator.java} (77%)
copy server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{ShowStorageGroupPlan.java => ShowLockInfoPlan.java} (86%)
rename server/src/main/java/org/apache/iotdb/db/query/expression/unary/{MinusExpression.java => NegationExpression.java} (82%)
copy grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java => server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticAdditionTransformer.java (63%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticBinaryTransformer.java
copy grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java => server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticDivisionTransformer.java (63%)
copy server/src/main/java/org/apache/iotdb/db/{qp/physical/sys/ShowChildNodesPlan.java => query/udf/core/transformer/ArithmeticModuloTransformer.java} (63%)
copy grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java => server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticMultiplicationTransformer.java (63%)
copy server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/{RawQueryPointTransformer.java => ArithmeticNegationTransformer.java} (71%)
copy grafana/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java => server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/ArithmeticSubtractionTransformer.java (63%)
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBUDTFBuiltinFunctionIT.java => IoTDBArithmeticIT.java} (51%)
[iotdb] 01/01: Merge master and fix conflict
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch removeTokenType
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cdfbd314f777900bb73b72ef29db5afe73e5aa72
Merge: 656b2d8 80f5aff
Author: Alima777 <wx...@gmail.com>
AuthorDate: Mon Jun 7 20:15:17 2021 +0800
Merge master and fix conflict
.github/workflows/client.yml | 15 +-
.github/workflows/sonar-coveralls.yml | 4 +-
LICENSE-binary | 22 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 5 +
cli/src/assembly/resources/sbin/start-cli.sh | 1 +
client-cpp/src/main/Session.cpp | 8 +-
cluster/pom.xml | 13 -
.../iotdb/cluster/coordinator/Coordinator.java | 2 +
.../cluster/log/applier/AsyncDataLogApplier.java | 2 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 8 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 4 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 229 +++-----------
.../apache/iotdb/cluster/metadata/MetaPuller.java | 173 +++++++++++
.../iotdb/cluster/query/ClusterPlanRouter.java | 13 +-
.../cluster/server/member/DataGroupMember.java | 4 +
.../iotdb/cluster/utils/ClusterQueryUtils.java | 5 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 2 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 2 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 6 +-
.../cluster/log/applier/DataLogApplierTest.java | 8 +-
.../cluster/log/logtypes/SerializeLogTest.java | 2 +-
.../cluster/server/member/DataGroupMemberTest.java | 10 +-
.../cluster/server/member/MetaGroupMemberTest.java | 6 +-
distribution/pom.xml | 13 -
.../DML-Data-Manipulation-Language.md | 42 +++
.../DML-Data-Manipulation-Language.md | 44 +++
...e.java => AlignedTimeseriesSessionExample.java} | 110 +++++--
.../main/java/org/apache/iotdb/SessionExample.java | 2 +-
hadoop/pom.xml | 18 ++
hive-connector/pom.xml | 4 +
pom.xml | 8 +-
server/pom.xml | 21 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 33 ++-
.../db/engine/cache/TimeSeriesMetadataCache.java | 2 +
.../db/engine/compaction/TsFileManagement.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 30 +-
.../engine/storagegroup/StorageGroupProcessor.java | 115 +++----
.../db/engine/storagegroup/TsFileProcessor.java | 17 +-
.../db/engine/storagegroup/TsFileResource.java | 58 ++--
.../virtualSg/VirtualStorageGroupManager.java | 14 +-
.../apache/iotdb/db/metadata/MLogTxtWriter.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 199 ++++++-------
.../java/org/apache/iotdb/db/metadata/MTree.java | 129 ++++----
.../org/apache/iotdb/db/metadata/MetaUtils.java | 15 +-
.../iotdb/db/metadata/logfile/MLogWriter.java | 8 +-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 16 +-
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 26 +-
.../iotdb/db/metadata/template/Template.java | 34 +--
.../org/apache/iotdb/db/monitor/StatMonitor.java | 7 +-
.../org/apache/iotdb/db/mqtt/PublishHandler.java | 2 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 1 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 103 ++++---
.../iotdb/db/qp/logical/crud/WhereComponent.java | 1 +
.../ShowLockInfoOperator.java} | 23 +-
.../db/qp/physical/crud/CreateTemplatePlan.java | 32 +-
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 2 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 51 +++-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 95 ++++--
.../physical/crud/InsertRowsOfOneDevicePlan.java | 12 +-
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 2 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 37 ++-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 5 +-
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 68 +++--
.../physical/sys/CreateAlignedTimeSeriesPlan.java | 28 +-
.../sys/ShowLockInfoPlan.java} | 23 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../db/qp/physical/sys/StorageGroupMNodePlan.java | 4 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 17 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 4 +
.../apache/iotdb/db/query/dataset/UDTFDataSet.java | 160 +++++++---
.../iotdb/db/query/executor/LastQueryExecutor.java | 4 +-
.../db/query/executor/fill/LastPointReader.java | 1 +
.../iotdb/db/query/expression/Expression.java | 5 -
.../query/expression/binary/BinaryExpression.java | 18 +-
.../query/expression/unary/FunctionExpression.java | 20 --
...inusExpression.java => NegationExpression.java} | 14 +-
.../query/expression/unary/TimeSeriesOperand.java | 10 -
.../ArithmeticAdditionTransformer.java} | 22 +-
.../transformer/ArithmeticBinaryTransformer.java | 110 +++++++
.../ArithmeticDivisionTransformer.java} | 22 +-
.../transformer/ArithmeticModuloTransformer.java} | 22 +-
.../ArithmeticMultiplicationTransformer.java} | 22 +-
.../transformer/ArithmeticNegationTransformer.java | 67 +++++
.../ArithmeticSubtractionTransformer.java} | 22 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 47 +--
.../iotdb/db/sink/local/LocalIoTDBHandler.java | 2 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 16 +-
.../db/engine/memtable/MemTableTestUtils.java | 6 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 9 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 4 +-
.../db/integration/IOTDBInsertAlignedValuesIT.java | 4 +
.../iotdb/db/integration/IoTDBArithmeticIT.java | 275 +++++++++++++++++
.../iotdb/db/metadata/MManagerBasicTest.java | 330 +++++++++------------
.../iotdb/db/qp/physical/InsertRowPlanTest.java | 50 ++--
.../iotdb/db/qp/physical/InsertTabletPlanTest.java | 38 +--
.../java/org/apache/iotdb/session/Session.java | 124 +++++---
.../apache/iotdb/session/SessionConnection.java | 16 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 31 +-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 4 +-
.../java/org/apache/iotdb/session/SessionUT.java | 17 +-
spark-iotdb-connector/pom.xml | 26 ++
.../test/java/org/apache/iotdb/db/sql/Cases.java | 155 +++++-----
.../java/org/apache/iotdb/db/sql/ClusterIT.java | 2 +
thrift/src/main/thrift/rpc.thrift | 25 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 12 +-
.../apache/iotdb/tsfile/write/record/Tablet.java | 74 +++--
.../write/schema/VectorMeasurementSchema.java | 93 +++---
.../iotdb/tsfile/file/metadata/utils/Utils.java | 73 -----
zeppelin-interpreter/pom.xml | 6 +
111 files changed, 2352 insertions(+), 1638 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/qp/logical/crud/WhereComponent.java
index 881a4b1,881a4b1..3191d00
--- a/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/WhereComponent.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/logical/crud/WhereComponent.java
@@@ -15,6 -15,6 +15,7 @@@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
++ *
*/
package org.apache.iotdb.db.qp.logical.crud;
diff --cc server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
index 36a3a54,276569d..83c5dfd
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
@@@ -77,31 -77,41 +77,41 @@@ public class InsertTabletPlan extends I
private List<Object> failedColumns;
public InsertTabletPlan() {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
}
- public InsertTabletPlan(PartialPath deviceId, List<String> measurements) {
+ public InsertTabletPlan(PartialPath prefixPath, List<String> measurements) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
- this.deviceId = deviceId;
+ this.prefixPath = prefixPath;
this.measurements = measurements.toArray(new String[0]);
this.canBeSplit = true;
}
- public InsertTabletPlan(PartialPath deviceId, String[] measurements) {
+ public InsertTabletPlan(PartialPath prefixPath, String[] measurements) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
- this.deviceId = deviceId;
+ this.prefixPath = prefixPath;
this.measurements = measurements;
this.canBeSplit = true;
}
- public InsertTabletPlan(PartialPath deviceId, String[] measurements, List<Integer> dataTypes) {
+ public InsertTabletPlan(PartialPath prefixPath, String[] measurements, List<Integer> dataTypes) {
- super(OperatorType.BATCHINSERT);
+ super(OperatorType.BATCH_INSERT);
- this.deviceId = deviceId;
+ this.prefixPath = prefixPath;
this.measurements = measurements;
setDataTypes(dataTypes);
this.canBeSplit = true;
}
+ public InsertTabletPlan(
+ PartialPath prefixPath, String[] measurements, List<Integer> dataTypes, boolean isAligned) {
- super(OperatorType.BATCHINSERT);
++ super(OperatorType.BATCH_INSERT);
+ this.prefixPath = prefixPath;
+ this.measurements = measurements;
+ setDataTypes(dataTypes);
+ this.canBeSplit = true;
+ this.isAligned = isAligned;
+ }
+
public int getStart() {
return start;
}