asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wangs...@apache.org
Subject [12/12] asterixdb git commit: [NO ISSUE][COMP][RT] Rename index-only test case files
Date Sat, 10 Mar 2018 17:27:26 GMT
[NO ISSUE][COMP][RT] Rename index-only test case files

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Rename index-only test case files to a shorter version
  not to cause issues on Windows environment.

Change-Id: I4a4bb7b045a430bd446aed756f58af7b4c2a6eaa
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2468
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <tillw@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/06cec01b
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/06cec01b
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/06cec01b

Branch: refs/heads/master
Commit: 06cec01bb29b39e055a6bf5cc9434623cf6dbb8b
Parents: af9ee51
Author: Taewoo Kim <wangsaeu@yahoo.com>
Authored: Fri Mar 9 17:29:49 2018 -0800
Committer: Taewoo Kim <wangsaeu@gmail.com>
Committed: Sat Mar 10 09:26:20 2018 -0800

----------------------------------------------------------------------
 .../pidx-to-sidx-idxonly-equi-join_01.aql       |  69 +++++++++++
 ...to-secondary-indexonly-plan-equi-join_01.aql |  69 -----------
 ...y-indexonly-plan-to-primary-equi-join_01.aql |  71 ------------
 ...to-secondary-indexonly-plan-equi-join_01.aql |  72 ------------
 ...to-secondary-indexonly-plan-equi-join_01.aql |  74 ------------
 .../sidx-idxonly-to-pidx-equi-join_01.aql       |  71 ++++++++++++
 ...idx-idxonly-to-sidx-idxonly-equi-join_01.aql |  72 ++++++++++++
 ...non-idxonly-to-sidx-idxonly-equi-join_01.aql |  74 ++++++++++++
 ...ondary-composite-index-indexonly-plan-01.aql |  64 -----------
 ...dexonly-plan-01-disable-indexonly-plan.sqlpp |  67 -----------
 ...tree-secondary-index-indexonly-plan-01.sqlpp |  64 -----------
 .../btree-secondary-index-indexonly-plan-02.aql |  65 -----------
 .../btree-secondary-index-indexonly-plan-03.aql |  65 -----------
 .../btree-secondary-index-indexonly-plan-04.aql |  67 -----------
 .../btree-secondary-index-indexonly-plan-05.aql |  67 -----------
 .../btree-secondary-index-indexonly-plan-06.aql |  67 -----------
 .../btree-secondary-index-indexonly-plan-07.aql |  67 -----------
 .../btree-secondary-index-indexonly-plan-08.aql |  67 -----------
 .../btree-secondary-index-indexonly-plan-09.aql |  50 --------
 .../btree-sidx-composite-idxonly-01.aql         |  64 +++++++++++
 .../btree-sidx-idxonly-01-disable-idxonly.sqlpp |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-01.sqlpp     |  64 +++++++++++
 .../btree-index/btree-sidx-idxonly-02.aql       |  65 +++++++++++
 .../btree-index/btree-sidx-idxonly-03.aql       |  65 +++++++++++
 .../btree-index/btree-sidx-idxonly-04.aql       |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-05.aql       |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-06.aql       |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-07.aql       |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-08.aql       |  67 +++++++++++
 .../btree-index/btree-sidx-idxonly-09.aql       |  50 ++++++++
 ...dexonly-plan-01-disable-indexonly-plan.sqlpp | 114 -------------------
 ...tree-secondary-index-indexonly-plan-01.sqlpp | 111 ------------------
 .../rtree-secondary-index-indexonly-plan-02.aql | 111 ------------------
 .../rtree-secondary-index-indexonly-plan-03.aql | 111 ------------------
 .../rtree-secondary-index-indexonly-plan-04.aql | 114 -------------------
 .../rtree-secondary-index-indexonly-plan-05.aql | 114 -------------------
 .../rtree-secondary-index-indexonly-plan-06.aql | 114 -------------------
 .../rtree-secondary-index-indexonly-plan-07.aql | 114 -------------------
 .../rtree-secondary-index-indexonly-plan-08.aql | 114 -------------------
 .../rtree-secondary-index-indexonly-plan-09.aql | 112 ------------------
 .../rtree-sidx-idxonly-01-disable-idxonly.sqlpp | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-01.sqlpp     | 111 ++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-02.aql       | 111 ++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-03.aql       | 111 ++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-04.aql       | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-05.aql       | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-06.aql       | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-07.aql       | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-08.aql       | 114 +++++++++++++++++++
 .../rtree-index/rtree-sidx-idxonly-09.aql       | 112 ++++++++++++++++++
 .../pidx-to-sidx-idxonly-equi-join_01.plan      |  45 ++++++++
 ...o-secondary-indexonly-plan-equi-join_01.plan |  45 --------
 ...-indexonly-plan-to-primary-equi-join_01.plan |  36 ------
 ...o-secondary-indexonly-plan-equi-join_01.plan |  81 -------------
 ...o-secondary-indexonly-plan-equi-join_01.plan |  65 -----------
 .../sidx-idxonly-to-pidx-equi-join_01.plan      |  36 ++++++
 ...dx-idxonly-to-sidx-idxonly-equi-join_01.plan |  81 +++++++++++++
 ...on-idxonly-to-sidx-idxonly-equi-join_01.plan |  65 +++++++++++
 ...ndary-composite-index-indexonly-plan-01.plan |  31 -----
 ...ndexonly-plan-01-disable-indexonly-plan.plan |  19 ----
 ...btree-secondary-index-indexonly-plan-01.plan |  30 -----
 ...btree-secondary-index-indexonly-plan-02.plan |  33 ------
 ...btree-secondary-index-indexonly-plan-03.plan |  31 -----
 ...btree-secondary-index-indexonly-plan-04.plan |  32 ------
 ...btree-secondary-index-indexonly-plan-05.plan |  35 ------
 ...btree-secondary-index-indexonly-plan-06.plan |  33 ------
 ...btree-secondary-index-indexonly-plan-07.plan |  35 ------
 ...btree-secondary-index-indexonly-plan-08.plan |  33 ------
 ...btree-secondary-index-indexonly-plan-09.plan |  53 ---------
 .../btree-sidx-composite-idxonly-01.plan        |  31 +++++
 .../btree-sidx-idxonly-01-disable-idxonly.plan  |  19 ++++
 .../btree-index/btree-sidx-idxonly-01.plan      |  30 +++++
 .../btree-index/btree-sidx-idxonly-02.plan      |  33 ++++++
 .../btree-index/btree-sidx-idxonly-03.plan      |  31 +++++
 .../btree-index/btree-sidx-idxonly-04.plan      |  32 ++++++
 .../btree-index/btree-sidx-idxonly-05.plan      |  35 ++++++
 .../btree-index/btree-sidx-idxonly-06.plan      |  33 ++++++
 .../btree-index/btree-sidx-idxonly-07.plan      |  35 ++++++
 .../btree-index/btree-sidx-idxonly-08.plan      |  33 ++++++
 .../btree-index/btree-sidx-idxonly-09.plan      |  53 +++++++++
 ...ndexonly-plan-01-disable-indexonly-plan.plan |  22 ----
 ...rtree-secondary-index-indexonly-plan-01.plan |  39 -------
 ...rtree-secondary-index-indexonly-plan-02.plan |  33 ------
 ...rtree-secondary-index-indexonly-plan-03.plan |  37 ------
 ...rtree-secondary-index-indexonly-plan-04.plan |  38 -------
 ...rtree-secondary-index-indexonly-plan-05.plan |  35 ------
 ...rtree-secondary-index-indexonly-plan-06.plan |  39 -------
 ...rtree-secondary-index-indexonly-plan-07.plan |  35 ------
 ...rtree-secondary-index-indexonly-plan-08.plan |  33 ------
 ...rtree-secondary-index-indexonly-plan-09.plan |  35 ------
 .../rtree-sidx-idxonly-01-disable-idxonly.plan  |  22 ++++
 .../rtree-index/rtree-sidx-idxonly-01.plan      |  39 +++++++
 .../rtree-index/rtree-sidx-idxonly-02.plan      |  33 ++++++
 .../rtree-index/rtree-sidx-idxonly-03.plan      |  37 ++++++
 .../rtree-index/rtree-sidx-idxonly-04.plan      |  38 +++++++
 .../rtree-index/rtree-sidx-idxonly-05.plan      |  35 ++++++
 .../rtree-index/rtree-sidx-idxonly-06.plan      |  39 +++++++
 .../rtree-index/rtree-sidx-idxonly-07.plan      |  35 ++++++
 .../rtree-index/rtree-sidx-idxonly-08.plan      |  33 ++++++
 .../rtree-index/rtree-sidx-idxonly-09.plan      |  35 ++++++
 ...-pidx-to-sidx-idxonly-equi-join_01.1.ddl.aql |  64 +++++++++++
 ...dx-to-sidx-idxonly-equi-join_01.2.update.aql |  36 ++++++
 ...idx-to-sidx-idxonly-equi-join_01.3.query.aql |  34 ++++++
 ...ondary-indexonly-plan-equi-join_01.1.ddl.aql |  64 -----------
 ...ary-indexonly-plan-equi-join_01.2.update.aql |  36 ------
 ...dary-indexonly-plan-equi-join_01.3.query.aql |  34 ------
 ...xonly-plan-to-primary-equi-join_01.1.ddl.aql |  63 ----------
 ...ly-plan-to-primary-equi-join_01.2.update.aql |  29 -----
 ...nly-plan-to-primary-equi-join_01.3.query.aql |  27 -----
 ...-sidx-idxonly-to-pidx-equi-join_01.1.ddl.aql |  63 ++++++++++
 ...dx-idxonly-to-pidx-equi-join_01.2.update.aql |  29 +++++
 ...idx-idxonly-to-pidx-equi-join_01.3.query.aql |  27 +++++
 ...ondary-indexonly-plan-equi-join_01.1.ddl.aql |  65 -----------
 ...ary-indexonly-plan-equi-join_01.2.update.aql |  29 -----
 ...dary-indexonly-plan-equi-join_01.3.query.aql |  27 -----
 ...xonly-to-sidx-idxonly-equi-join_01.1.ddl.aql |  65 +++++++++++
 ...ly-to-sidx-idxonly-equi-join_01.2.update.aql |  29 +++++
 ...nly-to-sidx-idxonly-equi-join_01.3.query.aql |  27 +++++
 ...xonly-plan-to-primary-equi-join_01.1.ddl.aql |  66 -----------
 ...ly-plan-to-primary-equi-join_01.2.update.aql |  29 -----
 ...nly-plan-to-primary-equi-join_01.3.query.aql |  27 -----
 ...x-non-idxonly-to-pidx-equi-join_01.1.ddl.aql |  66 +++++++++++
 ...on-idxonly-to-pidx-equi-join_01.2.update.aql |  29 +++++
 ...non-idxonly-to-pidx-equi-join_01.3.query.aql |  27 +++++
 ...ondary-indexonly-plan-equi-join_01.1.ddl.aql |  67 -----------
 ...ary-indexonly-plan-equi-join_01.2.update.aql |  29 -----
 ...dary-indexonly-plan-equi-join_01.3.query.aql |  27 -----
 ...xonly-to-sidx-idxonly-equi-join_01.1.ddl.aql |  67 +++++++++++
 ...ly-to-sidx-idxonly-equi-join_01.2.update.aql |  29 +++++
 ...nly-to-sidx-idxonly-equi-join_01.3.query.aql |  27 +++++
 ...robe-pidx-join-btree-sidx3-idxonly.1.ddl.aql |  56 +++++++++
 ...e-pidx-join-btree-sidx3-idxonly.2.update.aql |  24 ++++
 ...be-pidx-join-btree-sidx3-idxonly.3.query.aql |  32 ++++++
 ...th-join-btree-sidx3-indexonly-plan.1.ddl.aql |  56 ---------
 ...join-btree-sidx3-indexonly-plan.2.update.aql |  24 ----
 ...-join-btree-sidx3-indexonly-plan.3.query.aql |  32 ------
 ...idx-btree-idxonly-join-btree-pidx1.1.ddl.aql |  57 ++++++++++
 ...-btree-idxonly-join-btree-pidx1.2.update.aql |  24 ++++
 ...x-btree-idxonly-join-btree-pidx1.3.query.aql |  32 ++++++
 ...dexonly-plan-with-join-btree-pidx1.1.ddl.aql |  57 ----------
 ...only-plan-with-join-btree-pidx1.2.update.aql |  24 ----
 ...xonly-plan-with-join-btree-pidx1.3.query.aql |  32 ------
 ...e-idxonly-join-btree-sidx1-idxonly.1.ddl.aql |  60 ++++++++++
 ...dxonly-join-btree-sidx1-idxonly.2.update.aql |  24 ++++
 ...idxonly-join-btree-sidx1-idxonly.3.query.aql |  32 ++++++
 ...th-join-btree-sidx1-indexonly-plan.1.ddl.aql |  60 ----------
 ...join-btree-sidx1-indexonly-plan.2.update.aql |  24 ----
 ...-join-btree-sidx1-indexonly-plan.3.query.aql |  32 ------
 ...btree-non-idxonly-join-btree-pidx1.1.ddl.aql |  57 ++++++++++
 ...ee-non-idxonly-join-btree-pidx1.2.update.aql |  24 ++++
 ...ree-non-idxonly-join-btree-pidx1.3.query.aql |  32 ++++++
 ...dexonly-plan-with-join-btree-pidx1.1.ddl.aql |  57 ----------
 ...only-plan-with-join-btree-pidx1.2.update.aql |  24 ----
 ...xonly-plan-with-join-btree-pidx1.3.query.aql |  32 ------
 ...n-idxonly-join-btree-sidx1-idxonly.1.ddl.aql |  59 ++++++++++
 ...dxonly-join-btree-sidx1-idxonly.2.update.aql |  24 ++++
 ...idxonly-join-btree-sidx1-idxonly.3.query.aql |  32 ++++++
 ...th-join-btree-sidx1-indexonly-plan.1.ddl.aql |  59 ----------
 ...join-btree-sidx1-indexonly-plan.2.update.aql |  24 ----
 ...-join-btree-sidx1-indexonly-plan.3.query.aql |  32 ------
 ...-composite-index-indexonly-plan-01.1.ddl.aql |  62 ----------
 ...mposite-index-indexonly-plan-01.2.update.aql |  25 ----
 ...omposite-index-indexonly-plan-01.3.query.aql |  25 ----
 .../btree-sidx-composite-idxonly-01.1.ddl.aql   |  62 ++++++++++
 ...btree-sidx-composite-idxonly-01.2.update.aql |  25 ++++
 .../btree-sidx-composite-idxonly-01.3.query.aql |  25 ++++
 ...-composite-index-indexonly-plan-02.1.ddl.aql |  62 ----------
 ...mposite-index-indexonly-plan-02.2.update.aql |  24 ----
 ...omposite-index-indexonly-plan-03.3.query.aql |  24 ----
 .../btree-sidx-composite-idxonly-02.1.ddl.aql   |  62 ++++++++++
 ...btree-sidx-composite-idxonly-02.2.update.aql |  24 ++++
 .../btree-sidx-composite-idxonly-03.3.query.aql |  24 ++++
 ...-composite-index-indexonly-plan-03.1.ddl.aql |  62 ----------
 ...mposite-index-indexonly-plan-03.2.update.aql |  25 ----
 ...omposite-index-indexonly-plan-03.3.query.aql |  24 ----
 .../btree-sidx-composite-idxonly-03.1.ddl.aql   |  62 ++++++++++
 ...btree-sidx-composite-idxonly-03.2.update.aql |  25 ++++
 .../btree-sidx-composite-idxonly-03.3.query.aql |  24 ++++
 ...-secondary-index-indexonly-plan-01.1.ddl.aql |  60 ----------
 ...condary-index-indexonly-plan-01.10.query.aql |  28 -----
 ...condary-index-indexonly-plan-01.2.update.aql |  25 ----
 ...econdary-index-indexonly-plan-01.3.query.aql |  25 ----
 ...econdary-index-indexonly-plan-01.4.query.aql |  25 ----
 ...econdary-index-indexonly-plan-01.5.query.aql |  25 ----
 ...econdary-index-indexonly-plan-01.6.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.7.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.8.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.9.query.aql |  27 -----
 .../btree-sidx-idxonly-01.1.ddl.aql             |  60 ++++++++++
 .../btree-sidx-idxonly-01.10.query.aql          |  28 +++++
 .../btree-sidx-idxonly-01.2.update.aql          |  25 ++++
 .../btree-sidx-idxonly-01.3.query.aql           |  25 ++++
 .../btree-sidx-idxonly-01.4.query.aql           |  25 ++++
 .../btree-sidx-idxonly-01.5.query.aql           |  25 ++++
 .../btree-sidx-idxonly-01.6.query.aql           |  28 +++++
 .../btree-sidx-idxonly-01.7.query.aql           |  28 +++++
 .../btree-sidx-idxonly-01.8.query.aql           |  28 +++++
 .../btree-sidx-idxonly-01.9.query.aql           |  27 +++++
 ...ondary-index-non-indexonly-plan-01.1.ddl.aql |  56 ---------
 ...ary-index-non-indexonly-plan-01.2.update.aql |  25 ----
 ...dary-index-non-indexonly-plan-01.3.query.aql |  26 -----
 .../btree-sidx-non-idxonly-01.1.ddl.aql         |  56 +++++++++
 .../btree-sidx-non-idxonly-01.2.update.aql      |  25 ++++
 .../btree-sidx-non-idxonly-01.3.query.aql       |  26 +++++
 ...-secondary-index-indexonly-plan-01.1.ddl.aql | 107 -----------------
 ...condary-index-indexonly-plan-01.10.query.aql |  28 -----
 ...condary-index-indexonly-plan-01.11.query.aql |  27 -----
 ...condary-index-indexonly-plan-01.2.update.aql |  29 -----
 ...econdary-index-indexonly-plan-01.3.query.aql |  24 ----
 ...econdary-index-indexonly-plan-01.4.query.aql |  26 -----
 ...econdary-index-indexonly-plan-01.5.query.aql |  26 -----
 ...econdary-index-indexonly-plan-01.6.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.7.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.8.query.aql |  28 -----
 ...econdary-index-indexonly-plan-01.9.query.aql |  28 -----
 .../rtree-sidx-idxonly-01.1.ddl.aql             | 107 +++++++++++++++++
 .../rtree-sidx-idxonly-01.10.query.aql          |  28 +++++
 .../rtree-sidx-idxonly-01.11.query.aql          |  27 +++++
 .../rtree-sidx-idxonly-01.2.update.aql          |  29 +++++
 .../rtree-sidx-idxonly-01.3.query.aql           |  24 ++++
 .../rtree-sidx-idxonly-01.4.query.aql           |  26 +++++
 .../rtree-sidx-idxonly-01.5.query.aql           |  26 +++++
 .../rtree-sidx-idxonly-01.6.query.aql           |  28 +++++
 .../rtree-sidx-idxonly-01.7.query.aql           |  28 +++++
 .../rtree-sidx-idxonly-01.8.query.aql           |  28 +++++
 .../rtree-sidx-idxonly-01.9.query.aql           |  28 +++++
 ...ondary-index-non-indexonly-plan-01.1.ddl.aql |  56 ---------
 ...ary-index-non-indexonly-plan-01.2.update.aql |  25 ----
 ...dary-index-non-indexonly-plan-01.3.query.aql |  27 -----
 .../rtree-sidx-non-idxonly-01.1.ddl.aql         |  56 +++++++++
 .../rtree-sidx-non-idxonly-01.2.update.aql      |  25 ++++
 .../rtree-sidx-non-idxonly-01.3.query.aql       |  27 +++++
 ...ondary-index-non-indexonly-plan-02.1.ddl.aql |  57 ----------
 ...ary-index-non-indexonly-plan-02.2.update.aql |  25 ----
 ...dary-index-non-indexonly-plan-02.3.query.aql |  28 -----
 .../rtree-sidx-non-idxonly-02.1.ddl.aql         |  57 ++++++++++
 .../rtree-sidx-non-idxonly-02.2.update.aql      |  25 ++++
 .../rtree-sidx-non-idxonly-02.3.query.aql       |  28 +++++
 ...idx-to-sidx-idxonly-equi-join_01.1.ddl.sqlpp |  64 +++++++++++
 ...-to-sidx-idxonly-equi-join_01.2.update.sqlpp |  36 ++++++
 ...x-to-sidx-idxonly-equi-join_01.3.query.sqlpp |  32 ++++++
 ...dary-indexonly-plan-equi-join_01.1.ddl.sqlpp |  64 -----------
 ...y-indexonly-plan-equi-join_01.2.update.sqlpp |  36 ------
 ...ry-indexonly-plan-equi-join_01.3.query.sqlpp |  32 ------
 ...nly-plan-to-primary-equi-join_01.1.ddl.sqlpp |  63 ----------
 ...-plan-to-primary-equi-join_01.2.update.sqlpp |  29 -----
 ...y-plan-to-primary-equi-join_01.3.query.sqlpp |  26 -----
 ...idx-idxonly-to-pidx-equi-join_01.1.ddl.sqlpp |  63 ++++++++++
 ...-idxonly-to-pidx-equi-join_01.2.update.sqlpp |  29 +++++
 ...x-idxonly-to-pidx-equi-join_01.3.query.sqlpp |  26 +++++
 ...dary-indexonly-plan-equi-join_01.1.ddl.sqlpp |  65 -----------
 ...y-indexonly-plan-equi-join_01.2.update.sqlpp |  29 -----
 ...ry-indexonly-plan-equi-join_01.3.query.sqlpp |  26 -----
 ...nly-to-sidx-idxonly-equi-join_01.1.ddl.sqlpp |  65 +++++++++++
 ...-to-sidx-idxonly-equi-join_01.2.update.sqlpp |  29 +++++
 ...y-to-sidx-idxonly-equi-join_01.3.query.sqlpp |  26 +++++
 ...nly-plan-to-primary-equi-join_01.1.ddl.sqlpp |  66 -----------
 ...-plan-to-primary-equi-join_01.2.update.sqlpp |  29 -----
 ...y-plan-to-primary-equi-join_01.3.query.sqlpp |  26 -----
 ...non-idxonly-to-pidx-equi-join_01.1.ddl.sqlpp |  66 +++++++++++
 ...-idxonly-to-pidx-equi-join_01.2.update.sqlpp |  29 +++++
 ...n-idxonly-to-pidx-equi-join_01.3.query.sqlpp |  26 +++++
 ...dary-indexonly-plan-equi-join_01.1.ddl.sqlpp |  67 -----------
 ...y-indexonly-plan-equi-join_01.2.update.sqlpp |  29 -----
 ...ry-indexonly-plan-equi-join_01.3.query.sqlpp |  26 -----
 ...nly-to-sidx-idxonly-equi-join_01.1.ddl.sqlpp |  67 +++++++++++
 ...-to-sidx-idxonly-equi-join_01.2.update.sqlpp |  29 +++++
 ...y-to-sidx-idxonly-equi-join_01.3.query.sqlpp |  26 +++++
 ...be-pidx-join-btree-sidx3-idxonly.1.ddl.sqlpp |  56 +++++++++
 ...pidx-join-btree-sidx3-idxonly.2.update.sqlpp |  24 ++++
 ...-pidx-join-btree-sidx3-idxonly.3.query.sqlpp |  29 +++++
 ...-join-btree-sidx3-indexonly-plan.1.ddl.sqlpp |  56 ---------
 ...in-btree-sidx3-indexonly-plan.2.update.sqlpp |  24 ----
 ...oin-btree-sidx3-indexonly-plan.3.query.sqlpp |  29 -----
 ...x-btree-idxonly-join-btree-pidx1.1.ddl.sqlpp |  57 ++++++++++
 ...tree-idxonly-join-btree-pidx1.2.update.sqlpp |  24 ++++
 ...btree-idxonly-join-btree-pidx1.3.query.sqlpp |  30 +++++
 ...xonly-plan-with-join-btree-pidx1.1.ddl.sqlpp |  57 ----------
 ...ly-plan-with-join-btree-pidx1.2.update.sqlpp |  24 ----
 ...nly-plan-with-join-btree-pidx1.3.query.sqlpp |  30 -----
 ...idxonly-join-btree-sidx1-idxonly.1.ddl.sqlpp |  60 ++++++++++
 ...only-join-btree-sidx1-idxonly.2.update.sqlpp |  24 ++++
 ...xonly-join-btree-sidx1-idxonly.3.query.sqlpp |  29 +++++
 ...-join-btree-sidx1-indexonly-plan.1.ddl.sqlpp |  60 ----------
 ...in-btree-sidx1-indexonly-plan.2.update.sqlpp |  24 ----
 ...oin-btree-sidx1-indexonly-plan.3.query.sqlpp |  29 -----
 ...ree-non-idxonly-join-btree-pidx1.1.ddl.sqlpp |  57 ++++++++++
 ...-non-idxonly-join-btree-pidx1.2.update.sqlpp |  24 ++++
 ...e-non-idxonly-join-btree-pidx1.3.query.sqlpp |  30 +++++
 ...xonly-plan-with-join-btree-pidx1.1.ddl.sqlpp |  57 ----------
 ...ly-plan-with-join-btree-pidx1.2.update.sqlpp |  24 ----
 ...nly-plan-with-join-btree-pidx1.3.query.sqlpp |  30 -----
 ...idxonly-join-btree-sidx1-idxonly.1.ddl.sqlpp |  59 ++++++++++
 ...only-join-btree-sidx1-idxonly.2.update.sqlpp |  24 ++++
 ...xonly-join-btree-sidx1-idxonly.3.query.sqlpp |  29 +++++
 ...-join-btree-sidx1-indexonly-plan.1.ddl.sqlpp |  59 ----------
 ...in-btree-sidx1-indexonly-plan.2.update.sqlpp |  24 ----
 ...oin-btree-sidx1-indexonly-plan.3.query.sqlpp |  29 -----
 ...omposite-index-indexonly-plan-01.1.ddl.sqlpp |  60 ----------
 ...osite-index-indexonly-plan-01.2.update.sqlpp |  25 ----
 ...posite-index-indexonly-plan-01.3.query.sqlpp |  25 ----
 .../btree-sidx-composite-idxonly-01.1.ddl.sqlpp |  60 ++++++++++
 ...ree-sidx-composite-idxonly-01.2.update.sqlpp |  25 ++++
 ...tree-sidx-composite-idxonly-01.3.query.sqlpp |  25 ++++
 ...omposite-index-indexonly-plan-02.1.ddl.sqlpp |  60 ----------
 ...osite-index-indexonly-plan-02.2.update.sqlpp |  24 ----
 ...posite-index-indexonly-plan-02.3.query.sqlpp |  24 ----
 .../btree-sidx-composite-idxonly-02.1.ddl.sqlpp |  60 ++++++++++
 ...ree-sidx-composite-idxonly-02.2.update.sqlpp |  24 ++++
 ...tree-sidx-composite-idxonly-02.3.query.sqlpp |  24 ++++
 ...omposite-index-indexonly-plan-03.1.ddl.sqlpp |  60 ----------
 ...osite-index-indexonly-plan-03.2.update.sqlpp |  25 ----
 ...posite-index-indexonly-plan-03.3.query.sqlpp |  25 ----
 .../btree-sidx-composite-idxonly-03.1.ddl.sqlpp |  60 ++++++++++
 ...ree-sidx-composite-idxonly-03.2.update.sqlpp |  25 ++++
 ...tree-sidx-composite-idxonly-03.3.query.sqlpp |  25 ++++
 ...econdary-index-indexonly-plan-01.1.ddl.sqlpp |  60 ----------
 ...ndary-index-indexonly-plan-01.10.query.sqlpp |  27 -----
 ...ndary-index-indexonly-plan-01.2.update.sqlpp |  25 ----
 ...ondary-index-indexonly-plan-01.3.query.sqlpp |  25 ----
 ...ondary-index-indexonly-plan-01.4.query.sqlpp |  25 ----
 ...ondary-index-indexonly-plan-01.5.query.sqlpp |  25 ----
 ...ondary-index-indexonly-plan-01.6.query.sqlpp |  26 -----
 ...ondary-index-indexonly-plan-01.7.query.sqlpp |  27 -----
 ...ondary-index-indexonly-plan-01.8.query.sqlpp |  26 -----
 ...ondary-index-indexonly-plan-01.9.query.sqlpp |  26 -----
 .../btree-sidx-idxonly-01.1.ddl.sqlpp           |  60 ++++++++++
 .../btree-sidx-idxonly-01.10.query.sqlpp        |  27 +++++
 .../btree-sidx-idxonly-01.2.update.sqlpp        |  25 ++++
 .../btree-sidx-idxonly-01.3.query.sqlpp         |  25 ++++
 .../btree-sidx-idxonly-01.4.query.sqlpp         |  25 ++++
 .../btree-sidx-idxonly-01.5.query.sqlpp         |  25 ++++
 .../btree-sidx-idxonly-01.6.query.sqlpp         |  26 +++++
 .../btree-sidx-idxonly-01.7.query.sqlpp         |  27 +++++
 .../btree-sidx-idxonly-01.8.query.sqlpp         |  26 +++++
 .../btree-sidx-idxonly-01.9.query.sqlpp         |  26 +++++
 ...dary-index-non-indexonly-plan-01.1.ddl.sqlpp |  56 ---------
 ...y-index-non-indexonly-plan-01.2.update.sqlpp |  25 ----
 ...ry-index-non-indexonly-plan-01.3.query.sqlpp |  25 ----
 .../btree-sidx-non-idxonly-01.1.ddl.sqlpp       |  56 +++++++++
 .../btree-sidx-non-idxonly-01.2.update.sqlpp    |  25 ++++
 .../btree-sidx-non-idxonly-01.3.query.sqlpp     |  25 ++++
 ...econdary-index-indexonly-plan-01.1.ddl.sqlpp | 107 -----------------
 ...ndary-index-indexonly-plan-01.10.query.sqlpp |  27 -----
 ...ndary-index-indexonly-plan-01.11.query.sqlpp |  26 -----
 ...ndary-index-indexonly-plan-01.2.update.sqlpp |  29 -----
 ...ondary-index-indexonly-plan-01.3.query.sqlpp |  26 -----
 ...ondary-index-indexonly-plan-01.4.query.sqlpp |  26 -----
 ...ondary-index-indexonly-plan-01.5.query.sqlpp |  26 -----
 ...ondary-index-indexonly-plan-01.6.query.sqlpp |  27 -----
 ...ondary-index-indexonly-plan-01.7.query.sqlpp |  27 -----
 ...ondary-index-indexonly-plan-01.8.query.sqlpp |  27 -----
 ...ondary-index-indexonly-plan-01.9.query.sqlpp |  27 -----
 .../rtree-sidx-idxonly-01.1.ddl.sqlpp           | 107 +++++++++++++++++
 .../rtree-sidx-idxonly-01.10.query.sqlpp        |  27 +++++
 .../rtree-sidx-idxonly-01.11.query.sqlpp        |  26 +++++
 .../rtree-sidx-idxonly-01.2.update.sqlpp        |  29 +++++
 .../rtree-sidx-idxonly-01.3.query.sqlpp         |  26 +++++
 .../rtree-sidx-idxonly-01.4.query.sqlpp         |  26 +++++
 .../rtree-sidx-idxonly-01.5.query.sqlpp         |  26 +++++
 .../rtree-sidx-idxonly-01.6.query.sqlpp         |  27 +++++
 .../rtree-sidx-idxonly-01.7.query.sqlpp         |  27 +++++
 .../rtree-sidx-idxonly-01.8.query.sqlpp         |  27 +++++
 .../rtree-sidx-idxonly-01.9.query.sqlpp         |  27 +++++
 ...dary-index-non-indexonly-plan-01.1.ddl.sqlpp |  56 ---------
 ...y-index-non-indexonly-plan-01.2.update.sqlpp |  25 ----
 ...ry-index-non-indexonly-plan-01.3.query.sqlpp |  27 -----
 .../rtree-sidx-non-idxonly-01.1.ddl.sqlpp       |  56 +++++++++
 .../rtree-sidx-non-idxonly-01.2.update.sqlpp    |  25 ++++
 .../rtree-sidx-non-idxonly-01.3.query.sqlpp     |  27 +++++
 ...dary-index-non-indexonly-plan-02.1.ddl.sqlpp |  57 ----------
 ...y-index-non-indexonly-plan-02.2.update.sqlpp |  25 ----
 ...ry-index-non-indexonly-plan-02.3.query.sqlpp |  27 -----
 .../rtree-sidx-non-idxonly-02.1.ddl.sqlpp       |  57 ++++++++++
 .../rtree-sidx-non-idxonly-02.2.update.sqlpp    |  25 ++++
 .../rtree-sidx-non-idxonly-02.3.query.sqlpp     |  27 +++++
 ...tree-pidx-to-sidx-idxonly-equi-join_01.1.adm |   1 +
 ...-secondary-indexonly-plan-equi-join_01.1.adm |   1 -
 ...indexonly-plan-to-primary-equi-join_01.1.adm |   1 -
 ...tree-sidx-idxonly-to-pidx-equi-join_01.1.adm |   1 +
 ...-secondary-indexonly-plan-equi-join_01.1.adm |   1 -
 ...x-idxonly-to-sidx-idxonly-equi-join_01.1.adm |   1 +
 ...indexonly-plan-to-primary-equi-join_01.1.adm |   1 -
 ...-sidx-non-idxonly-to-pidx-equi-join_01.1.adm |   1 +
 ...-secondary-indexonly-plan-equi-join_01.1.adm |   1 -
 ...n-idxonly-to-sidx-idxonly-equi-join_01.1.adm |   1 +
 .../probe-pidx-join-rtree-sidx3-idxonly.1.adm   |   1 +
 ...x-with-join-rtree-sidx3-indexonly-plan.1.adm |   1 -
 ...be-sidx-btree-idxonly-join-btree-pidx1.1.adm |   1 +
 ...e-indexonly-plan-with-join-btree-pidx1.1.adm |   1 -
 ...btree-idxonly-join-btree-sidx1-idxonly.1.adm |   1 +
 ...n-with-join-btree-sidx1-indexonly-plan.1.adm |   1 -
 ...idx-btree-non-idxonly-join-btree-pidx1.1.adm |   1 +
 ...n-indexonly-plan-with-join-btree-pidx1.1.adm |   1 -
 ...e-non-idxonly-join-btree-sidx1-idxonly.1.adm |   1 +
 ...n-with-join-btree-sidx1-indexonly-plan.1.adm |   1 -
 ...dary-composite-index-indexonly-plan-01.1.adm |   2 -
 .../btree-sidx-composite-idxonly-01.1.adm       |   2 +
 ...dary-composite-index-indexonly-plan-02.1.adm |   2 -
 .../btree-sidx-composite-idxonly-02.1.adm       |   2 +
 ...dary-composite-index-indexonly-plan-03.1.adm |   2 -
 .../btree-sidx-composite-idxonly-03.1.adm       |   2 +
 ...ree-secondary-index-indexonly-plan-01.10.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.3.adm |   2 -
 ...tree-secondary-index-indexonly-plan-01.4.adm |   2 -
 ...tree-secondary-index-indexonly-plan-01.5.adm |   2 -
 ...tree-secondary-index-indexonly-plan-01.6.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.7.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.8.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.9.adm |   1 -
 .../btree-sidx-idxonly-01.10.adm                |   1 +
 .../btree-sidx-idxonly-01.3.adm                 |   2 +
 .../btree-sidx-idxonly-01.4.adm                 |   2 +
 .../btree-sidx-idxonly-01.5.adm                 |   2 +
 .../btree-sidx-idxonly-01.6.adm                 |   1 +
 .../btree-sidx-idxonly-01.7.adm                 |   1 +
 .../btree-sidx-idxonly-01.8.adm                 |   1 +
 .../btree-sidx-idxonly-01.9.adm                 |   1 +
 ...-secondary-index-non-indexonly-plan-01.1.adm |   1 -
 .../btree-sidx-non-idxonly-01.1.adm             |   1 +
 ...ree-secondary-index-indexonly-plan-01.10.adm |   1 -
 ...ree-secondary-index-indexonly-plan-01.11.adm |  30 -----
 ...tree-secondary-index-indexonly-plan-01.3.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.4.adm |   6 -
 ...tree-secondary-index-indexonly-plan-01.5.adm |   6 -
 ...tree-secondary-index-indexonly-plan-01.6.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.7.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.8.adm |   1 -
 ...tree-secondary-index-indexonly-plan-01.9.adm |   1 -
 .../rtree-sidx-idxonly-01.10.adm                |   1 +
 .../rtree-sidx-idxonly-01.11.adm                |  30 +++++
 .../rtree-sidx-idxonly-01.3.adm                 |   1 +
 .../rtree-sidx-idxonly-01.4.adm                 |   6 +
 .../rtree-sidx-idxonly-01.5.adm                 |   6 +
 .../rtree-sidx-idxonly-01.6.adm                 |   1 +
 .../rtree-sidx-idxonly-01.7.adm                 |   1 +
 .../rtree-sidx-idxonly-01.8.adm                 |   1 +
 .../rtree-sidx-idxonly-01.9.adm                 |   1 +
 ...-secondary-index-non-indexonly-plan-01.1.adm |   1 -
 .../rtree-sidx-non-idxonly-01.1.adm             |   1 +
 ...-secondary-index-non-indexonly-plan-02.1.adm |   1 -
 .../rtree-sidx-non-idxonly-02.1.adm             |   1 +
 442 files changed, 8152 insertions(+), 8152 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql
