This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch xkf_id_table
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 764c633 fix comments
add 726d939 remove original path from insert plan
add 53a7ad7 [IOTDB-1860] REST protocol based Grafana plugin (#4585)
add 4abd8aa Add PMC (#4641)
add e4f8e63 [IOTDB-2208] Reconstruct the process of generating resultset
header of query (#4640)
add 42b8f60 [IOTDB-1948] [IOTDB-1949] Group by fill supports vector
(#4632)
add db24295 [IoTDB-2185] get an exception when parsing the header of CSV
(#4620)
add ce31406 [IOTDB-2209] Fix logback CVE-2021-42550 issue (#4643)
add 9af8185 [IOTDB-2208] Reconstruct the process of generating resultset
header of query - Part2 (#4642)
add 3c1d485 [IOTDB-1942] Support align by device query in new vector
(#4435)
add effef77 update fill doc (#4647)
add 4dbe90a [IOTDB-2193] Reduce unnecessary lock operations of
RaftLogManager to improve writing performance (#4638)
add 349a9b4 [IOTDB-2220] Fix unit tests too slow issue caused by the
MQTTService (#4649)
add 421ee8b [IOTDB-2206] Rename StorageGroupProcessor to
VirtualStorageGroupProcessor (#4646)
add d0ffe74 Merge branch 'master' of git://github.com/apache/iotdb into
xkf_id_table
No new revisions were added by this update.
Summary of changes:
.github/workflows/grafana-plugin.yml | 47 +
LICENSE-binary | 4 +-
RELEASE_NOTES.md | 2 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 18 +-
.../iotdb/cluster/ClusterFileFlushPolicy.java | 8 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 2 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 2 +-
.../iotdb/cluster/log/applier/DataLogApplier.java | 6 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 21 +-
.../partition/slot/SlotTimePartitionFilter.java | 2 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 2 +-
.../iotdb/cluster/query/ClusterPlanRouter.java | 16 +-
.../iotdb/cluster/query/ClusterQueryRouter.java | 19 -
.../ClusterGroupByFillNoVFilterDataSet.java | 54 -
.../groupby/ClusterGroupByFillVFilterDataSet.java | 67 -
.../cluster/server/member/DataGroupMember.java | 2 +-
.../iotdb/cluster/server/member/RaftMember.java | 101 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 3 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 2 +-
.../org/apache/iotdb/cluster/common/TestUtils.java | 4 +-
.../cluster/log/applier/DataLogApplierTest.java | 20 +-
.../cluster/log/logtypes/SerializeLogTest.java | 2 +-
.../cluster/log/snapshot/FileSnapshotTest.java | 14 +-
.../log/snapshot/PartitionedSnapshotTest.java | 4 +-
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 4 +-
.../cluster/server/member/DataGroupMemberTest.java | 14 +-
.../cluster/server/member/MetaGroupMemberTest.java | 10 +-
distribution/pom.xml | 14 +-
distribution/src/assembly/all.xml | 4 +-
.../{grafana.xml => grafana-connector.xml} | 8 +-
.../{client-cpp.xml => grafana-plugin.xml} | 8 +-
docker/ReadMe.md | 2 +-
docs/SystemDesign/StorageEngine/Recover.md | 2 +-
docs/SystemDesign/StorageEngine/StorageEngine.md | 2 +-
.../{Grafana.md => Grafana Connector.md} | 22 +-
.../DML-Data-Manipulation-Language.md | 492 +-
docs/zh/SystemDesign/StorageEngine/Recover.md | 4 +-
.../zh/SystemDesign/StorageEngine/StorageEngine.md | 2 +-
.../{Grafana.md => Grafana Connector.md} | 20 +-
.../Ecosystem Integration/Grafana Plugin.md | 236 +
.../DML-Data-Manipulation-Language.md | 494 +-
.../img/add_data_source.png | Bin
{grafana => grafana-connector}/img/add_graph.png | Bin
.../img/edit_data_source.png | Bin
{grafana => grafana-connector}/pom.xml | 4 +-
{grafana => grafana-connector}/readme.md | 22 +-
{grafana => grafana-connector}/readme_zh.md | 20 +-
.../web/grafana/TsfileWebDemoApplication.java | 0
.../apache/iotdb/web/grafana/bean/TimeValues.java | 0
.../iotdb/web/grafana/conf/MyConfiguration.java | 0
.../controller/DatabaseConnectController.java | 0
.../org/apache/iotdb/web/grafana/dao/BasicDao.java | 0
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 0
.../grafana/service/DatabaseConnectService.java | 0
.../service/impl/DatabaseConnectServiceImpl.java | 0
.../src/main/resources/application.properties | 0
.../web/grafana/dao/impl/BasicDaoImplTest.java | 0
grafana-plugin/.gitignore | 32 +
.../User.java => grafana-plugin/.prettierrc.js | 24 +-
.../CHANGELOG.md | 4 +-
LICENSE => grafana-plugin/LICENSE | 39 +-
grafana-plugin/README.md | 63 +
.../User.java => grafana-plugin/jest.config.js | 26 +-
grafana-plugin/package.json | 31 +
{antlr => grafana-plugin}/pom.xml | 70 +-
grafana-plugin/src/ConfigEditor.tsx | 101 +
grafana-plugin/src/QueryEditor.tsx | 101 +
.../src/componments/Form.tsx | 39 +-
grafana-plugin/src/componments/FromValue.tsx | 110 +
grafana-plugin/src/componments/SelectValue.tsx | 109 +
.../src/componments/WhereValue.tsx | 41 +-
grafana-plugin/src/datasource.ts | 156 +
.../User.java => grafana-plugin/src/functions.ts | 23 +-
grafana-plugin/src/img/logo.svg | 271 +
.../User.java => grafana-plugin/src/module.ts | 29 +-
grafana-plugin/src/plugin.json | 47 +
.../User.java => grafana-plugin/src/types.ts | 41 +-
grafana-plugin/tsconfig.json | 9 +
grafana-plugin/yarn.lock | 14427 +++++++++++++++++++
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 5 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 275 +-
.../db/integration/IoTDBGroupByFillMixPathsIT.java | 759 +-
.../integration/IoTDBGroupByFillWithRangeIT.java | 14 +-
.../db/integration/IoTDBGroupByMonthFillIT.java | 55 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 6 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 6 +-
.../IoTDBAggregationWithoutValueFilterIT.java | 18 +-
...ueFilter2IT.java => IoTDBAlignByDevice2IT.java} | 3 +-
.../integration/aligned/IoTDBAlignByDeviceIT.java | 1349 ++
.../aligned/IoTDBGroupByFillQueryBigDataIT.java | 192 +
...eFilterIT.java => IoTDBGroupByFillQueryIT.java} | 335 +-
openapi/src/main/openapi3/iotdb-rest.yaml | 59 +
pom.xml | 5 +-
.../resources/conf/iotdb-engine.properties | 6 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 5 +
.../org/apache/iotdb/db/engine/StorageEngine.java | 172 +-
.../compaction/task/CompactionRecoverTask.java | 2 +-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 11 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 8 +-
.../db/engine/storagegroup/StorageGroupInfo.java | 18 +-
.../db/engine/storagegroup/TsFileProcessor.java | 12 +-
.../db/engine/storagegroup/TsFileResource.java | 4 +-
...ssor.java => VirtualStorageGroupProcessor.java} | 35 +-
...eGroupManager.java => StorageGroupManager.java} | 167 +-
.../trigger/sink/local/LocalIoTDBHandler.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 6 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 8 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 4 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 8 +-
.../rest/handler/AuthorizationHandler.java | 5 +-
.../protocol/rest/handler/QueryDataSetHandler.java | 36 +-
.../rest/handler/RequestValidationHandler.java | 9 +
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 166 +
.../db/protocol/rest/impl/PingApiServiceImpl.java | 1 +
.../db/protocol/rest/impl/RestApiServiceImpl.java | 50 +-
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../qp/logical/crud/GroupByFillQueryOperator.java | 2 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 151 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 50 +
.../db/qp/physical/crud/AlignByDevicePlan.java | 140 +-
.../iotdb/db/qp/physical/crud/DeletePlan.java | 2 +-
.../db/qp/physical/crud/GroupByTimeFillPlan.java | 59 +
.../iotdb/db/qp/physical/crud/GroupByTimePlan.java | 26 +-
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 6 +-
.../iotdb/db/qp/physical/crud/InsertPlan.java | 29 +-
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 39 +-
.../physical/crud/InsertRowsOfOneDevicePlan.java | 16 +-
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 4 +-
.../db/qp/physical/crud/InsertTabletPlan.java | 20 +-
.../iotdb/db/qp/physical/crud/LastQueryPlan.java | 22 +-
.../iotdb/db/qp/physical/crud/MeasurementInfo.java | 37 +-
.../iotdb/db/qp/physical/crud/QueryIndexPlan.java | 12 +
.../iotdb/db/qp/physical/crud/QueryPlan.java | 71 +-
.../db/qp/physical/crud/RawDataQueryPlan.java | 3 +-
.../apache/iotdb/db/qp/physical/crud/UDAFPlan.java | 13 +
.../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 13 +
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 2 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 121 +-
.../dataset/groupby/GroupByEngineDataSet.java | 2 +-
.../query/dataset/groupby/GroupByFillDataSet.java | 328 +
.../dataset/groupby/GroupByFillEngineDataSet.java | 424 -
.../groupby/GroupByFillWithValueFilterDataSet.java | 451 -
.../GroupByFillWithoutValueFilterDataSet.java | 267 -
.../groupby/GroupByWithValueFilterDataSet.java | 4 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 4 +-
.../db/query/executor/AggregationExecutor.java | 6 +-
.../iotdb/db/query/executor/FillQueryExecutor.java | 4 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 4 +-
.../iotdb/db/query/executor/QueryRouter.java | 44 +-
.../db/query/executor/RawDataQueryExecutor.java | 6 +-
.../apache/iotdb/db/query/executor/fill/IFill.java | 22 +-
.../query/timegenerator/ServerTimeGenerator.java | 4 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 10 +-
.../db/service/basic/BasicServiceProvider.java | 4 +
.../db/service/thrift/impl/TSServiceImpl.java | 184 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +
.../org/apache/iotdb/db/utils/SchemaUtils.java | 11 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 39 +-
.../writelog/recover/TsFileRecoverPerformer.java | 8 +-
.../recover/SizeTieredCompactionRecoverTest.java | 4 +-
.../engine/modification/DeletionFileNodeTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 4 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 54 +-
.../db/metadata/idtable/IDTableRestartTest.java | 64 +-
.../db/metadata/idtable/InsertWithIDTableTest.java | 3 +
.../db/sync/receiver/load/FileLoaderTest.java | 12 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 4 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 3 +-
.../recover/RecoverResourceFromReaderTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 6 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 2 +-
.../session/IoTDBSessionVectorABDeviceIT.java | 27 +-
site/src/main/.vuepress/config.js | 3 +-
.../public/img/contributor-avatar/qhl.jpg | Bin 0 -> 365541 bytes
.../theme/global-components/Contributor.vue | 4 +-
177 files changed, 20427 insertions(+), 3868 deletions(-)
create mode 100644 .github/workflows/grafana-plugin.yml
delete mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByFillNoVFilterDataSet.java
delete mode 100644
cluster/src/main/java/org/apache/iotdb/cluster/query/groupby/ClusterGroupByFillVFilterDataSet.java
rename distribution/src/assembly/{grafana.xml => grafana-connector.xml} (86%)
copy distribution/src/assembly/{client-cpp.xml => grafana-plugin.xml} (77%)
rename docs/UserGuide/Ecosystem Integration/{Grafana.md => Grafana
Connector.md} (86%)
rename docs/zh/UserGuide/Ecosystem Integration/{Grafana.md => Grafana
Connector.md} (89%)
create mode 100644 docs/zh/UserGuide/Ecosystem Integration/Grafana Plugin.md
rename {grafana => grafana-connector}/img/add_data_source.png (100%)
rename {grafana => grafana-connector}/img/add_graph.png (100%)
rename {grafana => grafana-connector}/img/edit_data_source.png (100%)
rename {grafana => grafana-connector}/pom.xml (99%)
rename {grafana => grafana-connector}/readme.md (93%)
rename {grafana => grafana-connector}/readme_zh.md (91%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/TsfileWebDemoApplication.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/bean/TimeValues.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/conf/MyConfiguration.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/controller/DatabaseConnectController.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/service/DatabaseConnectService.java
(100%)
rename {grafana =>
grafana-connector}/src/main/java/org/apache/iotdb/web/grafana/service/impl/DatabaseConnectServiceImpl.java
(100%)
rename {grafana =>
grafana-connector}/src/main/resources/application.properties (100%)
rename {grafana =>
grafana-connector}/src/test/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImplTest.java
(100%)
create mode 100644 grafana-plugin/.gitignore
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/.prettierrc.js (66%)
copy docs/Community/Community-Project Committers.md =>
grafana-plugin/CHANGELOG.md (93%)
copy LICENSE => grafana-plugin/LICENSE (85%)
create mode 100644 grafana-plugin/README.md
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/jest.config.js (66%)
create mode 100644 grafana-plugin/package.json
copy {antlr => grafana-plugin}/pom.xml (51%)
create mode 100644 grafana-plugin/src/ConfigEditor.tsx
create mode 100644 grafana-plugin/src/QueryEditor.tsx
copy
server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/PingApiServiceImpl.java
=> grafana-plugin/src/componments/Form.tsx (54%)
create mode 100644 grafana-plugin/src/componments/FromValue.tsx
create mode 100644 grafana-plugin/src/componments/SelectValue.tsx
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/src/componments/WhereValue.tsx (60%)
create mode 100644 grafana-plugin/src/datasource.ts
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/src/functions.ts (66%)
create mode 100644 grafana-plugin/src/img/logo.svg
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/src/module.ts (66%)
create mode 100644 grafana-plugin/src/plugin.json
copy server/src/main/java/org/apache/iotdb/db/protocol/rest/filter/User.java
=> grafana-plugin/src/types.ts (57%)
create mode 100644 grafana-plugin/tsconfig.json
create mode 100644 grafana-plugin/yarn.lock
copy
integration/src/test/java/org/apache/iotdb/db/integration/aligned/{IoTDBRawQueryWithoutValueFilter2IT.java
=> IoTDBAlignByDevice2IT.java} (96%)
create mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBAlignByDeviceIT.java
create mode 100644
integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBGroupByFillQueryBigDataIT.java
copy
integration/src/test/java/org/apache/iotdb/db/integration/aligned/{IoTDBGroupByQueryWithValueFilterIT.java
=> IoTDBGroupByFillQueryIT.java} (78%)
rename
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/{StorageGroupProcessor.java
=> VirtualStorageGroupProcessor.java} (99%)
rename
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/virtualSg/{VirtualStorageGroupManager.java
=> StorageGroupManager.java} (69%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillDataSet.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillEngineDataSet.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillWithValueFilterDataSet.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/groupby/GroupByFillWithoutValueFilterDataSet.java
create mode 100644
site/src/main/.vuepress/public/img/contributor-avatar/qhl.jpg
