This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch flink-iotdb-table-connector in repository https://gitbox.apache.org/repos/asf/iotdb-extras.git
commit f453277c8a54a3e008a607bbeb96187a12ba80c7 Merge: 1728355 57aa0d9 Author: shuwenwei <[email protected]> AuthorDate: Sat Oct 10 12:24:39 2026 +0800 Merge branch 'master' into flink-iotdb-table-connector # Conflicts: # pom.xml .github/workflows/compile-check.yml | 61 ++- .github/workflows/grafana-plugin.yml | 6 +- .../develocity-workspace-id} | 0 .mvn/{gradle-enterprise.xml => develocity.xml} | 14 +- .mvn/extensions.xml | 6 +- Jenkinsfile | 2 +- README-zh.md | 31 +- README.md | 31 +- connectors/flink-iotdb-connector/pom.xml | 1 - .../iotdb/flink/tsfile/util/TSFileConfigUtil.java | 1 + .../util/TSFileConfigUtilCompletenessTest.java | 3 +- connectors/grafana-connector/pom.xml | 16 + connectors/grafana-plugin/README.md | 34 +- connectors/grafana-plugin/docker-compose.yaml | 2 +- connectors/grafana-plugin/go.mod | 8 +- connectors/hive-connector/pom.xml | 1 - .../java/org/apache/iotdb/hive/TsFileSerDe.java | 2 +- connectors/spark-iotdb-connector/pom.xml | 4 +- connectors/spark-iotdb-table-connector/pom.xml | 4 +- distributions/pom.xml | 70 ++++ .../src/assembly/mybatis-generator-plugin.xml | 8 + examples/iotdb-spring-boot-start/README.md | 105 +----- examples/iotdb-spring-boot-start/pom.xml | 8 +- .../service/IoTDBService.java | 39 +- .../src/main/resources/application.properties | 5 +- examples/kafka/readme.md | 6 +- examples/mybatis-generator/README.md | 126 +++---- examples/mybatis-generator/pom.xml | 70 +++- .../main/java/org/apache/iotdb/mybatis/Main.java | 43 ++- .../iotdb/mybatis/plugin/mapper/MixMapper.java | 21 +- .../org/apache/iotdb/mybatis/plugin/model/Mix.java | 14 +- .../apache/iotdb/mybatis/plugin/xml/MixMapper.xml | 71 ++-- .../src/main/resources/generatorConfig.xml | 13 +- .../main/resources/generatorConfigByExample.xml | 15 +- .../src/main/resources/mybatis-config.xml | 3 + .../org/apache/iotdb/mybatis/IoTDBGeneratorIT.java | 317 ++++++++++++++++ .../iotdb/mybatis/MapperConfigurationTest.java | 65 ++++ examples/mybatisplus-generator/README.md | 198 +++------- examples/mybatisplus-generator/pom.xml | 150 +++++--- .../main/java/org/apache/iotdb/CodeGenerator.java | 351 +++++++++++++++++ .../src/main/java/org/apache/iotdb/Main.java | 86 +---- .../iotdb/config/IoTDBMybatisConfiguration.java | 53 +++ .../main/java/org/apache/iotdb/entity/Table1.java | 83 ++-- .../main/java/org/apache/iotdb/entity/Table2.java | 83 ++-- .../org/apache/iotdb/mapper/IoTDBTableMapper.java | 40 ++ .../java/org/apache/iotdb/mapper/Table1Mapper.java | 37 +- .../java/org/apache/iotdb/mapper/Table2Mapper.java | 37 +- .../org/apache/iotdb/service/Table1Service.java | 48 +-- .../org/apache/iotdb/service/Table2Service.java | 48 +-- .../iotdb/service/impl/Table1ServiceImpl.java | 98 +++-- .../iotdb/service/impl/Table2ServiceImpl.java | 98 +++-- .../java/org/apache/iotdb/xml/Table1Mapper.xml | 23 -- .../java/org/apache/iotdb/xml/Table2Mapper.xml | 23 -- .../src/main/resources/application.yml | 3 + .../src/main/resources/mappers/Table1Mapper.xml | 88 +++++ .../src/main/resources/mappers/Table2Mapper.xml | 88 +++++ .../main/resources/templates/iotdb-entity.java.vm | 24 ++ .../main/resources/templates/iotdb-mapper.java.vm | 32 ++ .../main/resources/templates/iotdb-mapper.xml.vm | 41 ++ .../java/org/apache/iotdb/ApplicationTest.java | 164 ++++++-- .../java/org/apache/iotdb/CodeGeneratorTest.java | 123 ++++++ .../test/java/org/apache/iotdb/IoTDBMapperIT.java | 273 ++++++++++++++ examples/pom.xml | 4 +- examples/rabbitmq/readme.md | 5 +- examples/rocketmq/readme.md | 4 +- iotdb-collector/collector-core/pom.xml | 17 +- .../sink/event/PipeRawTabletInsertionEvent.java | 8 + .../builtin/source/iotdb/IoTDBPushSource.java | 96 ++++- .../apache/iotdb/collector/runtime/task/Task.java | 74 ++++ .../iotdb/collector/runtime/task/TaskCombiner.java | 26 +- .../runtime/task/processor/ProcessorTask.java | 40 +- .../collector/runtime/task/sink/SinkTask.java | 38 +- .../runtime/task/source/pull/PullSourceTask.java | 42 +-- .../runtime/task/source/push/PushSourceTask.java | 29 +- .../collector/runtime/task/TaskCombinerTest.java | 417 +++++++++++++++++++++ iotdb-spring-boot-starter/README.md | 169 +++++++-- iotdb-spring-boot-starter/pom.xml | 37 +- .../iotdb/config/IoTDBSessionProperties.java | 67 +++- .../org/apache/iotdb/session/IoTDBSessionPool.java | 133 +++---- .../additional-spring-configuration-metadata.json | 20 + .../apache/iotdb/session/IoTDBSessionPoolTest.java | 348 +++++++++++++++++ iotdb-thingsboard-table/CI-NOTES.md | 22 +- iotdb-thingsboard-table/README.md | 17 +- iotdb-thingsboard-table/docker-compose.bench.yml | 4 +- iotdb-thingsboard-table/docker-compose.test.yml | 2 +- iotdb-thingsboard-table/docs/benchmarks/README.md | 4 +- iotdb-thingsboard-table/docs/migration-guide.md | 19 +- iotdb-thingsboard-table/docs/user-guide.md | 4 +- iotdb-thingsboard-table/pom.xml | 14 +- .../thingsboard/table/IoTDBTableConfiguration.java | 2 +- .../thingsboard/table/IoTDBTableTimeseriesDao.java | 74 ++-- .../table/IoTDBTableAttributesDaoIT.java | 24 +- .../table/IoTDBTableIngestionBenchmarkIT.java | 26 +- .../thingsboard/table/IoTDBTableLatestDaoIT.java | 24 +- .../table/IoTDBTableTimeseriesAggregationIT.java | 28 +- .../table/IoTDBTableTimeseriesDaoIT.java | 28 +- .../table/IoTDBTableTimeseriesDaoTest.java | 6 +- .../extras/thingsboard/table/IoTDBTableTtlIT.java | 29 +- mybatis-generator/README-zh.md | 92 +++-- mybatis-generator/README.md | 114 ++++-- mybatis-generator/pom.xml | 11 + .../iotdb/mybatis/plugin/BatchInsertPlugin.java | 138 ++++--- .../iotdb/mybatis/plugin/IoTDBKeyPlugin.java | 112 ++++++ .../apache/iotdb/mybatis/plugin/LombokPlugin.java | 12 + .../src/main/resources/generatorConfig.xml | 7 +- .../mybatis/plugin/BatchInsertPluginTest.java | 274 ++++++++++++++ .../iotdb/mybatis/plugin/IoTDBKeyPluginTest.java | 184 +++++++++ mybatis-support/README.md | 102 +++++ mybatis-support/pom.xml | 40 ++ .../iotdb/mybatis/IoTDBQueryInterceptor.java | 84 +++++ .../iotdb/mybatis/type/IoTDBBlobTypeHandler.java | 57 +++ .../mybatis/type/IoTDBLocalDateTypeHandler.java | 62 +++ .../iotdb/mybatis/IoTDBQueryInterceptorTest.java | 86 +++++ .../iotdb/mybatis/type/IoTDBTypeHandlerTest.java | 156 ++++++++ pom.xml | 217 ++++++----- 115 files changed, 5752 insertions(+), 1415 deletions(-)