new file mode 100644
index 0000000..08e786f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/pidx-to-sidx-idxonly-equi-join_01.aql
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
+ * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
+ *                  Given the 'indexnl' hint we expect the join to be transformed
+ *                  into an indexed nested-loop join using Orders' secondary index.
+ *                  In fact, this is an index-only plan.
+ * Success        : Yes
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+use dataverse test;
+
+create type AddressType as open {
+  number: int64,
+  street: string,
+  city: string
+}
+
+create type CustomerType as closed {
+  cid: int64,
+  name: string,
+  cashBack: int64,
+  age: int64?,
+  address: AddressType?,
+  lastorder: {
+    oid: int64,
+    total: float
+  }
+}
+
+create type OrderType as open {
+  oid: int64,
+  cid: int64,
+  orderstatus: string,
+  orderpriority: string,
+  clerk: string,
+  total: float,
+  items: [int64]
+}
+
+create dataset Customers(CustomerType) primary key cid;
+create dataset Orders(OrderType) primary key oid;
+
+create index CustomerID_idx on Orders(cid);
+
+count(
+for $c in dataset('Customers')
+for $o in dataset('Orders')
+where $c.cid /*+ indexnl */ = $o.cid
+return {"oid": $o.oid, "cid":$c.cid}
+);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-to-secondary-indexonly-plan-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-to-secondary-indexonly-plan-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-to-secondary-indexonly-plan-equi-join_01.aql
deleted file mode 100644
index 08e786f..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-to-secondary-indexonly-plan-equi-join_01.aql
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  In fact, this is an index-only plan.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-
-count(
-for $c in dataset('Customers')
-for $o in dataset('Orders')
-where $c.cid /*+ indexnl */ = $o.cid
-return {"oid": $o.oid, "cid":$c.cid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-primary-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-primary-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-primary-equi-join_01.aql
deleted file mode 100644
index d001bc4..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-primary-equi-join_01.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
- /*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Customers' primary index.
- *                  An index-only plan exists in the outer branch.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 800 and $o.cid /*+ indexnl */ = $c.cid
-return {"oid": $o.oid, "cid":$c.cid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
deleted file mode 100644
index 44efb8a..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  Each branch (outer and inner) will be transformed as an index-only plan.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-create index Cashback_idx on Customers(cashBack);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 100000 and $o.cid /*+ indexnl */ = $c.cashBack
-return {"oid": $o.oid, "cid":$c.cid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-non-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-non-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-non-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
deleted file mode 100644
index 950e451..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/secondary-non-indexonly-plan-to-secondary-indexonly-plan-equi-join_01.aql
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
- *                  Given the 'indexnl' hint we expect the join to be transformed
- *                  into an indexed nested-loop join using Orders' secondary index.
- *                  Inner branch will be transformed as an index-only plan.
- *                  Outer branch cannot be transformed as an index-only plan as an index can't cover
- *                  all search predicates even excluding the join condition.
- * Success        : Yes
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type AddressType as open {
-  number: int64,
-  street: string,
-  city: string
-}
-
-create type CustomerType as closed {
-  cid: int64,
-  name: string,
-  cashBack: int64,
-  age: int64?,
-  address: AddressType?,
-  lastorder: {
-    oid: int64,
-    total: float
-  }
-}
-
-create type OrderType as open {
-  oid: int64,
-  cid: int64,
-  orderstatus: string,
-  orderpriority: string,
-  clerk: string,
-  total: float,
-  items: [int64]
-}
-
-create dataset Customers(CustomerType) primary key cid;
-create dataset Orders(OrderType) primary key oid;
-
-create index CustomerID_idx on Orders(cid);
-create index Cashback_idx on Customers(cashBack);
-
-count(
-for $o in dataset('Orders')
-for $c in dataset('Customers')
-where $o.cid < 100000 and $o.total >= 0 and $o.cid /*+ indexnl */ = $c.cashBack
-return {"oid": $o.oid, "cid":$c.cid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql
new file mode 100644
index 0000000..d001bc4
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-pidx-equi-join_01.aql
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /*
+ * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
+ *                  Given the 'indexnl' hint we expect the join to be transformed
+ *                  into an indexed nested-loop join using Customers' primary index.
+ *                  An index-only plan exists in the outer branch.
+ * Success        : Yes
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+
+use dataverse test;
+
+create type AddressType as open {
+  number: int64,
+  street: string,
+  city: string
+}
+
+create type CustomerType as closed {
+  cid: int64,
+  name: string,
+  cashBack: int64,
+  age: int64?,
+  address: AddressType?,
+  lastorder: {
+    oid: int64,
+    total: float
+  }
+}
+
+create type OrderType as open {
+  oid: int64,
+  cid: int64,
+  orderstatus: string,
+  orderpriority: string,
+  clerk: string,
+  total: float,
+  items: [int64]
+}
+
+create dataset Customers(CustomerType) primary key cid;
+create dataset Orders(OrderType) primary key oid;
+
+create index CustomerID_idx on Orders(cid);
+
+count(
+for $o in dataset('Orders')
+for $c in dataset('Customers')
+where $o.cid < 800 and $o.cid /*+ indexnl */ = $c.cid
+return {"oid": $o.oid, "cid":$c.cid}
+);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql
new file mode 100644
index 0000000..44efb8a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-idxonly-to-sidx-idxonly-equi-join_01.aql
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
+ *                  Given the 'indexnl' hint we expect the join to be transformed
+ *                  into an indexed nested-loop join using Orders' secondary index.
+ *                  Each branch (outer and inner) will be transformed as an index-only plan.
+ * Success        : Yes
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+
+use dataverse test;
+
+create type AddressType as open {
+  number: int64,
+  street: string,
+  city: string
+}
+
+create type CustomerType as closed {
+  cid: int64,
+  name: string,
+  cashBack: int64,
+  age: int64?,
+  address: AddressType?,
+  lastorder: {
+    oid: int64,
+    total: float
+  }
+}
+
+create type OrderType as open {
+  oid: int64,
+  cid: int64,
+  orderstatus: string,
+  orderpriority: string,
+  clerk: string,
+  total: float,
+  items: [int64]
+}
+
+create dataset Customers(CustomerType) primary key cid;
+create dataset Orders(OrderType) primary key oid;
+
+create index CustomerID_idx on Orders(cid);
+create index Cashback_idx on Customers(cashBack);
+
+count(
+for $o in dataset('Orders')
+for $c in dataset('Customers')
+where $o.cid < 100000 and $o.cid /*+ indexnl */ = $c.cashBack
+return {"oid": $o.oid, "cid":$c.cid}
+);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql
new file mode 100644
index 0000000..950e451
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/sidx-non-idxonly-to-sidx-idxonly-equi-join_01.aql
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Description    : Equi joins two datasets, Customers and Orders, based on the customer id.
+ *                  Given the 'indexnl' hint we expect the join to be transformed
+ *                  into an indexed nested-loop join using Orders' secondary index.
+ *                  Inner branch will be transformed as an index-only plan.
+ *                  Outer branch cannot be transformed as an index-only plan as an index can't cover
+ *                  all search predicates even excluding the join condition.
+ * Success        : Yes
+ */
+
+drop dataverse test if exists;
+create dataverse test;
+
+use dataverse test;
+
+create type AddressType as open {
+  number: int64,
+  street: string,
+  city: string
+}
+
+create type CustomerType as closed {
+  cid: int64,
+  name: string,
+  cashBack: int64,
+  age: int64?,
+  address: AddressType?,
+  lastorder: {
+    oid: int64,
+    total: float
+  }
+}
+
+create type OrderType as open {
+  oid: int64,
+  cid: int64,
+  orderstatus: string,
+  orderpriority: string,
+  clerk: string,
+  total: float,
+  items: [int64]
+}
+
+create dataset Customers(CustomerType) primary key cid;
+create dataset Orders(OrderType) primary key oid;
+
+create index CustomerID_idx on Orders(cid);
+create index Cashback_idx on Customers(cashBack);
+
+count(
+for $o in dataset('Orders')
+for $c in dataset('Customers')
+where $o.cid < 100000 and $o.total >= 0 and $o.cid /*+ indexnl */ = $c.cashBack
+return {"oid": $o.oid, "cid":$c.cid}
+);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-composite-index-indexonly-plan-01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-composite-index-indexonly-plan-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-composite-index-indexonly-plan-01.aql
deleted file mode 100644
index 2599bd1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-composite-index-indexonly-plan-01.aql
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : This test is intended to verify that the secondary BTree index is
- *                  : used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid_val1 on MyData(docid,val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-return {"pk":$o.id, "sk":$o.val1}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01-disable-indexonly-plan.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01-disable-indexonly-plan.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01-disable-indexonly-plan.sqlpp
deleted file mode 100644
index 0be684e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01-disable-indexonly-plan.sqlpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *                  : However, we set the "noindexonly" option to true. So, the index-only plan should not be triggered.
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-};
-
-create dataset MyData(MyRecord) primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-set noindexonly 'true';
-
-select element {"pk":o.id, "sk":o.docid}
-from MyData o
-where o.docid < 3
-order by o.id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01.sqlpp
deleted file mode 100644
index af1a099..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-01.sqlpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-};
-
-create dataset MyData(MyRecord) primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-select element {"pk":o.id, "sk":o.docid}
-from MyData o
-where o.docid < 3
-order by o.id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-02.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-02.aql
deleted file mode 100644
index 77633fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-02.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-03.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-03.aql
deleted file mode 100644
index dc271af..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-03.aql
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"sk":$o.docid}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-04.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-04.aql
deleted file mode 100644
index b1297f1..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-04.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id, "sk":$o.docid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-05.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-05.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-05.aql
deleted file mode 100644
index 3d1d1fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-05.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"pk":$o.id}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-06.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-06.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-06.aql
deleted file mode 100644
index 3aea6ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-06.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"sk":$o.docid}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-07.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-07.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-07.aql
deleted file mode 100644
index 06d89b5..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-07.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return {"rec":$o, "pk":$o.id}
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-08.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-08.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-08.aql
deleted file mode 100644
index 0892b7e..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-08.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type MyRecord as closed {
-  id: int64,
-  docid: int64,
-  val1: int64,
-  title: string,
-  point: point,
-  kwds: string,
-  line1: line,
-  line2: line,
-  poly1: polygon,
-  poly2: polygon,
-  rec: rectangle,
-  circle: circle
-}
-
-create dataset MyData(MyRecord)
-  primary key id;
-
-create index btree_index_docid on MyData(docid) type btree;
-create index btree_index_val1 on MyData(val1) type btree;
-create index rtree_index_point on MyData(point) type rtree;
-create index rtree_index_rec on MyData(rec) type rtree;
-create index ngram_index_title on MyData(title) type ngram(3);
-create index keyword_index_title on MyData(title) type keyword;
-
-count(
-for $o in dataset('MyData')
-where $o.docid < 3
-order by $o.id
-return $o
-);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-09.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-09.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-09.aql
deleted file mode 100644
index a0cdc2b..0000000
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-secondary-index-indexonly-plan-09.aql
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/*
- *  Description     : Secondary BTree Index index-only selection plan verification test
- *                  : The test is intended to verify that the secondary BTree index is used in the optimized query plan.
- *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
- *                  : The plan should have two paths after the secondary index-lookup.
- *                  : The left path:
- *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
- *                  : The right path:
- *                      ... -> unnest-map (sidx) -> split ->                             -> union -> ...
- *  Expected Result : Success
- *
-*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
-create type testType as {
-   id: uuid,
-   sid: int32
-}
-
-create dataset testDataset(testType) primary key id autogenerated
-create index testIdx on testDataset(sid)
-
-for $y in [0,2,4,6,8]
-return { "quantile":$y,
-         "count": count(for $x in dataset testDataset
-                        where $x.sid /* +indexnl */ <= $y
-                        return $x.sid)
-};

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/06cec01b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql
new file mode 100644
index 0000000..2599bd1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-sidx-composite-idxonly-01.aql
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ *  Description     : Secondary BTree Index index-only selection plan verification test
+ *                  : This test is intended to verify that the secondary BTree index is
+ *                  : used in the optimized query plan.
+ *                  : In this plan, we fetch PK and SK based on a select condition that utilizes a secondary index.
+ *                  : The plan should have two paths after the secondary index-lookup.
+ *                  : The left path:
+ *                      ... -> unnest-map (sidx) -> split -> unnest-map (pidx) -> select -> union -> ...
+ *                  : The right path:
+ *                      ... -> unnest-map (sidx) -> split ->                                union -> ...
+ *  Expected Result : Success
+ *
+*/
+
+drop dataverse test if exists;
+create dataverse test;
+use dataverse test;
+
+create type MyRecord as closed {
+  id: int64,
+  docid: int64,
+  val1: int64,
+  title: string,
+  point: point,
+  kwds: string,
+  line1: line,
+  line2: line,
+  poly1: polygon,
+  poly2: polygon,
+  rec: rectangle,
+  circle: circle
+}
+
+create dataset MyData(MyRecord)
+  primary key id;
+
+create index btree_index_docid_val1 on MyData(docid,val1) type btree;
+create index rtree_index_point on MyData(point) type rtree;
+create index rtree_index_rec on MyData(rec) type rtree;
+create index ngram_index_title on MyData(title) type ngram(3);
+create index keyword_index_title on MyData(title) type keyword;
+
+for $o in dataset('MyData')
+where $o.docid < 3
+return {"pk":$o.id, "sk":$o.val1}


Mime
View raw message