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 2023/02/22 09:38:51 UTC

[iotdb] branch DONTBlock updated (88f43f676c -> 69005de8c5)

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

xiangweiwei pushed a change to branch DONTBlock
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    omit 88f43f676c add stack trace
    omit c572983496 only keep one test
    omit def457c236 remove one test
    omit 547210d3da resolve conflicts
    omit 7ce55d71d0 add more thread name
    omit 6d839555ab add more thread name
    omit 281e20d05c add format
    omit fdb850a054 add timeout for UT
    omit 5ca08f7da9 add more log
    omit f7e2ceb6cb Fix typo
    omit 95fa9039a8 Add more log
    omit 0719a006c4 add more log
    omit df4d671e2d Merge branch 'DONTBlock' of https://github.com/apache/iotdb into DONTBlock
    omit a1efc37655 volatile noMoreTsBlocks
    omit f11a0f4752 add more log
    omit bce1d7e43c add more log
    omit 815aa43ced add more log
    omit fcf4ae9479 Change log to sout
    omit 4c29d2bb94 Add log
    omit 9cedb48c6c Merge branch 'DONTBlock' of https://github.com/apache/iotdb into DONTBlock
    omit 04fc0903f1 Merge remote-tracking branch 'origin/master' into DONTBlock
     add 7f519f1c4c Merge branch 'master' into DONTBlock
     add 69005de8c5 Fix ut

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (88f43f676c)
            \
             N -- N -- N   refs/heads/DONTBlock (69005de8c5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/main-unix.yml                    |   2 +-
 .github/workflows/main-win.yml                     |   2 +-
 .../iotdb/db/mpp/execution/operator/Operator.java  |  20 +-
 .../process/RawDataAggregationOperator.java        |  60 +-
 .../process/SingleInputAggregationOperator.java    |  18 +-
 .../process/join/RowBasedTimeJoinOperator.java     |  44 +-
 .../operator/source/SeriesScanOperator.java        |   8 +-
 .../operator/AggregationOperatorTest.java          |   2 +-
 .../operator/RawDataAggregationOperatorTest.java   | 684 ++++++++++++++++++++-
 9 files changed, 684 insertions(+), 156 deletions(-)