Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IOTDB-2880] Fix import check style #5629

Merged
merged 2 commits into from
Apr 21, 2022
Merged

[IOTDB-2880] Fix import check style #5629

merged 2 commits into from
Apr 21, 2022

Conversation

cmlmakahts
Copy link
Contributor

Fix import check style

Copy link
Member

@wangchao316 wangchao316 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JackieTien97 JackieTien97 merged commit b2520b3 into apache:master Apr 21, 2022
xinzhongtianxia pushed a commit to xinzhongtianxia/iotdb that referenced this pull request Apr 24, 2022
* remotes/upstream/master:
  Serialize measurement schema of insert node to wal entry (apache#5638)
  filter non schemaRegionDir (apache#5640)
  [IOTDB-2976] Add English and Chinese docs for count devices and count storage groups (apache#5635)
  change jenkins timeout from 2 hours to 3 hours
  [IOTDB-2740] Equal size bucket sampling UDFs: EQUAL_SIZE_BUCKET_RANDOM_SAMPLE, EQUAL_SIZE_BUCKET_AGG_SAMPLE, EQUAL_SIZE_BUCKET_M4_SAMPLE (apache#5518)
  Fix the issue that EndTime in FragmentInstanceContext is not set (apache#5636)
  fix concurrent bug of CachedMNodeContainer.putIfAbsent (apache#5632)
  [IOTDB-2880] Fix NPE occured in ci test (apache#5634)
  Fix CI (apache#5639)
  Add ColumnMerger to merge multipul input columns of same sensor into one column (apache#5630)
  Add block cancel when GetBlockTask throws exception (apache#5628)
  fix the bug when matching multi-wildcard in pattern tree (apache#5631)
  [IOTDB-2835]Fix empty page in selfcheck method of TsFileSequenceReader (apache#5552)
  Add FragmentInstanceStateMachine for FragmentInstance State change (apache#5615)
  [IOTDB-2880] Fix import check style (apache#5629)
  [IOTDB-2971] Fix sink handle memory leak (apache#5626)
  [rocksdb] updated the interface support (apache#5625)
  [IOTDB-2970] Code style: Avoid wildcard imports (apache#5622)
  [IOTDB-2880]Add procedure framework (apache#5477)
  [rocksdb] add rocksdb properties (apache#5588)

# Conflicts:
#	server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LocalExecutionPlanner.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants