This is an automated email from the ASF dual-hosted git repository. dlych pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 581cc3873ca1255138076afccf4415137b729a15 Merge: e6986dd ee1b3b0 Author: Dmitry Lychagin <[email protected]> AuthorDate: Thu Dec 3 10:19:41 2020 -0800 Merge commits '92c0a16', 'ee1b3b0' Change-Id: I702a66a68c84b70a31692771d097a80b3cb15748 .../operators/physical/IndexSearchPOperator.java | 9 +++ .../apache/asterix/api/common/APIFramework.java | 4 +- .../optimizerts/results/ASTERIXDB-2402.plan | 26 +++---- .../distinct_mixed/distinct_mixed.10.plan | 6 +- .../distinct_mixed/distinct_mixed.11.plan | 8 +- .../distinct_mixed/distinct_mixed.12.plan | 6 +- .../distinct_mixed/distinct_mixed.13.plan | 10 +-- .../distinct_mixed/distinct_mixed.14.plan | 12 +-- .../distinct_mixed/distinct_mixed.17.plan | 28 +++---- .../distinct_mixed/distinct_mixed.3.plan | 10 +-- .../distinct_mixed/distinct_mixed.4.plan | 10 +-- .../distinct_mixed/distinct_mixed.5.plan | 20 ++--- .../distinct_mixed/distinct_mixed.6.plan | 14 ++-- .../distinct_mixed/distinct_mixed.7.plan | 30 ++++---- .../distinct_mixed/distinct_mixed.8.plan | 42 +++++------ .../distinct_mixed/distinct_mixed.9.plan | 6 +- .../agg_filter_01/agg_filter_01.3.plan | 2 +- .../agg_filter_01/agg_filter_01.4.plan | 12 +-- .../agg_filter_01/agg_filter_01.5.plan | 4 +- .../agg_filter_01/agg_filter_01.6.plan | 2 +- .../agg_filter_01/agg_filter_01.7.plan | 8 +- .../agg_filter_01/agg_filter_01.8.plan | 8 +- .../results/aggregate/constant-agg.plan | 2 +- .../results/aggregate/constant-gby-agg.plan | 8 +- .../results/aggregate/count-dataset.plan | 2 +- .../results/aggregate/list-dataset.plan | 2 +- .../results/aggregate/query-ASTERIXDB-1626-2.plan | 2 +- .../results/aggregate/query-ASTERIXDB-1626-3.plan | 4 +- .../results/aggregate/query-ASTERIXDB-1626.plan | 2 +- .../optimizerts/results/aggregate/serial-agg.plan | 8 +- ...join-probe-pidx-with-join-btree-sidx_01_ps.plan | 36 ++++----- ...terjoin-probe-pidx-with-join-btree-sidx_02.plan | 16 ++-- ...join-probe-pidx-with-join-btree-sidx_02_ps.plan | 32 ++++---- ...be-pidx-with-join-btree-sidx_03-index-only.plan | 18 ++--- ...terjoin-probe-pidx-with-join-btree-sidx_03.plan | 16 ++-- .../btree-index-join/primary-between-join_01.plan | 4 +- .../btree-index-join/primary-equi-join_04.plan | 8 +- .../secondary-equi-join-multiindex.plan | 8 +- .../btree-index-join/secondary-equi-join_02.plan | 8 +- .../btree-index-join/secondary-equi-join_03.plan | 8 +- .../btree-index-join/secondary-equi-join_04.plan | 16 ++-- .../btree-index-join/secondary-equi-join_05.plan | 6 +- .../btree-index-join/secondary-equi-join_06.plan | 14 ++-- .../btree-index-composite-key-04.plan | 6 +- .../disjunctive-predicate-1.plan | 6 +- .../disjunctive-predicate-2.plan | 6 +- .../disjunctive-predicate-3.plan | 4 +- .../disjunctive-predicate-4.plan | 2 +- .../disjunctive-predicate-5.plan | 4 +- .../intersection-misc/intersection-misc-01.plan | 62 ++++++++-------- .../intersection-misc/intersection-misc-02.plan | 58 +++++++-------- .../intersection-misc/intersection-misc-03.plan | 58 +++++++-------- .../intersection-misc/intersection-misc-04.plan | 50 ++++++------- .../btree-index/btree-composite-key-03.plan | 8 +- .../results/btree-index/btree-secondary-33.plan | 6 +- .../results/btree-index/btree-secondary-34.plan | 6 +- .../results/btree-index/btree-secondary-35.plan | 6 +- .../results/btree-index/btree-secondary-36.plan | 6 +- .../results/btree-index/btree-secondary-40.plan | 6 +- .../results/btree-index/btree-secondary-42.plan | 6 +- .../results/btree-index/btree-secondary-43.plan | 6 +- .../results/btree-index/btree-secondary-44.plan | 6 +- .../results/btree-index/btree-secondary-45.plan | 6 +- .../results/btree-index/btree-secondary-46.plan | 6 +- .../results/btree-index/btree-secondary-47.plan | 6 +- .../results/btree-index/btree-secondary-48.plan | 6 +- .../results/btree-index/btree-secondary-49.plan | 6 +- .../results/btree-index/btree-secondary-51.plan | 6 +- .../results/btree-index/btree-secondary-52.plan | 6 +- .../results/btree-index/btree-secondary-53.plan | 6 +- .../results/btree-index/btree-secondary-54.plan | 6 +- .../results/btree-index/btree-secondary-55.plan | 6 +- .../results/btree-index/btree-secondary-56.plan | 6 +- .../results/btree-index/btree-secondary-57.plan | 6 +- .../results/btree-index/btree-secondary-58.plan | 6 +- .../results/btree-index/btree-secondary-59.plan | 6 +- .../results/btree-index/btree-secondary-60.plan | 6 +- .../results/btree-index/btree-secondary-61.plan | 6 +- .../results/btree-index/btree-secondary-62.plan | 6 +- .../results/btree-index/btree-secondary-63.plan | 6 +- .../results/btree-index/btree-secondary-68.plan | 14 ++-- .../results/btree-index/btree-secondary-68_ps.plan | 24 +++--- .../btree-sidx-idxonly-01-disable-idxonly.plan | 8 +- .../btree-sidx-idxonly-01-disable-idxonly_ps.plan | 16 ++-- .../results/btree-index/btree-sidx-idxonly-01.plan | 10 +-- .../btree-index/btree-sidx-idxonly-01_ps.plan | 16 ++-- .../results/btree-index/btree-sidx-idxonly-10.plan | 6 +- .../resources/optimizerts/results/collocated.plan | 6 +- .../optimizerts/results/common-expr-01.plan | 6 +- .../composite-key/composite-prefix-low-high.plan | 6 +- .../optimizerts/results/cust_group_no_agg.plan | 6 +- .../optimizerts/results/denorm-cust-order.plan | 12 +-- .../results/disjunction-to-join-delete-3.plan | 4 +- ...nverted-btree-search-return-optional-field.plan | 12 +-- .../optimizerts/results/filter_on_meta_0.plan | 2 +- .../optimizerts/results/filter_on_meta_1.plan | 2 +- .../optimizerts/results/filter_on_meta_2.plan | 2 +- .../optimizerts/results/filter_on_meta_3.plan | 2 +- .../optimizerts/results/filter_on_meta_4.plan | 2 +- .../optimizerts/results/filter_on_meta_5.plan | 2 +- .../results/filter_on_meta_with_idx_0.plan | 4 +- .../results/filter_on_meta_with_idx_1.plan | 4 +- .../results/filter_on_meta_with_idx_2.plan | 10 +-- .../results/filter_on_meta_with_idx_3.plan | 10 +-- .../resources/optimizerts/results/flwr/at07.plan | 10 +-- .../results/gby_partitioning_property_01.plan | 14 ++-- .../results/group-by/gby-case-01.3.plan | 10 +-- .../results/group-by/gby-case-01.4.plan | 10 +-- .../results/group-by/grouping-sets-1.1.plan | 8 +- .../results/group-by/grouping-sets-1.2.plan | 24 +++--- .../results/group-by/sugar-06-distinct.plan | 14 ++-- .../results/hints/broadcast_hint_1.plan | 6 +- .../results/hints/broadcast_hint_2.plan | 6 +- .../results/hints/broadcast_hint_3.plan | 6 +- .../results/insert-and-scan-dataset.plan | 4 +- .../results/introhashpartitionmerge.plan | 14 ++-- .../inverted-index-basic/ngram-contains-panic.plan | 4 +- .../ngram-contains-panic_ps.plan | 8 +- .../inverted-index-basic/ngram-contains.plan | 8 +- .../inverted-index-basic/ngram-contains_ps.plan | 16 ++-- .../ngram-edit-distance-check.plan | 6 +- .../inverted-index-basic/ngram-edit-distance.plan | 6 +- .../ngram-fuzzyeq-edit-distance.plan | 6 +- .../ngram-fuzzyeq-jaccard.plan | 6 +- .../inverted-index-basic/ngram-jaccard-check.plan | 6 +- .../inverted-index-basic/ngram-jaccard.plan | 6 +- .../olist-edit-distance-check-panic.plan | 4 +- .../olist-edit-distance-check-panic_ps.plan | 8 +- .../olist-edit-distance-check.plan | 8 +- .../olist-edit-distance-check_ps.plan | 16 ++-- .../olist-edit-distance-panic.plan | 4 +- .../olist-edit-distance-panic_ps.plan | 8 +- .../inverted-index-basic/olist-edit-distance.plan | 8 +- .../olist-edit-distance_ps.plan | 16 ++-- .../olist-fuzzyeq-edit-distance.plan | 8 +- .../olist-fuzzyeq-edit-distance_ps.plan | 16 ++-- .../olist-fuzzyeq-jaccard.plan | 6 +- .../inverted-index-basic/olist-jaccard-check.plan | 6 +- .../inverted-index-basic/olist-jaccard.plan | 6 +- .../ulist-fuzzyeq-jaccard.plan | 6 +- .../inverted-index-basic/ulist-jaccard-check.plan | 6 +- .../inverted-index-basic/ulist-jaccard.plan | 6 +- .../inverted-index-basic/word-contains.plan | 4 +- .../inverted-index-basic/word-contains_ps.plan | 8 +- .../inverted-index-basic/word-fuzzyeq-jaccard.plan | 6 +- .../inverted-index-basic/word-jaccard-check.plan | 6 +- .../results/inverted-index-basic/word-jaccard.plan | 6 +- ...m-edit-distance-check-let-panic-nopanic_01.plan | 6 +- ...m-edit-distance-check-let-panic-nopanic_02.plan | 6 +- .../ngram-edit-distance-check-let.plan | 6 +- .../ngram-edit-distance-check-substring.plan | 6 +- .../ngram-jaccard-check-let.plan | 6 +- .../ngram-jaccard-check-multi-let.plan | 6 +- .../olist-edit-distance-check-let-panic.plan | 4 +- .../olist-edit-distance-check-let-panic_ps.plan | 8 +- .../olist-edit-distance-check-let.plan | 8 +- .../olist-edit-distance-check-let_ps.plan | 16 ++-- .../olist-jaccard-check-let.plan | 6 +- .../ulist-jaccard-check-let.plan | 6 +- .../word-jaccard-check-let.plan | 6 +- .../word-jaccard-check-multi-let.plan | 6 +- .../ngram-edit-distance-inline.plan | 12 +-- .../ngram-fuzzyeq-edit-distance.plan | 12 +-- .../ngram-jaccard-inline.plan | 14 ++-- .../olist-edit-distance-inline.plan | 12 +-- .../olist-jaccard-inline.plan | 8 +- .../ulist-jaccard-inline.plan | 8 +- .../word-jaccard-inline.plan | 14 ++-- .../results/inverted-index-join/issue741.plan | 20 ++--- ...-pidx-with-join-edit-distance-check-idx_01.plan | 26 +++---- ...dx-with-join-edit-distance-check-idx_01_ps.plan | 52 ++++++------- ...-probe-pidx-with-join-jaccard-check-idx_01.plan | 22 +++--- ...obe-pidx-with-join-jaccard-check-idx_01_ps.plan | 44 +++++------ .../inverted-index-join/ngram-contains_ps.plan | 20 ++--- .../ngram-edit-distance-check_02.plan | 18 ++--- .../ngram-edit-distance-check_03.plan | 18 ++--- .../ngram-edit-distance-check_04.plan | 18 ++--- .../ngram-edit-distance_02.plan | 18 ++--- .../ngram-edit-distance_03.plan | 18 ++--- .../ngram-edit-distance_04.plan | 18 ++--- .../ngram-fuzzyeq-edit-distance_01.plan | 18 ++--- .../ngram-fuzzyeq-edit-distance_03.plan | 18 ++--- .../ngram-fuzzyeq-jaccard_02.plan | 14 ++-- .../ngram-fuzzyeq-jaccard_03.plan | 14 ++-- .../ngram-jaccard-check_02.plan | 14 ++-- .../ngram-jaccard-check_03.plan | 14 ++-- .../ngram-jaccard-check_04.plan | 14 ++-- .../inverted-index-join/ngram-jaccard_02.plan | 14 ++-- .../inverted-index-join/ngram-jaccard_03.plan | 14 ++-- .../inverted-index-join/ngram-jaccard_04.plan | 14 ++-- .../olist-edit-distance-check_02.plan | 18 ++--- .../olist-edit-distance-check_03.plan | 18 ++--- .../olist-edit-distance-check_04.plan | 18 ++--- .../olist-edit-distance_02.plan | 18 ++--- .../olist-edit-distance_03.plan | 18 ++--- .../olist-edit-distance_04.plan | 18 ++--- .../olist-fuzzyeq-edit-distance_02.plan | 18 ++--- .../olist-fuzzyeq-edit-distance_03.plan | 18 ++--- .../olist-fuzzyeq-jaccard_02.plan | 14 ++-- .../olist-fuzzyeq-jaccard_03.plan | 14 ++-- .../olist-jaccard-check_02.plan | 14 ++-- .../olist-jaccard-check_03.plan | 14 ++-- .../olist-jaccard-check_04.plan | 14 ++-- .../inverted-index-join/olist-jaccard_02.plan | 14 ++-- .../inverted-index-join/olist-jaccard_03.plan | 14 ++-- .../inverted-index-join/olist-jaccard_04.plan | 14 ++-- .../ulist-fuzzyeq-jaccard_02.plan | 14 ++-- .../ulist-fuzzyeq-jaccard_03.plan | 14 ++-- .../ulist-jaccard-check_02.plan | 14 ++-- .../ulist-jaccard-check_03.plan | 14 ++-- .../ulist-jaccard-check_04.plan | 14 ++-- .../inverted-index-join/ulist-jaccard_02.plan | 14 ++-- .../inverted-index-join/ulist-jaccard_03.plan | 14 ++-- .../inverted-index-join/ulist-jaccard_04.plan | 14 ++-- .../word-fuzzyeq-jaccard_02.plan | 14 ++-- .../word-fuzzyeq-jaccard_03.plan | 14 ++-- .../word-jaccard-check-after-btree-access.plan | 14 ++-- .../inverted-index-join/word-jaccard-check_02.plan | 14 ++-- .../inverted-index-join/word-jaccard-check_03.plan | 14 ++-- .../inverted-index-join/word-jaccard-check_04.plan | 14 ++-- .../inverted-index-join/word-jaccard_02.plan | 14 ++-- .../inverted-index-join/word-jaccard_03.plan | 14 ++-- .../inverted-index-join/word-jaccard_04.plan | 14 ++-- .../results/join-singletonbranch-2.plan | 4 +- .../results/join-singletonbranch-3.plan | 4 +- .../optimizerts/results/join-singletonbranch.plan | 4 +- .../optimizerts/results/join-super-key_01.plan | 8 +- .../optimizerts/results/join-super-key_02.plan | 8 +- .../results/joins/nested_query_with_bcast.plan | 12 +-- .../resources/optimizerts/results/loj-core.plan | 14 ++-- .../resources/optimizerts/results/loj-core_ps.plan | 24 +++--- .../resources/optimizerts/results/loj-sugar.plan | 14 ++-- .../optimizerts/results/loj-sugar_ps.plan | 24 +++--- .../optimizerts/results/loj-super-key_01.plan | 14 ++-- .../optimizerts/results/loj-super-key_02.plan | 12 +-- .../meta/field_access_with_data_and_meta_1.plan | 4 +- .../meta/field_access_with_data_and_meta_2.plan | 4 +- .../meta/field_access_with_data_and_meta_3.plan | 4 +- .../meta/field_access_with_data_and_meta_4.plan | 4 +- .../meta/indexes_on_dataset_with_meta_01.plan | 4 +- .../meta/indexes_on_dataset_with_meta_02.plan | 4 +- .../meta/indexes_on_dataset_with_meta_03.plan | 4 +- .../meta/indexes_on_dataset_with_meta_04.plan | 4 +- .../meta/indexes_on_dataset_with_meta_05.plan | 14 ++-- .../meta/indexes_on_dataset_with_meta_06.plan | 10 +-- .../meta/indexes_on_dataset_with_meta_07.plan | 12 +-- .../meta/indexes_on_dataset_with_meta_08.plan | 8 +- .../meta/indexes_on_dataset_with_meta_09.plan | 4 +- .../meta/indexes_on_dataset_with_meta_10.plan | 14 ++-- .../meta/indexes_on_dataset_with_meta_11.plan | 10 +-- .../optimizerts/results/meta/with_clause_meta.plan | 10 +-- .../multipart-dataverse/index/index-01.plan | 6 +- .../multipart-dataverse/index/index-02.plan | 6 +- .../btree-index-join/ASTERIXDB-2199.plan | 8 +- ...join-probe-pidx-with-join-btree-sidx_01_ps.plan | 32 ++++---- ...join-probe-pidx-with-join-btree-sidx_02_ps.plan | 32 ++++---- .../ngram-contains-panic_ps.plan | 8 +- .../inverted-index-basic/ngram-contains_ps.plan | 16 ++-- .../olist-edit-distance-check-panic_ps.plan | 8 +- .../olist-edit-distance-check_ps.plan | 16 ++-- .../olist-edit-distance-panic_ps.plan | 8 +- .../olist-edit-distance_ps.plan | 16 ++-- .../olist-fuzzyeq-edit-distance_ps.plan | 16 ++-- .../inverted-index-basic/word-contains_ps.plan | 8 +- .../olist-edit-distance-check-let-panic_ps.plan | 8 +- .../olist-edit-distance-check-let_ps.plan | 16 ++-- ...dx-with-join-edit-distance-check-idx_01_ps.plan | 52 ++++++------- ...obe-pidx-with-join-jaccard-check-idx_01_ps.plan | 44 +++++------ ...join-probe-pidx-with-join-rtree-sidx_01_ps.plan | 32 ++++---- ...join-probe-pidx-with-join-rtree-sidx_02_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_01_1_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_01_2_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_02_1_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_02_2_ps.plan | 32 ++++---- .../non-enforced-composite-key-equi-join/01.plan | 10 +-- .../non-enforced-composite-key-equi-join/02.plan | 10 +-- .../non-enforced-composite-key-equi-join/03.plan | 16 ++-- .../non-enforced-composite-key-equi-join/04.plan | 16 ++-- .../non-enforced-composite-key-equi-join/05.plan | 16 ++-- .../non-enforced-composite-key-equi-join/06.plan | 14 ++-- .../non-enforced-composite-key-equi-join/07.plan | 14 ++-- .../btree-index/non-enforced-composite-key/01.plan | 2 +- .../btree-index/non-enforced-composite-key/02.plan | 2 +- .../btree-index/non-enforced-composite-key/03.plan | 6 +- .../btree-index/non-enforced-composite-key/04.plan | 6 +- .../btree-index/non-enforced-composite-key/05.plan | 6 +- .../btree-index/non-enforced-composite-key/06.plan | 6 +- .../btree-index/non-enforced-composite-key/07.plan | 6 +- .../btree-index/non-enforced-composite-key/08.plan | 6 +- .../btree-index/non-enforced-composite-key/09.plan | 6 +- .../btree-index/non-enforced-composite-key/10.plan | 6 +- .../btree-index/non-enforced-composite-key/11.plan | 6 +- .../btree-index/non-enforced-composite-key/12.plan | 6 +- .../ngram-contains-panic_ps.plan | 8 +- .../inverted-index-basic/ngram-contains_ps.plan | 16 ++-- .../inverted-index-basic/word-contains_ps.plan | 8 +- ...dx-with-join-edit-distance-check-idx_01_ps.plan | 52 ++++++------- .../inverted-index-join/ngram-contains_01_ps.plan | 12 +-- .../inverted-index-join/ngram-contains_02_ps.plan | 12 +-- .../inverted-index-join/ngram-contains_03_ps.plan | 20 ++--- .../inverted-index-join/ngram-contains_04_ps.plan | 20 ++--- ...join-probe-pidx-with-join-rtree-sidx_01_ps.plan | 32 ++++---- ...join-probe-pidx-with-join-rtree-sidx_02_ps.plan | 32 ++++---- .../resources/optimizerts/results/nested_loj2.plan | 24 +++--- ...in-probe-pidx-with-join-btree-sidx_01_1_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_01_2_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_02_1_ps.plan | 32 ++++---- ...in-probe-pidx-with-join-btree-sidx_02_2_ps.plan | 32 ++++---- .../ngram-contains-panic_ps.plan | 8 +- .../inverted-index-basic/ngram-contains_ps.plan | 16 ++-- .../inverted-index-basic/word-contains_ps.plan | 8 +- ...dx-with-join-edit-distance-check-idx_01_ps.plan | 52 ++++++------- .../inverted-index-join/ngram-contains_01_ps.plan | 12 +-- .../inverted-index-join/ngram-contains_02_ps.plan | 20 ++--- .../inverted-index-join/ngram-contains_03_ps.plan | 20 ++--- .../inverted-index-join/ngram-contains_04_ps.plan | 20 ++--- ...join-probe-pidx-with-join-rtree-sidx_01_ps.plan | 32 ++++---- ...join-probe-pidx-with-join-rtree-sidx_02_ps.plan | 32 ++++---- .../btree-composite-key-non-enforced-03.plan | 2 +- .../btree-composite-key-non-enforced-04.plan | 8 +- .../btree-equi-join-non-enforced-05.plan | 14 ++-- .../btree-equi-join-non-enforced-05_ps.plan | 24 +++--- .../btree-equi-join-non-enforced-06.plan | 14 ++-- .../btree-equi-join-non-enforced-06_ps.plan | 24 +++--- .../btree-equi-join-non-enforced-07.plan | 14 ++-- .../btree-equi-join-non-enforced-07_ps.plan | 24 +++--- .../btree-equi-join-non-enforced-08.plan | 12 +-- .../btree-equi-join-non-enforced-08_ps.plan | 20 ++--- .../btree-equi-join-non-enforced-09.plan | 12 +-- .../btree-equi-join-non-enforced-09_ps.plan | 20 ++--- .../btree-index-non-enforced-04.plan | 10 +-- .../btree-index-non-enforced-04_ps.plan | 16 ++-- .../btree-index-non-enforced-05.plan | 10 +-- .../btree-index-non-enforced-05_ps.plan | 16 ++-- .../btree-index-non-enforced-06.plan | 10 +-- .../btree-index-non-enforced-06_ps.plan | 16 ++-- .../btree-index-non-enforced-07.plan | 10 +-- .../btree-index-non-enforced-07_ps.plan | 16 ++-- .../btree-index-non-enforced-08.plan | 10 +-- .../btree-index-non-enforced-08_ps.plan | 16 ++-- .../btree-index-non-enforced-09.plan | 10 +-- .../btree-index-non-enforced-09_ps.plan | 16 ++-- .../btree-index-non-enforced-10.plan | 10 +-- .../btree-index-non-enforced-105.plan | 14 ++-- .../btree-index-non-enforced-105_ps.plan | 24 +++--- .../btree-index-non-enforced-10_ps.plan | 16 ++-- .../btree-index-non-enforced-11.plan | 10 +-- .../btree-index-non-enforced-11_ps.plan | 16 ++-- .../results/orderby-desc-using-gby_ps.plan | 12 +-- .../orders-index-search-conjunctive-open_01.plan | 6 +- ...orders-index-search-conjunctive-open_01_ps.plan | 10 +-- .../orders-index-search-conjunctive-open_02.plan | 6 +- ...orders-index-search-conjunctive-open_02_ps.plan | 10 +-- .../orders-index-search-conjunctive_01.plan | 6 +- .../orders-index-search-conjunctive_01_ps.plan | 10 +-- .../orders-index-search-conjunctive_02.plan | 6 +- .../orders-index-search-conjunctive_02_ps.plan | 10 +-- .../results/p_sort_join/p_sort_join.plan | 40 +++++----- .../results/p_sort_seq_merge/p_sort_seq_merge.plan | 8 +- .../parallel_sort_enabled_disabled.1.plan | 8 +- .../parallel_sort_enabled_disabled.2.plan | 6 +- .../delete-primary-key-index-with-secondary.plan | 2 +- ...-and-scan-primary-key-index-with-secondary.plan | 4 +- .../load-primary-key-index-with-secondary.plan | 6 +- .../primary-key-index/load-primary-key-index.plan | 2 +- .../results/pull_select_above_eq_join.plan | 10 +-- .../results/push-project-through-group.plan | 16 ++-- .../results/q01_pricing_summary_report_nt_ps.plan | 6 +- .../optimizerts/results/q08_group_by.plan | 44 +++++------ .../optimizerts/results/q09_group_by.plan | 28 +++---- .../optimizerts/results/query-ASTERIXDB-159-3.plan | 14 ++-- .../optimizerts/results/query-ASTERIXDB-1671.plan | 6 +- .../optimizerts/results/query-ASTERIXDB-1806.plan | 8 +- .../results/query-ASTERIXDB-1806_ps.plan | 16 ++-- .../optimizerts/results/query-ASTERIXDB-2354.plan | 6 +- .../results/query-ASTERIXDB-2354_ps.plan | 12 +-- .../optimizerts/results/query-ASTERIXDB-2408.plan | 14 ++-- .../results/query-ASTERIXDB-2408_ps.plan | 24 +++--- .../optimizerts/results/query-ASTERIXDB-2700.plan | 18 ++--- .../optimizerts/results/query-ASTERIXDB-810-2.plan | 12 +-- .../results/query-ASTERIXDB-810-2_ps.plan | 24 +++--- .../optimizerts/results/query-ASTERIXDB-810-3.plan | 12 +-- .../results/query-ASTERIXDB-810-3_ps.plan | 24 +++--- .../optimizerts/results/query-ASTERIXDB-810.plan | 12 +-- .../results/query-ASTERIXDB-810_ps.plan | 24 +++--- .../optimizerts/results/query-issue562_ps.plan | 44 +++++------ .../optimizerts/results/query-issue601.plan | 8 +- .../optimizerts/results/query_issue849-2.plan | 2 +- .../optimizerts/results/query_issue849.plan | 2 +- .../results/rightouterjoin/roj-01-core.1.plan | 6 +- .../results/rightouterjoin/roj-01-core.2.plan | 10 +-- .../rtree-sidx-idxonly-01.plan | 8 +- .../rtree-sidx-idxonly-02.plan | 8 +- .../rtree-sidx-idxonly-03.plan | 8 +- .../rtree-sidx-idxonly-04.plan | 8 +- .../rtree-sidx-idxonly-05.plan | 8 +- .../rtree-sidx-idxonly-06.plan | 8 +- .../rtree-sidx-idxonly-07.plan | 8 +- .../rtree-index-geometry/skip-rtree-sidx-01.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-02.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-03.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-04.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-05.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-06.plan | 4 +- .../rtree-index-geometry/skip-rtree-sidx-07.plan | 4 +- ...join-probe-pidx-with-join-rtree-sidx_01_ps.plan | 36 ++++----- ...terjoin-probe-pidx-with-join-rtree-sidx_02.plan | 16 ++-- ...join-probe-pidx-with-join-rtree-sidx_02_ps.plan | 32 ++++---- .../spatial-intersect-point_02.plan | 8 +- .../spatial-intersect-point_03.plan | 8 +- .../rtree-sidx-idxonly-01-disable-idxonly.plan | 6 +- .../results/rtree-index/rtree-sidx-idxonly-01.plan | 6 +- .../results/skip-index/skip-ngram-index_ps.plan | 8 +- .../skip-index/skip-secondary-btree-index-2.plan | 6 +- .../skip-index/skip-secondary-btree-index-3.plan | 6 +- .../optimizerts/results/split-materialization.plan | 8 +- .../results/split-materialization_ps.plan | 12 +-- .../statement-params/statement-params-01.plan | 6 +- .../statement-params/statement-params-02.plan | 6 +- .../statement-params/statement-params-03.plan | 6 +- .../statement-params-index-01.plan | 10 +-- .../statement-params-index-02.plan | 14 ++-- .../optimizerts/results/subquery/exists.plan | 26 +++---- .../optimizerts/results/subquery/exists_ps.plan | 52 ++++++------- .../resources/optimizerts/results/subquery/in.plan | 14 ++-- .../optimizerts/results/subquery/in_as_or_1.plan | 8 +- .../results/subquery/in_as_or_1_ps.plan | 12 +-- .../optimizerts/results/subquery/in_as_or_2.plan | 14 ++-- .../results/subquery/in_as_or_2_ps.plan | 28 +++---- .../optimizerts/results/subquery/in_as_or_3.plan | 8 +- .../results/subquery/in_as_or_3_ps.plan | 12 +-- .../optimizerts/results/subquery/in_as_or_4.plan | 14 ++-- .../results/subquery/in_as_or_4_ps.plan | 28 +++---- .../optimizerts/results/subquery/in_as_or_5.plan | 8 +- .../results/subquery/in_as_or_5_ps.plan | 12 +-- .../optimizerts/results/subquery/in_as_or_6.plan | 14 ++-- .../results/subquery/in_as_or_6_ps.plan | 28 +++---- .../results/subquery/in_correlated.plan | 14 ++-- .../results/subquery/in_correlated_ps.plan | 24 +++--- .../optimizerts/results/subquery/in_ps.plan | 24 +++--- .../optimizerts/results/subquery/not_exists.plan | 26 +++---- .../results/subquery/not_exists_ps.plan | 52 ++++++------- .../results/subquery/query-ASTERIXDB-1572-2.plan | 2 +- .../results/subquery/query-ASTERIXDB-1572.plan | 4 +- .../interval_after/interval_after.3.query.plan | 16 ++-- .../interval_before/interval_before.3.query.plan | 14 ++-- .../interval_covered_by.3.query.plan | 14 ++-- .../interval_covers/interval_covers.3.query.plan | 14 ++-- .../interval_ended_by.3.query.plan | 10 +-- .../interval_ends/interval_ends.3.query.plan | 10 +-- .../interval_meets/interval_meets.3.query.plan | 10 +-- .../interval_met_by/interval_met_by.3.query.plan | 10 +-- .../interval_overlapped_by.3.query.plan | 14 ++-- .../interval_overlapping.3.query.plan | 14 ++-- .../interval_overlaps.3.query.plan | 14 ++-- .../interval_started_by.3.query.plan | 10 +-- .../interval_starts/interval_starts.3.query.plan | 10 +-- .../results/tpcds/query-ASTERIXDB-1580.plan | 38 +++++----- .../tpcds/query-ASTERIXDB-1581-correlated.plan | 86 +++++++++++----------- .../results/tpcds/query-ASTERIXDB-1581.plan | 16 ++-- .../results/tpcds/query-ASTERIXDB-1591.plan | 76 +++++++++---------- .../results/tpcds/query-ASTERIXDB-1596.plan | 16 ++-- .../results/tpcds/query-ASTERIXDB-1596_ps.plan | 28 +++---- .../optimizerts/results/tpch/q12_shipping.plan | 16 ++-- .../results/tpch/q12_shipping_broadcast.plan | 14 ++-- .../results/tpch/q12_shipping_broadcast_ps.plan | 28 +++---- .../optimizerts/results/tpch/q12_shipping_ps.plan | 32 ++++---- .../optimizerts/results/union/union_opt_1_1.plan | 8 +- .../optimizerts/results/union/union_opt_1_2.plan | 8 +- .../optimizerts/results/union/union_opt_1_3.plan | 8 +- .../optimizerts/results/union/union_opt_1_4.plan | 8 +- .../results/window/win_misc/win_misc_01.plan | 2 +- .../results/window/win_misc/win_misc_02.plan | 10 +-- .../core/algebra/base/IPhysicalOperator.java | 8 ++ .../physical/AbstractPhysicalOperator.java | 5 ++ .../physical/DataSourceScanPOperator.java | 9 +++ .../AbstractLogicalOperatorPrettyPrintVisitor.java | 16 ++-- .../LogicalOperatorPrettyPrintVisitor.java | 2 +- .../LogicalOperatorPrettyPrintVisitorJson.java | 2 +- .../algebra/prettyprint/PlanPrettyPrinter.java | 6 +- .../dataflow/std/join/InMemoryHashJoin.java | 7 +- 481 files changed, 3199 insertions(+), 3165 deletions(-)
