Merge commit '95f508bbb1d07650392c21da2958ba1c53f2a03d' from stabilization-f69489
Change-Id: Ib6a428564681938dceb6ad4a2ba91f15256dc8a2 Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/67524402 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/67524402 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/67524402 Branch: refs/heads/master Commit: 675244029cc9624795d54aeed5e2b6f7aafd2905 Parents: 8bf93fa 95f508b Author: Michael Blow <mb...@apache.org> Authored: Fri Aug 31 14:06:19 2018 -0400 Committer: Michael Blow <mb...@apache.org> Committed: Fri Aug 31 14:06:57 2018 -0400 ---------------------------------------------------------------------- .../rules/InjectTypeCastForSwitchCaseRule.java | 71 ++++++-- .../am/IntroduceSelectAccessMethodRule.java | 18 ++- .../asterix/app/nc/IndexCheckpointManager.java | 34 ++-- .../apache/asterix/app/nc/RecoveryManager.java | 4 +- .../test/dataflow/ComponentRollbackTest.java | 34 ++-- .../dataflow/TestLsmIoOpCallbackFactory.java | 10 +- ...TestPrimaryIndexOperationTrackerFactory.java | 5 +- .../PersistentLocalResourceRepositoryTest.java | 25 +-- .../btree-index/btree-secondary-68.sqlpp | 54 +++++++ .../results/btree-index/btree-secondary-68.plan | 32 ++++ .../binary/concat2/concat2.1.query.sqlpp | 25 +++ .../query-ASTERIXDB-2446.1.query.sqlpp | 24 +++ .../query-ASTERIXDB-2446.2.query.sqlpp | 26 +++ .../query-ASTERIXDB-2446.3.query.sqlpp | 26 +++ .../intersection-with-between.1.ddl.sqlpp | 43 +++++ .../intersection-with-between.2.update.sqlpp | 23 +++ .../intersection-with-between.3.ddl.sqlpp | 24 +++ .../intersection-with-between.4.query.sqlpp | 26 +++ .../ifmissing/ifmissing.1.query.sqlpp | 7 + .../ifmissingornull.1.query.sqlpp | 7 + .../null-missing/ifnull/ifnull.1.query.sqlpp | 7 + .../string-concat2/string-concat2.1.query.sqlpp | 25 +++ .../string-concat2/string-concat2.2.query.sqlpp | 25 +++ .../results/binary/concat2/concat2.1.adm | 1 + .../intersection-with-between.4.adm | 7 + .../push-limit-to-primary-scan-select.8.adm | 2 +- .../null-missing/ifmissing/ifmissing.1.adm | 2 +- .../ifmissingornull/ifmissingornull.1.adm | 2 +- .../results/null-missing/ifnull/ifnull.1.adm | 2 +- .../string/string-concat2/string-concat2.1.adm | 1 + .../string/string-concat2/string-concat2.2.adm | 1 + .../resources/runtimets/testsuite_sqlpp.xml | 23 +++ .../common/api/IDatasetLifecycleManager.java | 15 +- .../DatasetLSMComponentIdGeneratorFactory.java | 2 +- .../common/context/DatasetLifecycleManager.java | 39 +++-- .../ioopcallbacks/LSMIOOperationCallback.java | 12 +- .../common/storage/IIndexCheckpointManager.java | 28 ++-- .../asterix/common/storage/IndexCheckpoint.java | 14 +- .../common/storage/ResourceReference.java | 9 ++ .../main/resources/asx_errormsg/en.properties | 4 +- .../LSMIOOperationCallbackTest.java | 26 ++- .../visitor/OperatorExpressionVisitor.java | 16 +- .../dataflow/data/common/TypeResolverUtil.java | 2 +- .../asterix/om/functions/BuiltinFunctions.java | 5 +- .../impl/ClosedRecordConstructorResultType.java | 14 +- .../typecomputer/impl/ConcatTypeComputer.java | 64 ++++++++ .../impl/OpenRecordConstructorResultType.java | 5 + .../CheckpointPartitionIndexesTask.java | 12 +- .../messaging/ComponentMaskTask.java | 4 +- .../messaging/MarkComponentValidTask.java | 14 +- .../messaging/ReplicateFileTask.java | 2 +- .../functions/StringConcatDescriptor.java | 11 +- .../binary/BinaryConcatDescriptor.java | 27 ++-- .../job/resource/JobCapacityController.java | 13 ++ .../PrimaryIndexOperationTrackerFactory.java | 2 +- .../PersistentLocalResourceRepository.java | 51 ++---- .../org/apache/hyracks/api/io/IIOManager.java | 7 + .../comm/channels/NetworkOutputChannel.java | 12 +- .../control/cc/ClusterControllerService.java | 2 +- .../hyracks/control/cc/job/JobManager.java | 14 +- .../control/common/controllers/CCConfig.java | 13 +- .../control/nc/heartbeat/HeartbeatManager.java | 1 - .../apache/hyracks/control/nc/io/IOManager.java | 10 ++ .../protocols/muxdemux/ChannelControlBlock.java | 5 + .../net/protocols/muxdemux/ChannelSet.java | 4 + .../muxdemux/FullFrameChannelReadInterface.java | 18 +-- .../muxdemux/MultiplexedConnection.java | 5 + .../am/lsm/btree/impls/LSMBTreeFileManager.java | 77 ++++----- .../impls/LSMBTreeWithBuddyFileManager.java | 100 +++++------- .../common/api/ILSMComponentIdGenerator.java | 1 - .../impls/AbstractLSMIndexFileManager.java | 160 +++++-------------- .../impls/IndexComponentFileReference.java | 131 +++++++++++++++ .../am/lsm/common/impls/LSMComponentId.java | 4 +- .../common/impls/LSMComponentIdGenerator.java | 35 ++-- .../impls/LSMInvertedIndexFileManager.java | 97 +++++------ .../am/lsm/rtree/impls/LSMRTreeFileManager.java | 99 +++++------- .../component/TestLsmIndexFileManager.java | 17 +- .../main/java/org/apache/hyracks/util/Span.java | 4 + 78 files changed, 1217 insertions(+), 606 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67524402/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/67524402/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java ----------------------------------------------------------------------