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 fa1a19eaf7d2626421b691d27b3ef2d3cde0e514 Merge: 594780e b4f8ddd Author: Michael Blow <[email protected]> AuthorDate: Thu Jun 3 09:16:08 2021 -0400 Merge branch 'gerrit/cheshire-cat' Change-Id: Ie27e28a9849ed5cf750a592dd77115fa2f7fb212 .../api/http/server/NCQueryServiceServlet.java | 2 +- .../app/active/ActiveEntityEventsListener.java | 4 + .../apache/asterix/app/active/RecoveryTask.java | 4 +- .../asterix/app/translator/QueryTranslator.java | 9 ++- .../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 ++ .../PersistentLocalResourceRepository.java | 25 ++++--- .../core/algebra/metadata/IMetadataProvider.java | 2 + .../rewriter/rules/IntroJoinInsideSubplanRule.java | 3 + .../operators/meta/SubplanRuntimeFactory.java | 2 +- .../apache/hyracks/api/util/ExceptionUtils.java | 39 ++++++++++ .../dataflow/IndexDropOperatorNodePushable.java | 3 +- .../am/lsm/common/api/IFrameOperationCallback.java | 5 ++ 23 files changed, 98 insertions(+), 116 deletions(-)
