You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@asterixdb.apache.org by mb...@apache.org on 2021/06/03 21:57:45 UTC

[asterixdb] 07/08: Merge branch 'gerrit/stabilization-3b6982ce7f'

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

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit b4f8ddd942d5d3178ed51738bf7b30bd46f4d6f5
Merge: 276b65c 7332722
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jun 1 10:33:57 2021 -0400

    Merge branch 'gerrit/stabilization-3b6982ce7f'
    
    Change-Id: I2ea64b20d39dc9cb4e14f350424f0e4b2e038e2c

 .../api/http/server/NCQueryServiceServlet.java     |  2 +-
 .../app/active/ActiveEntityEventsListener.java     |  4 +
 .../apache/asterix/app/active/RecoveryTask.java    |  4 +-
 .../asterix/app/translator/QueryTranslator.java    |  3 +-
 .../org/apache/asterix/utils/RebalanceUtil.java    |  3 +-
 .../test/common/CancellationTestExecutor.java      |  2 +-
 .../common/RebalanceCancellationTestExecutor.java  |  2 +-
 .../SqlppExecutionWithCancellationTest.java        |  2 +-
 .../apache/asterix/test/txn/LogManagerTest.java    |  3 +-
 .../NoOpFrameOperationCallbackFactory.java         |  5 ++
 .../asterix/common/exceptions/ExceptionUtils.java  | 86 ----------------------
 .../external/input/stream/LocalFSInputStream.java  |  3 +-
 .../metadata/declared/MetadataProvider.java        |  1 +
 .../asterix/metadata/utils/MetadataConstants.java  |  2 +-
 .../LSMPrimaryInsertOperatorNodePushable.java      |  1 +
 .../LSMPrimaryUpsertOperatorNodePushable.java      |  6 ++
 .../core/algebra/metadata/IMetadataProvider.java   |  2 +
 .../rewriter/rules/IntroJoinInsideSubplanRule.java |  3 +
 .../operators/meta/SubplanRuntimeFactory.java      |  2 +-
 .../apache/hyracks/api/util/ExceptionUtils.java    | 39 ++++++++++
 .../am/lsm/common/api/IFrameOperationCallback.java |  5 ++
 21 files changed, 78 insertions(+), 102 deletions(-)