You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/06/01 03:07:38 UTC

[incubator-iotdb] branch dev_new_merge updated (1ca30f7 -> 955ef0c)

This is an automated email from the ASF dual-hosted git repository.

ejttianyu pushed a change to branch dev_new_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 1ca30f7  reformat merge code
     add 29adcf6  [IOTDB-615] fix infer type from session (#1282)
     add 1193fca  [IOTDB-692] Fix merge update bug (#1262)
     add 7557e5d  add infer type test in SessionIT
     add 1a66db6  [IOTDB-701]Add feature to set heap size by system total memory when starts (#1254)
     add 5ed15e1  [IOTDB-700]Feature/iotdb 700 add openid (#1255)
     add 0d364ad  change max avg point to 10k (#1285)
     add d676199  [IOTDB-707] Optimize TsFileResource memory usage (#1269)
     add 7221a87  fix recover endTime set bug (affect 0.10.0-SNAPSHOT) (#1286)
     add 8a15953  [IOTDB-713] success message on cli (#1284)
     add 18a3634  fix IoTDBConfigCheck
     add f0aecdb  fix config check
     add 8d5184f  add insert string records in SessinPool
     add 9be64af  fix design doc title
     add ae49a78  Set inferType of MQTT InsertPlan to true (#1291)
     add ab9e90b  remove echo in cli (#1287)
     add 60f2033  [IOTDB-728]Disable “site” module by default (#1292)
     add 9a4f92e  Added xin to committer list
     add 96b33b3  Delete some tests (#1294)
     add 955ef0c  merge master

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |  10 +-
 Jenkinsfile                                        |  42 +-
 .../java/org/apache/iotdb/cli/AbstractCli.java     |   3 +
 cli/src/main/java/org/apache/iotdb/cli/Cli.java    |  17 +-
 docs/UserGuide/Client/Command Line Interface.md    |  30 ++
 docs/UserGuide/Server/Config Manual.md             |  23 +-
 docs/zh/UserGuide/Client/Command Line Interface.md |  31 ++
 docs/zh/UserGuide/Server/Config Manual.md          |  22 +-
 .../main/java/org/apache/iotdb/SessionExample.java |  16 +
 pom.xml                                            |   8 +-
 server/pom.xml                                     |  25 ++
 .../resources/conf/iotdb-engine.properties         |  17 +-
 server/src/assembly/resources/conf/iotdb-env.sh    |   6 +
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   1 +
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   4 +-
 .../iotdb/db/auth/authorizer/BasicAuthorizer.java  |  54 ++-
 .../db/auth/authorizer/LocalFileAuthorizer.java    |  28 +-
 .../iotdb/db/auth/authorizer/OpenIdAuthorizer.java | 257 ++++++++++++
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  25 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   8 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   6 +
 .../org/apache/iotdb/db/engine/StorageEngine.java  |   6 +-
 .../seqMerge/inplace/task/MergeMultiChunkTask.java |   7 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  89 +++--
 .../db/engine/storagegroup/TsFileResource.java     | 213 +++++++---
 .../apache/iotdb/db/mqtt/BrokerAuthenticator.java  |   4 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |   5 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  17 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |  34 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java |   2 +-
 .../db/query/executor/fill/LastPointReader.java    |  12 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |   6 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  13 +-
 .../db/sync/receiver/load/FileLoaderManager.java   |   2 +-
 .../apache/iotdb/db/tools/IoTDBDataDirViewer.java  |  10 +-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |  10 +-
 .../apache/iotdb/db/utils/TypeInferenceUtils.java  |   8 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  38 +-
 .../iotdb/db/auth/LocalFileAuthorizerTest.java     |   8 +-
 .../db/auth/authorizer/OpenIdAuthorizerTest.java   |  66 ++++
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   9 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |   5 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 440 ---------------------
 .../iotdb/db/integration/IoTDBSensorUpdateIT.java  |  87 ++++
 .../db/sync/receiver/load/FileLoaderTest.java      |   8 +-
 .../recover/SyncReceiverLogAnalyzerTest.java       |   4 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   4 +-
 .../iotdb/db/utils/TypeInferenceUtilsTest.java     |  19 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |   8 +-
 .../recover/RecoverResourceFromReaderTest.java     |   8 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  16 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   8 +-
 service-rpc/src/main/thrift/rpc.thrift             |   2 +
 .../java/org/apache/iotdb/session/Session.java     |   2 +
 .../org/apache/iotdb/session/SessionDataSet.java   |  10 +-
 .../org/apache/iotdb/session/pool/SessionPool.java |  53 +++
 .../org/apache/iotdb/session/IoTDBSessionIT.java   | 112 +++++-
 site/src/main/.vuepress/config.js                  |   2 +-
 .../theme/global-components/Contributor.vue        |   7 +
 site/src/main/package.json                         |   2 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |   4 +-
 61 files changed, 1242 insertions(+), 751 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizer.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java
 create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBSensorUpdateIT.java