asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject [9/9] asterixdb git commit: Hard Tabs++
Date Thu, 30 Jun 2016 16:55:30 GMT
Hard Tabs++

Eliminate more hard tabs, widen scope of checkstyle rules to prevent regressions.
Relax whitespace expectations in polygon ctor

Change-Id: Ia3f78fc6705bc79a21cfa97fdfcad30998ab1058
Reviewed-on: https://asterix-gerrit.ics.uci.edu/967
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: 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/d6cf641a
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/d6cf641a
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/d6cf641a

Branch: refs/heads/master
Commit: d6cf641a441fb71c3afb66f709896cf443b002e9
Parents: d76a0c0
Author: Michael Blow <mblow@apache.org>
Authored: Thu Jun 30 02:44:35 2016 -0400
Committer: Michael Blow <michael.blow@couchbase.com>
Committed: Thu Jun 30 09:54:28 2016 -0700

----------------------------------------------------------------------
 asterixdb/asterix-algebra/pom.xml               |  29 ++-
 .../asterix-algebra/src/main/javacc/AQLPlus.jj  |   4 +-
 asterixdb/asterix-app/scripts/idefix/startcc.sh |   4 +-
 asterixdb/asterix-app/src/main/scripts/run.sh   |   2 +-
 .../asterix-app/src/test/resources/dapd/q2.aql  |  12 +-
 .../nontagged/custord/local/cust-load.aql       |  10 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_01.aql |  30 +--
 ...rjoin-probe-pidx-with-join-btree-sidx_02.aql |  30 +--
 .../queries/btree-index/btree-datetime-01.aql   |   6 +-
 .../queries/btree-index/btree-datetime-02.aql   |   8 +-
 .../queries/btree-index/btree-datetime-03.aql   |   8 +-
 .../queries/btree-index/btree-datetime-04.aql   |   6 +-
 .../optimizerts/queries/distinct_aggregate.aql  |  52 ++--
 .../insert-and-scan-dataset-with-index.aql      |  14 +-
 .../queries/insert-and-scan-dataset.aql         |   6 +-
 .../queries/insert-and-scan-joined-datasets.aql |  10 +-
 .../queries/inverted-index-join/issue741.aql    |  12 +-
 ...idx-with-join-edit-distance-check-idx_01.aql |  30 +--
 ...robe-pidx-with-join-jaccard-check-idx_01.aql |  30 +--
 .../word-jaccard-check-after-btree-access.aql   |  36 +--
 .../optimizerts/queries/limit-issue353.aql      |  28 +--
 ...rjoin-probe-pidx-with-join-btree-sidx_01.aql |  24 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_02.aql |  26 +-
 ...idx-with-join-edit-distance-check-idx_01.aql |  30 +--
 ...robe-pidx-with-join-jaccard-check-idx_01.aql |  30 +--
 .../word-jaccard-check-after-btree-access.aql   |  34 +--
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.aql |  26 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.aql |  26 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_1.aql |  22 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_2.aql |  20 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_1.aql |  22 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_2.aql |  20 +-
 ...idx-with-join-edit-distance-check-idx_01.aql |  28 +--
 .../word-jaccard-check-after-btree-access.aql   |  32 +--
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.aql |  24 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.aql |  24 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_1.aql |  16 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_2.aql |  16 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_1.aql |  20 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_2.aql |  18 +-
 .../secondary-composite-key-join_01.aql         |   6 +-
 .../secondary-composite-key-join_02.aql         |   6 +-
 .../secondary-composite-key-join_03.aql         |   6 +-
 .../secondary-composite-key-prefix-join_01.aql  |   6 +-
 .../secondary-composite-key-prefix-join_02.aql  |   6 +-
 .../secondary-composite-key-prefix-join_03.aql  |   6 +-
 .../secondary-composite-key-prefix-join_04.aql  |   6 +-
 .../secondary-composite-key-prefix-join_05.aql  |   6 +-
 .../secondary-composite-key-prefix-join_06.aql  |   6 +-
 ...idx-with-join-edit-distance-check-idx_01.aql |  22 +-
 .../word-jaccard-check-after-btree-access.aql   |  30 +--
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.aql |  22 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.aql |  22 +-
 .../optimizerts/queries/q09_group_by.aql        |  82 +++----
 .../test/resources/optimizerts/queries/q2.aql   |   4 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.aql |  30 +--
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.aql |  30 +--
 .../queries/scan-insert-secondary-index.aql     |  42 ++--
 .../optimizerts/queries/scan-insert.aql         |  40 +--
 .../btree-index/btree-datetime-01.sqlpp         |   2 +-
 .../btree-index/btree-datetime-02.sqlpp         |   2 +-
 .../btree-index/btree-datetime-03.sqlpp         |   2 +-
 .../btree-index/btree-datetime-04.sqlpp         |   2 +-
 .../word-jaccard-check-after-btree-access.sqlpp |   4 +-
 .../queries_sqlpp/limit-issue353.sqlpp          |   2 +-
 .../word-jaccard-check-after-btree-access.sqlpp |   4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |   4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |   4 +-
 .../resources/parserts/queries/functionDecl.aql |   4 +-
 .../resources/parserts/queries/nestedFLWOGR.aql |   6 +-
 .../parserts/queries/nestedFLWOGR1.aql          |   8 +-
 .../parserts/queries/nestedFLWOGR2.aql          |   8 +-
 .../queries/binary/insert/insert.2.update.aql   |  12 +-
 .../custord/join_q_04/join_q_04.2.update.aql    |   2 +-
 .../custord/join_q_04/join_q_04.3.query.aql     |  16 +-
 .../runtimets/queries/dapd/q2/q2.1.ddl.aql      |   2 +-
 .../query-issue443/query-issue443.3.query.aql   |   2 +-
 .../delete-multi-statement.1.ddl.aql            |  76 +++---
 ...ataset-with-index-on-open-field.2.update.aql |  10 +-
 ...ert-and-scan-dataset-with-index.2.update.aql |  14 +-
 .../insert-and-scan-dataset.2.update.aql        |   8 +-
 ...insert-and-scan-joined-datasets.2.update.aql |  12 +-
 ...t-into-empty-dataset-with-index.2.update.aql |  16 +-
 .../insert-into-empty-dataset.2.update.aql      |  16 +-
 ...to-loaded-dataset-with-index_01.4.update.aql |  12 +-
 ...to-loaded-dataset-with-index_02.4.update.aql |  12 +-
 .../insert-into-loaded-dataset_01.2.update.aql  |  14 +-
 .../insert-record-function.2.update.aql         |  16 +-
 .../queries/dml/insert/insert.2.update.aql      |  16 +-
 .../insert_less_nc/insert_less_nc.2.update.aql  |  16 +-
 .../load-with-index-open.2.update.aql           |   6 +-
 .../load-with-ngram-index-open.2.update.aql     |   4 +-
 .../load-with-rtree-index-open.2.update.aql     |   6 +-
 .../load-with-word-index-open.2.update.aql      |   4 +-
 .../opentype-c2o-recursive.2.update.aql         |   8 +-
 .../dml/opentype-c2o/opentype-c2o.1.ddl.aql     |   4 +-
 .../dml/opentype-c2o/opentype-c2o.2.update.aql  |  16 +-
 .../dml/opentype-c2o/opentype-c2o.3.query.aql   |   6 +-
 .../opentype-insert2/opentype-insert2.1.ddl.aql |   2 +-
 .../opentype-insert2.2.update.aql               |   4 +-
 .../opentype-insert2.3.query.aql                |   4 +-
 .../opentype-noexpand.1.ddl.aql                 |   6 +-
 .../opentype-noexpand.2.update.aql              |   4 +-
 .../opentype-noexpand.3.query.aql               |   6 +-
 .../opentype-o2c-recursive.2.update.aql         |   8 +-
 .../dml/opentype-o2c/opentype-o2c.1.ddl.aql     |   6 +-
 .../dml/opentype-o2c/opentype-o2c.2.update.aql  |  10 +-
 .../dml/opentype-o2c/opentype-o2c.3.query.aql   |   6 +-
 .../dml/opentype-o2o/opentype-o2o.1.ddl.aql     |   4 +-
 .../dml/opentype-o2o/opentype-o2o.2.update.aql  |  10 +-
 .../dml/opentype-o2o/opentype-o2o.3.query.aql   |   6 +-
 .../query-issue205/query-issue205.2.update.aql  |   2 +-
 .../query-issue205/query-issue205.3.query.aql   |   2 +-
 .../query-issue288/query-issue288.2.update.aql  |  10 +-
 .../dml/query-issue288/query-issue288.3.ddl.aql |   2 +-
 .../query-issue288/query-issue288.4.update.aql  |  18 +-
 .../query-issue288/query-issue288.5.query.aql   |   8 +-
 .../query-issue433/query-issue433.2.update.aql  |   2 +-
 .../query-issue433/query-issue433.3.query.aql   |   2 +-
 ...lete-btree-secondary-index-open.2.update.aql |  18 +-
 ...ndex-ngram-secondary-index-open.2.update.aql |   4 +-
 ...index-word-secondary-index-open.2.update.aql |   4 +-
 ...lete-rtree-secondary-index-open.2.update.aql |   4 +-
 ...-btree-secondary-index-nullable.4.update.aql |  20 +-
 ...sert-btree-secondary-index-open.4.update.aql |  20 +-
 ...-ngram-secondary-index-nullable.4.update.aql |  18 +-
 ...ndex-ngram-secondary-index-open.4.update.aql |  12 +-
 ...ted-index-ngram-secondary-index.4.update.aql |  18 +-
 ...x-word-secondary-index-nullable.4.update.aql |  18 +-
 ...index-word-secondary-index-open.4.update.aql |  12 +-
 ...rted-index-word-secondary-index.4.update.aql |  18 +-
 ...-rtree-secondary-index-nullable.4.update.aql |  10 +-
 ...sert-rtree-secondary-index-open.4.update.aql |  10 +-
 ...an-insert-rtree-secondary-index.4.update.aql |  10 +-
 .../queries/feeds/feeds_05/feeds_05.1.ddl.aql   |  28 +--
 .../insert-with-secondary-btree.4.update.aql    |   2 +-
 ...t-with-secondary-inverted-ngram.4.update.aql |   2 +-
 ...rt-with-secondary-inverted-word.4.update.aql |   2 +-
 .../insert-with-secondary-rtree.4.update.aql    |   2 +-
 .../queries/filters/insert/insert.4.update.aql  |   2 +-
 .../equality-predicate.2.update.aql             |   8 +-
 .../dblp-splits-3_1/dblp-splits-3_1.3.query.aql | 148 ++++++------
 .../fuzzyjoin/opentype/opentype.3.query.aql     |   6 +-
 .../btree-index-nested-loop-join.1.ddl.aql      |  32 +--
 .../btree-index-nested-loop-join.3.query.aql    |   2 +-
 ...robe-pidx-with-join-invidx-sidx1.3.query.aql |   6 +-
 ...robe-pidx-with-join-invidx-sidx2.3.query.aql |   6 +-
 ...ndex-composite-key-mixed-intervals.1.ddl.aql |   2 +-
 ...x-composite-key-mixed-intervals.2.update.aql |   2 +-
 ...ex-composite-key-mixed-intervals.3.query.aql |   4 +-
 .../query_issue285-2.3.query.aql                |   8 +-
 .../query_issue285/query_issue285.3.query.aql   |   8 +-
 .../query-issue428/query-issue428.3.query.aql   |   2 +-
 ...compact-dataset-and-its-indexes.2.update.aql |   8 +-
 .../drop-index/drop-index.2.update.aql          |   8 +-
 .../nested-uuid-load/nested-uuid-load.1.ddl.aql |   2 +-
 ...-btree-secondary-index-nullable.2.update.aql |   8 +-
 ...-ngram-secondary-index-nullable.2.update.aql |   8 +-
 ...ted-index-ngram-secondary-index.2.update.aql |   8 +-
 ...x-word-secondary-index-nullable.2.update.aql |   8 +-
 ...rted-index-word-secondary-index.2.update.aql |   8 +-
 ...-rtree-secondary-index-nullable.2.update.aql |   8 +-
 ...an-delete-rtree-secondary-index.2.update.aql |   8 +-
 ...-btree-secondary-index-nullable.4.update.aql |  28 +--
 ...-ngram-secondary-index-nullable.4.update.aql |  12 +-
 ...ted-index-ngram-secondary-index.4.update.aql |  12 +-
 ...x-word-secondary-index-nullable.4.update.aql |  12 +-
 ...rted-index-word-secondary-index.4.update.aql |  12 +-
 ...-rtree-secondary-index-nullable.4.update.aql |  10 +-
 ...an-insert-rtree-secondary-index.2.update.aql |  16 +-
 ...an-insert-rtree-secondary-index.4.update.aql |  10 +-
 .../leftouterjoin-rtree.1.ddl.aql               |  26 +-
 .../leftouterjoin/leftouterjoin.1.ddl.aql       |  26 +-
 .../btree-primary-equi-join.2.update.aql        |  16 +-
 .../btree-secondary-equi-join.2.update.aql      |  16 +-
 .../ngram-edit-distance-inline.2.update.aql     |  16 +-
 .../ngram-edit-distance.2.update.aql            |  16 +-
 .../ngram-jaccard-inline.2.update.aql           |  16 +-
 .../ngram-jaccard/ngram-jaccard.2.update.aql    |  16 +-
 .../rtree-spatial-intersect-point.2.update.aql  |  16 +-
 .../word-jaccard-inline.2.update.aql            |  16 +-
 .../word-jaccard/word-jaccard.2.update.aql      |  16 +-
 .../probe-pidx-with-join-btree-sidx1.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-btree-sidx1.2.update.aql |   8 +-
 .../probe-pidx-with-join-btree-sidx2.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-btree-sidx2.2.update.aql |   8 +-
 .../probe-pidx-with-join-invidx-sidx1.1.ddl.aql |  24 +-
 ...obe-pidx-with-join-invidx-sidx1.2.update.aql |   8 +-
 ...robe-pidx-with-join-invidx-sidx1.3.query.aql |   2 +-
 .../probe-pidx-with-join-invidx-sidx2.1.ddl.aql |  24 +-
 ...obe-pidx-with-join-invidx-sidx2.2.update.aql |   8 +-
 ...robe-pidx-with-join-invidx-sidx2.3.query.aql |   2 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-rtree-sidx1.2.update.aql |   8 +-
 .../probe-pidx-with-join-rtree-sidx2.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-rtree-sidx2.2.update.aql |   8 +-
 ...ndex-composite-key-mixed-intervals.1.ddl.aql |   2 +-
 ...x-composite-key-mixed-intervals.2.update.aql |  20 +-
 ...ex-composite-key-mixed-intervals.4.query.aql |   2 +-
 .../btree-index-composite-key.2.update.aql      |  18 +-
 .../btree-index-rewrite-multiple.2.update.aql   |   8 +-
 .../cust-index-age-nullable.2.update.aql        |   8 +-
 .../inverted-index-ngram-contains.2.update.aql  |   8 +-
 ...ex-ngram-edit-distance-contains.2.update.aql |   8 +-
 ...index-ngram-edit-distance-panic.2.update.aql |   8 +-
 ...ngram-edit-distance-word-tokens.2.update.aql |   8 +-
 ...erted-index-ngram-edit-distance.2.update.aql |   8 +-
 .../inverted-index-ngram-jaccard.2.update.aql   |   8 +-
 ...index-olist-edit-distance-panic.2.update.aql |   8 +-
 ...erted-index-olist-edit-distance.2.update.aql |   8 +-
 .../inverted-index-olist-jaccard.2.update.aql   |   8 +-
 .../inverted-index-ulist-jaccard.2.update.aql   |   8 +-
 .../inverted-index-word-contains.2.update.aql   |   8 +-
 .../inverted-index-word-jaccard.2.update.aql    |   8 +-
 ...-index-custkey-conjunctive-open.2.update.aql |   8 +-
 ...rders-index-custkey-conjunctive.2.update.aql |   8 +-
 .../orders-index-custkey-open.2.update.aql      |   8 +-
 .../orders-index-custkey.2.update.aql           |   8 +-
 .../range-search-open.2.update.aql              |   8 +-
 .../range-search/range-search.2.update.aql      |   8 +-
 .../rtree-secondary-index-nullable.2.update.aql |   8 +-
 .../rtree-secondary-index-open.2.update.aql     |   8 +-
 .../rtree-secondary-index.2.update.aql          |   8 +-
 .../leftouterjoin-rtree.1.ddl.aql               |  20 +-
 .../leftouterjoin/leftouterjoin.1.ddl.aql       |  20 +-
 .../bottom-closed-top-closed.1.ddl.aql          |  50 ++--
 .../bottom-closed-top-closed.2.update.aql       | 106 ++++----
 .../bottom-closed-top-closed.3.query.aql        |   6 +-
 .../bottom-closed-top-open.1.ddl.aql            |  48 ++--
 .../bottom-closed-top-open.2.update.aql         | 106 ++++----
 .../bottom-closed-top-open.3.query.aql          |   6 +-
 .../bottom-open-top-closed.1.ddl.aql            |  48 ++--
 .../bottom-open-top-closed.2.update.aql         | 106 ++++----
 .../bottom-open-top-closed.3.query.aql          |   6 +-
 .../bottom-open-top-open.1.ddl.aql              |  46 ++--
 .../bottom-open-top-open.2.update.aql           | 106 ++++----
 .../bottom-open-top-open.3.query.aql            |   6 +-
 .../btree-secondary-equi-join.2.update.aql      |  38 +--
 .../ngram-edit-distance-inline.2.update.aql     |  40 +--
 .../ngram-edit-distance.2.update.aql            |  40 +--
 .../ngram-jaccard-inline.2.update.aql           |  38 +--
 .../ngram-jaccard/ngram-jaccard.2.update.aql    |  38 +--
 .../rtree-spatial-intersect-point.2.update.aql  |  48 ++--
 .../word-jaccard-inline.2.update.aql            |  38 +--
 .../word-jaccard/word-jaccard.2.update.aql      |  38 +--
 .../probe-pidx-with-join-btree-sidx1.1.ddl.aql  |  22 +-
 ...robe-pidx-with-join-btree-sidx1.2.update.aql |  36 +--
 ...probe-pidx-with-join-btree-sidx1.3.query.aql |   8 +-
 .../probe-pidx-with-join-btree-sidx2.1.ddl.aql  |  22 +-
 ...robe-pidx-with-join-btree-sidx2.2.update.aql |  36 +--
 .../probe-pidx-with-join-invidx-sidx2.1.ddl.aql |  26 +-
 ...obe-pidx-with-join-invidx-sidx2.2.update.aql |  36 +--
 ...robe-pidx-with-join-invidx-sidx2.3.query.aql |   2 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-rtree-sidx1.2.update.aql |  36 +--
 .../probe-pidx-with-join-rtree-sidx2.1.ddl.aql  |  24 +-
 ...robe-pidx-with-join-rtree-sidx2.2.update.aql |  36 +--
 ...ndex-composite-key-mixed-intervals.1.ddl.aql |   2 +-
 ...x-composite-key-mixed-intervals.2.update.aql |  38 +--
 ...ndex-composite-key-mixed-intervals.3.ddl.aql |   2 +-
 ...ex-composite-key-mixed-intervals.4.query.aql |   2 +-
 .../btree-index-composite-key.2.update.aql      |  18 +-
 .../btree-index-rewrite-multiple.2.update.aql   |  20 +-
 .../inverted-index-ngram-contains.2.update.aql  |  30 +--
 ...ex-ngram-edit-distance-contains.2.update.aql |  30 +--
 ...index-ngram-edit-distance-panic.2.update.aql |  30 +--
 ...ngram-edit-distance-word-tokens.2.update.aql |  30 +--
 ...erted-index-ngram-edit-distance.2.update.aql |  30 +--
 .../inverted-index-ngram-jaccard.2.update.aql   |  30 +--
 .../inverted-index-word-contains.2.update.aql   |  30 +--
 .../inverted-index-word-jaccard.2.update.aql    |  30 +--
 ...rders-index-custkey-conjunctive.2.update.aql |   8 +-
 .../orders-index-custkey.2.update.aql           |  38 +--
 .../range-search/range-search.2.update.aql      |  52 ++--
 .../rtree-secondary-index.2.update.aql          |  38 +--
 .../queries/numeric/abs0/abs0.3.query.aql       |   2 +-
 .../queries/numeric/abs1/abs1.3.query.aql       |   2 +-
 .../numeric/ceiling0/ceiling0.3.query.aql       |   2 +-
 .../numeric/ceiling1/ceiling1.3.query.aql       |   2 +-
 .../queries/numeric/floor0/floor0.3.query.aql   |   2 +-
 .../queries/numeric/floor1/floor1.3.query.aql   |   2 +-
 .../round-half-to-even0.3.query.aql             |   2 +-
 .../round-half-to-even1.3.query.aql             |   2 +-
 .../round-half-to-even20.3.query.aql            |   2 +-
 .../round-half-to-even21.3.query.aql            |   2 +-
 .../queries/numeric/round0/round0.3.query.aql   |   2 +-
 .../queries/numeric/round1/round1.3.query.aql   |   2 +-
 .../query-issue134/query-issue134.1.ddl.aql     |   2 +-
 .../query-issue134/query-issue134.2.update.aql  |   2 +-
 .../query-issue134/query-issue134.3.query.aql   |   2 +-
 .../query-issue166/query-issue166.1.ddl.aql     |   4 +-
 .../query-issue166/query-issue166.2.update.aql  |   4 +-
 .../query-issue166/query-issue166.3.query.aql   |   4 +-
 .../query-issue196/query-issue196.2.update.aql  |   2 +-
 .../query-issue196/query-issue196.3.query.aql   |   2 +-
 .../query-issue208/query-issue208.2.update.aql  |   2 +-
 .../query-issue208/query-issue208.3.query.aql   |   2 +-
 .../query-issue236/query-issue236.2.update.aql  |  22 +-
 .../query-issue236/query-issue236.3.query.aql   |   2 +-
 .../query-issue258/query-issue258.2.update.aql  |   4 +-
 .../query-issue258/query-issue258.3.query.aql   |   2 +-
 .../query-issue29/query-issue29.1.ddl.aql       |   2 +-
 .../query-issue29/query-issue29.2.update.aql    |   2 +-
 .../query-issue29/query-issue29.3.query.aql     |   4 +-
 .../query-issue343-2.2.update.aql               |   2 +-
 .../query-issue343-2.3.query.aql                |   2 +-
 .../query-issue343/query-issue343.2.update.aql  |   2 +-
 .../query-issue343/query-issue343.3.query.aql   |   2 +-
 .../query-issue350-2/query-issue350-2.1.ddl.aql |   4 +-
 .../query-issue350-2.2.update.aql               |   2 +-
 .../query-issue350-2.3.query.aql                |   2 +-
 .../query-issue350/query-issue350.1.ddl.aql     |   4 +-
 .../query-issue350/query-issue350.2.update.aql  |   2 +-
 .../query-issue350/query-issue350.3.query.aql   |   2 +-
 .../query-issue377/query-issue377.2.update.aql  |   2 +-
 .../query-issue377/query-issue377.3.query.aql   |   2 +-
 .../query-issue410/query-issue410.1.ddl.aql     |   2 +-
 .../query-issue410/query-issue410.2.update.aql  |   4 +-
 .../query-issue410/query-issue410.3.query.aql   |   2 +-
 .../query-issue423-2/query-issue423-2.1.ddl.aql |   4 +-
 .../query-issue423-2.2.update.aql               |   6 +-
 .../query-issue423-2.3.query.aql                |   8 +-
 .../query-issue423/query-issue423.1.ddl.aql     |   6 +-
 .../query-issue423/query-issue423.2.update.aql  |   6 +-
 .../query-issue423/query-issue423.3.query.aql   |   8 +-
 .../query-issue442/query-issue442.3.query.aql   |   2 +-
 .../query-issue453-2.2.update.aql               |   4 +-
 .../query-issue453-2.3.query.aql                |   2 +-
 .../query-issue453/query-issue453.2.update.aql  |   2 +-
 .../query-issue453/query-issue453.3.query.aql   |   2 +-
 .../query-issue487/query-issue487.1.ddl.aql     |   6 +-
 .../query-issue487/query-issue487.2.update.aql  |   4 +-
 .../query-issue487/query-issue487.3.query.aql   |   4 +-
 .../query-issue55-1/query-issue55-1.1.ddl.aql   |   2 +-
 .../query-issue55-1.2.update.aql                |   2 +-
 .../query-issue55-1/query-issue55-1.3.query.aql |   2 +-
 .../query-issue55/query-issue55.1.ddl.aql       |   2 +-
 .../query-issue55/query-issue55.2.update.aql    |   2 +-
 .../query-issue55/query-issue55.3.query.aql     |   2 +-
 .../query-issue656/query-issue656.1.ddl.aql     |   2 +-
 .../query-issue656/query-issue656.2.update.aql  |  10 +-
 .../leftouterjoin-rtree.1.ddl.aql               |  20 +-
 .../leftouterjoin/leftouterjoin.1.ddl.aql       |  20 +-
 .../btree-secondary-equi-join.2.update.aql      |  24 +-
 .../ngram-edit-distance-inline.2.update.aql     |  24 +-
 .../ngram-edit-distance.2.update.aql            |  24 +-
 .../ngram-jaccard-inline.2.update.aql           |  22 +-
 .../ngram-jaccard/ngram-jaccard.2.update.aql    |  22 +-
 .../rtree-spatial-intersect-point.2.update.aql  |  30 +--
 .../word-jaccard-inline.2.update.aql            |  22 +-
 .../word-jaccard/word-jaccard.2.update.aql      |  22 +-
 .../probe-pidx-with-join-btree-sidx1.1.ddl.aql  |  20 +-
 ...robe-pidx-with-join-btree-sidx1.2.update.aql |  28 +--
 .../probe-pidx-with-join-btree-sidx2.1.ddl.aql  |  20 +-
 ...robe-pidx-with-join-btree-sidx2.2.update.aql |  28 +--
 .../probe-pidx-with-join-invidx-sidx2.1.ddl.aql |  20 +-
 ...obe-pidx-with-join-invidx-sidx2.2.update.aql |  28 +--
 ...robe-pidx-with-join-invidx-sidx2.3.query.aql |   2 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ddl.aql  |  22 +-
 ...robe-pidx-with-join-rtree-sidx1.2.update.aql |  28 +--
 .../probe-pidx-with-join-rtree-sidx2.1.ddl.aql  |  22 +-
 ...robe-pidx-with-join-rtree-sidx2.2.update.aql |  28 +--
 ...ndex-composite-key-mixed-intervals.1.ddl.aql |   2 +-
 ...x-composite-key-mixed-intervals.2.update.aql |  22 +-
 ...ndex-composite-key-mixed-intervals.3.ddl.aql |   2 +-
 ...ex-composite-key-mixed-intervals.4.query.aql |  12 +-
 .../btree-index-composite-key.2.update.aql      |   4 +-
 .../btree-index-composite-key.4.query.aql       |  10 +-
 .../btree-index-rewrite-multiple.2.update.aql   |  30 +--
 .../inverted-index-ngram-contains.2.update.aql  |  22 +-
 ...ex-ngram-edit-distance-contains.2.update.aql |  22 +-
 ...index-ngram-edit-distance-panic.2.update.aql |  22 +-
 ...ngram-edit-distance-word-tokens.2.update.aql |  22 +-
 ...erted-index-ngram-edit-distance.2.update.aql |  22 +-
 .../inverted-index-ngram-jaccard.2.update.aql   |  22 +-
 .../inverted-index-word-contains.2.update.aql   |  22 +-
 .../inverted-index-word-jaccard.2.update.aql    |  22 +-
 ...rders-index-custkey-conjunctive.2.update.aql |   4 +-
 .../orders-index-custkey.2.update.aql           |   4 +-
 .../range-search/range-search.2.update.aql      |  44 ++--
 .../rtree-secondary-index.2.update.aql          |  30 +--
 .../access-nested-fields.1.ddl.aql              |  40 +--
 .../queries/scan/invalid-scan-syntax.aql        |   2 +-
 .../invalid-scan-syntax.1.ddl.aql               |   2 +-
 .../invalid-scan-syntax.2.update.aql            |   2 +-
 .../invalid-scan-syntax.3.query.aql             |   2 +-
 .../spatial_types_02/spatial_types_02.1.ddl.aql |   6 +-
 .../scan/temp_types_02/temp_types_02.1.ddl.aql  |   4 +-
 ...y-jaccard-check_strings_issue628.3.query.aql |   8 +-
 .../cell-aggregation-with-filtering.3.query.aql |   8 +-
 ...ert-and-scan-dataset-with-index.2.update.aql |  12 +-
 .../insert-and-scan-dataset.2.update.aql        |   8 +-
 .../scan-insert-persistent-to-temp.4.update.aql |  12 +-
 ...an-insert-rtree-secondary-index.4.update.aql |  12 +-
 .../scan-insert-temp-to-persistent.4.update.aql |  12 +-
 .../insert_from_ext_ds_2.1.ddl.aql              |   8 +-
 .../q05_local_supplier_volume.1.ddl.aql         |  78 +++---
 .../q06_forecast_revenue_change.1.ddl.aql       |  78 +++---
 .../q07_volume_shipping.1.ddl.aql               |  76 +++---
 .../q08_national_market_share.1.ddl.aql         |  76 +++---
 .../q09_product_type_profit_nt.1.ddl.aql        |  76 +++---
 .../q10_returned_item.1.ddl.aql                 |  76 +++---
 .../q10_returned_item_int64.1.ddl.aql           |  76 +++---
 .../tpch/q12_shipping/q12_shipping.1.ddl.aql    |  76 +++---
 .../q14_promotion_effect.1.ddl.aql              |  76 +++---
 .../q17_small_quantity_order_revenue.1.ddl.aql  |  76 +++---
 .../q19_discounted_revenue.1.ddl.aql            |  76 +++---
 .../q20_potential_part_promotion.1.ddl.aql      |  76 +++---
 .../q22_global_sales_opportunity.1.ddl.aql      |  76 +++---
 .../query-issue638/query-issue638.1.ddl.aql     |  20 +-
 .../query-issue785/query-issue785.3.query.aql   |   6 +-
 .../query-issue172/query-issue172.1.ddl.aql     |   4 +-
 .../query-issue172/query-issue172.2.update.aql  |   2 +-
 .../query-issue172/query-issue172.3.query.aql   |   2 +-
 .../query-issue201/query-issue201.1.ddl.aql     |   4 +-
 .../query-issue201/query-issue201.2.update.aql  |   2 +-
 .../query-issue201/query-issue201.3.query.aql   |   2 +-
 .../query-issue218-2/query-issue218-2.1.ddl.aql |   4 +-
 .../query-issue218-2.2.update.aql               |   2 +-
 .../query-issue218-2.3.query.aql                |   2 +-
 .../query-issue218/query-issue218.1.ddl.aql     |   2 +-
 .../query-issue218/query-issue218.2.update.aql  |   2 +-
 .../query-issue218/query-issue218.3.query.aql   |   2 +-
 .../query-issue244/query-issue244.2.update.aql  |   4 +-
 .../query-issue244/query-issue244.3.query.aql   |   6 +-
 .../query-issue455/query-issue455.1.ddl.aql     |   6 +-
 .../query-issue455/query-issue455.2.update.aql  |   2 +-
 .../query-issue455/query-issue455.3.query.aql   |   4 +-
 .../query-issue455/query-issue455.4.ddl.aql     |   4 +-
 .../query-issue455/query-issue455.5.query.aql   |   4 +-
 .../query-issue489/query-issue489.1.ddl.aql     |   4 +-
 .../query-issue489/query-issue489.2.query.aql   |   2 +-
 .../query-issue489/query-issue489.3.ddl.aql     |   4 +-
 .../query-issue489/query-issue489.4.query.aql   |   2 +-
 asterixdb/asterix-common/pom.xml                |   2 +-
 .../src/main/resources/schema/cluster.xsd       | 242 +++++++++----------
 .../src/main/resources/schema/yarn_cluster.xsd  |   6 +-
 asterixdb/asterix-experiments/pom.xml           |   6 +-
 .../src/main/resources/schema/library.xsd       | 106 ++++----
 .../hadoop-0.20.2/bin/hadoop-config.sh          |  12 +-
 .../dataset_recovery/dataset_recovery.2.ddl.aql |  12 +-
 .../datatype_recovery.2.ddl.aql                 |  12 +-
 .../secondary_index_recovery.2.ddl.aql          |  12 +-
 .../dataset_recovery.2.ddl.aql                  |  12 +-
 .../secondary_index_recovery.2.ddl.aql          |  12 +-
 .../asterix-lang-aql/src/main/javacc/AQL.jj     |  26 +-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj |  30 +--
 .../APolygonConstructorDescriptor.java          |  12 +-
 asterixdb/pom.xml                               |   2 +
 .../algebricks-tests/src/main/scripts/run.sh    |   2 +-
 .../src/main/resources/bin/getip.sh             |  14 +-
 .../src/main/resources/bin/startDebugNc.sh      |   4 +-
 .../src/main/resources/bin/startnc.sh           |   4 +-
 .../src/main/resources/bin/stopnc.sh            |   2 +-
 .../hyracks-integration-tests/pom.xml           |   2 +-
 hyracks-fullstack/pom.xml                       |   2 +
 456 files changed, 3773 insertions(+), 3756 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-algebra/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/pom.xml b/asterixdb/asterix-algebra/pom.xml
index fce8568..4343a00 100644
--- a/asterixdb/asterix-algebra/pom.xml
+++ b/asterixdb/asterix-algebra/pom.xml
@@ -1,14 +1,21 @@
-<!-- ! 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. ! -->
+<!--
+ ! 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.
+ !-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj b/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj
index b10d837..c2ed8e1 100644
--- a/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj
+++ b/asterixdb/asterix-algebra/src/main/javacc/AQLPlus.jj
@@ -1491,8 +1491,8 @@ QuantifiedExpression QuantifiedExpression()throws ParseException:
     createNewScope();
   }
 
-   (      ("some"  {  qc.setQuantifier(QuantifiedExpression.Quantifier.SOME);	})
-        | ("every" {  qc.setQuantifier(QuantifiedExpression.Quantifier.EVERY);	}))
+   (      ("some"  {  qc.setQuantifier(QuantifiedExpression.Quantifier.SOME);    })
+        | ("every" {  qc.setQuantifier(QuantifiedExpression.Quantifier.EVERY);    }))
     var = Variable() "in" inExpr = Expression()
     {
       pair = new QuantifiedPair(var, inExpr);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/scripts/idefix/startcc.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/scripts/idefix/startcc.sh b/asterixdb/asterix-app/scripts/idefix/startcc.sh
index 014330e..c0afbf2 100644
--- a/asterixdb/asterix-app/scripts/idefix/startcc.sh
+++ b/asterixdb/asterix-app/scripts/idefix/startcc.sh
@@ -15,9 +15,9 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#/bin/bash	
+#/bin/bash
 
 export JAVA_OPTS="-DAsterixConfigFileName=test.properties -Djava.util.logging.config.file=/home/nicnic/Work/Asterix/hyracks/logging.properties"
 export HYRACKS_HOME="/home/nicnic/workspace/hyracks/tags/hyracks-0.1.5"
-bash ${HYRACKS_HOME}/hyracks-server/target/appassembler/bin/hyrackscc 
+bash ${HYRACKS_HOME}/hyracks-server/target/appassembler/bin/hyrackscc
 #bash /home/nicnic/workspace/hyracks/trunk/hyracks/hyracks-server/target/appassembler/bin/hyrackscc

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/main/scripts/run.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/scripts/run.sh b/asterixdb/asterix-app/src/main/scripts/run.sh
index 4915636..47eb2a3 100644
--- a/asterixdb/asterix-app/src/main/scripts/run.sh
+++ b/asterixdb/asterix-app/src/main/scripts/run.sh
@@ -84,7 +84,7 @@ fi
 # Try to find directory where this script is located
 COMMAND="${PWD}/$0"
 if [ ! -f "${COMMAND}" ]; then
-	COMMAND="$0"
+    COMMAND="$0"
 fi
 BASEDIR=`expr "${COMMAND}" : '\(.*\)/\.*'`
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql b/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
index f40f857..3b46729 100644
--- a/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterixdb/asterix-app/src/test/resources/dapd/q2.aql
@@ -19,10 +19,10 @@
 use dataverse events;
 
 declare type EventType as closed {
-  event_id: int64, 
+  event_id: int64,
   name: string,
-  location: AddressType	?,
-  organizers: {{ 
+  location: AddressType ?,
+  organizers: {{
    {
      name: string
    }
@@ -49,15 +49,15 @@ declare type AddressType as closed {
 declare nodegroup group1 on asterix_nc1;
 
 /*
-declare dataset Event(EventType) 
+declare dataset Event(EventType)
   splits asterix_nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
 */
 
 drop dataset Event;
-declare dataset Event(EventType) 
+declare dataset Event(EventType)
   primary key event_id on group1;
 
-load dataset Event 
+load dataset Event
 using localfs
 (("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
index 6967155..67fa306 100644
--- a/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
+++ b/asterixdb/asterix-app/src/test/resources/nontagged/custord/local/cust-load.aql
@@ -26,17 +26,17 @@ write output to asterix_nc1:"/home/yasser/Dropbox/metadata.adm";
 declare type DataverseType as open {
 dataverseName : string,
 DataverseInfo : {
-	CreatedOn: string,
-	Comments : string 
-				}
+    CreatedOn: string,
+    Comments : string
+                }
 }
 
 
 declare nodegroup group1 on asterix_nc1;
 
 declare dataset Dataverse(DataverseType)
-  primary key dataverseName on group1;        
-      
+  primary key dataverseName on group1;
+
 for $c in dataset('Dataverse')
 return $c
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
index f69d2c8..38032f5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                 
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,23 +28,23 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -63,9 +63,9 @@ order by $t1.tweetid
 return {
 "tweetid1": $t1.tweetid,
 "count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages') 
+"t2info": for $t2 in dataset('TweetMessages')
           where $t1.countA /* +indexnl */= $t2.countB
-          order by $t2.tweetid 
+          order by $t2.tweetid
           return {"tweetid2": $t2.tweetid,
                   "count2":$t2.countB}
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
index a326108..e757455 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                 
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,23 +28,23 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -63,10 +63,10 @@ order by $t1.tweetid
 return {
 "tweetid1": $t1.tweetid,
 "count1":$t1.countA,
-"t2info": for $t2 in dataset('TweetMessages') 
+"t2info": for $t2 in dataset('TweetMessages')
                         where $t1.countA /* +indexnl */= $t2.countB and
                         $t1.tweetid != $t2.tweetid
-                        order by $t2.tweetid 
+                        order by $t2.tweetid
                         return {"tweetid2": $t2.tweetid,
                                        "count2":$t2.countB}
 };

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
index 7179d54..407513e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-01.aql
@@ -17,11 +17,11 @@
  * under the License.
  */
 /*
- *  Description     : This test is intended to verify that the primary BTree index is used 
+ *  Description     : This test is intended to verify that the primary BTree index is used
  *                  : for an invocation of current-datetime()
  *  Expected Result : Success
  *  Date            : 27th Aug 2015
- *	Author			: Steven Jacobs
+ *    Author            : Steven Jacobs
  */
 
 drop dataverse emergencyTest if exists;
@@ -29,7 +29,7 @@ create dataverse emergencyTest;
 use dataverse emergencyTest;
 create type CHPReport as {
         "id":int,
-	"timestamp":datetime,
+    "timestamp":datetime,
         "title":string,
         "message":string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
index 8a5fe07..e6335ba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-02.aql
@@ -17,11 +17,11 @@
  * under the License.
  */
 /*
- *  Description     : This test is intended to verify that the primary BTree index is used 
+ *  Description     : This test is intended to verify that the primary BTree index is used
  *                  : for an invocation of current-datetime()
  *  Expected Result : Success
  *  Date            : 27th Aug 2015
- *	Author			: Steven Jacobs
+ *    Author            : Steven Jacobs
  */
 
 drop dataverse emergencyTest if exists;
@@ -29,7 +29,7 @@ create dataverse emergencyTest;
 use dataverse emergencyTest;
 create type CHPReport as {
         "id":int,
-	"timestamp":datetime,
+    "timestamp":datetime,
         "title":string,
         "message":string
 }
@@ -39,4 +39,4 @@ primary key timestamp;
 for $emergency in dataset CHPReports
 let $time := current-datetime() - day-time-duration("PT10H")
 where $emergency.timestamp >= $time
-return $emergency;
\ No newline at end of file
+return $emergency;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
index f3b49ad..df6f528 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-03.aql
@@ -17,11 +17,11 @@
  * under the License.
  */
 /*
- *  Description     : This test is intended to verify that the primary BTree index is used 
+ *  Description     : This test is intended to verify that the primary BTree index is used
  *                  : for an invocation of current-datetime()
  *  Expected Result : Success
  *  Date            : 27th Aug 2015
- *	Author			: Steven Jacobs
+ *    Author            : Steven Jacobs
  */
 
 drop dataverse emergencyTest if exists;
@@ -29,7 +29,7 @@ create dataverse emergencyTest;
 use dataverse emergencyTest;
 create type CHPReport as {
         "id":int,
-	"timestamp":datetime,
+    "timestamp":datetime,
         "title":string,
         "message":string
 }
@@ -38,4 +38,4 @@ primary key timestamp;
 
 for $emergency in dataset CHPReports
 where $emergency.timestamp >= current-datetime()
-return $emergency;
\ No newline at end of file
+return $emergency;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
index 59014bc..5af8ce9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index/btree-datetime-04.aql
@@ -20,7 +20,7 @@
  *  Description     : This test makes sure that the plan is still okay when not converted to index search
  *  Expected Result : Success
  *  Date            : 27th Aug 2015
- *	Author			: Steven Jacobs
+ *    Author            : Steven Jacobs
  */
 
 drop dataverse emergencyTest if exists;
@@ -28,7 +28,7 @@ create dataverse emergencyTest;
 use dataverse emergencyTest;
 create type CHPReport as {
         "id":int,
-	"timestamp":datetime,
+    "timestamp":datetime,
         "title":string,
         "message":string
 }
@@ -37,4 +37,4 @@ primary key id;
 
 for $emergency in dataset CHPReports
 where $emergency.timestamp >= current-datetime()
-return $emergency;
\ No newline at end of file
+return $emergency;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
index f43e993..a9fef5c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/distinct_aggregate.aql
@@ -21,21 +21,21 @@ create dataverse tpch;
 use dataverse tpch;
 
 create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
+  l_orderkey: int32,
+  l_partkey: int32,
+  l_suppkey: int32,
+  l_linenumber: int32,
+  l_quantity: double,
   l_extendedprice: double,
-  l_discount: double, 
+  l_discount: double,
   l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
+  l_returnflag: string,
+  l_linestatus: string,
   l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
+  l_commitdate: string,
+  l_receiptdate: string,
+  l_shipinstruct: string,
+  l_shipmode: string,
   l_comment: string
 }
 
@@ -45,24 +45,24 @@ create dataset LineItems_q1(LineItemType)
   primary key l_orderkey, l_linenumber on group1;
 
 write output to asterix_nc1:"rttest/tpch_q1_pricing_summary_report_nt.adm";
- 
-for $g in 
-( 
-	for $l in dataset('LineItems_q1')
-	where $l.l_shipdate <= '1998-09-02'
-	group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus, 
-			$l_suppkey := $l.l_suppkey with $l
-	return {
-		"l_returnflag": $l_returnflag,
-		"l_linestatus": $l_linestatus,
-		"l_suppkey": $l_suppkey
-	}
+
+for $g in
+(
+    for $l in dataset('LineItems_q1')
+    where $l.l_shipdate <= '1998-09-02'
+    group by $l_returnflag := $l.l_returnflag, $l_linestatus := $l.l_linestatus,
+            $l_suppkey := $l.l_suppkey with $l
+    return {
+        "l_returnflag": $l_returnflag,
+        "l_linestatus": $l_linestatus,
+        "l_suppkey": $l_suppkey
+    }
 )
-group by $l_returnflag := $g.l_returnflag, $l_linestatus := $g.l_linestatus  
+group by $l_returnflag := $g.l_returnflag, $l_linestatus := $g.l_linestatus
   with $g
 order by $l_returnflag, $l_linestatus
 return {
   "l_returnflag": $l_returnflag,
   "l_linestatus": $l_linestatus,
   "count_suppkey": count($g)
-}   
+}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
index fb63141..1c897eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset-with-index.aql
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* 
+/*
  * Test case Name  : insert-and-scan-dataset-with-index.aql
  * Description     : This test is intended to test inserting into a dataset that has a secondary index and scan
  * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
  * Expected Result : Success
  * Date            : July 11 2013
  */
- 
+
 drop dataverse test if exists;
 create dataverse test;
 
@@ -42,10 +42,10 @@ create index idx_employee_first_name on test.employee(fname);
 insert into dataset test.employee (
 for $x in dataset test.employee
 return {
-	"id": $x.id + 10000,
-	"fname": $x.fname,
-	"lname": $x.lname,
-	"age": $x.age,
-	"dept": $x.dept
+    "id": $x.id + 10000,
+    "fname": $x.fname,
+    "lname": $x.lname,
+    "age": $x.age,
+    "dept": $x.dept
 }
 );

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset.aql
index 06fc86a..0425ecf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-dataset.aql
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* 
+/*
  * Test case Name  : insert-and-scan-dataset.aql
  * Description     : This test is intended to test inserting into a dataset and scan it at the same time
  * where we insert a materializing to prevent the possibility of deadlatch.
  * Expected Result : Success
  * Date            : July 11 2013
  */
- 
+
 drop dataverse test if exists;
 create dataverse test;
 
@@ -39,6 +39,6 @@ create dataset myData(myDataType)
 insert into dataset myData (
 for $x in dataset myData
 return {
-	"id": $x.id + 1
+    "id": $x.id + 1
 }
 );

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
index d9a951e..201e598 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/insert-and-scan-joined-datasets.aql
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* 
+/*
  * Test case Name  : insert-and-scan-joined-datasets.aql
  * Description     : This test is intended to test inserting into a dataset where the incoming stream
-  is involve a join operation that has the same dataset. We insert a materializing to prevent the 
+  is involve a join operation that has the same dataset. We insert a materializing to prevent the
   possibility of deadlatch.
  * Expected Result : Success
  * Date            : July 11 2013
  */
- 
+
 drop dataverse test if exists;
 create dataverse test;
 
@@ -36,7 +36,7 @@ create type myDataType as open {
 
 create dataset myData(myDataType)
   primary key id;
-  
+
 create dataset myData2(myDataType)
   primary key id;
 
@@ -45,6 +45,6 @@ for $x in dataset myData2
 for $y in dataset myData
 where $x.id = $y.id
 return {
-	"id": $x.id + 1
+    "id": $x.id + 1
 }
 );

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/issue741.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/issue741.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/issue741.aql
index db0f001..8ddd03b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/issue741.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/issue741.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use an available inverted index in index subtree.
- * Issue        : 741              
+ * Issue        : 741
  * Expected Res : Success
  * Date         : 16th May 2014
  */
@@ -37,7 +37,7 @@ followers_count: int32
 }
 
 create type TweetMessageType as {
-tweetid: int64,     
+tweetid: int64,
 user: TwitterUserType,
 sender_location: point?,
 send_time: datetime,
@@ -53,13 +53,13 @@ write output to asterix_nc1:"rttest/inverted-index-join_issue741.adm";
 
 for $t in dataset('TweetMessages')
 where $t.send_time >= datetime('2011-06-18T14:10:17')
-and 
+and
 $t.send_time < datetime('2011-06-18T15:10:17')
-return {                     
-    "tweet": $t.tweetid,               
+return {
+    "tweet": $t.tweetid,
     "similar-tweets": for $t2 in dataset('TweetMessages')
                       let $sim := similarity-jaccard-check($t.referred_topics, $t2.referred_topics, 0.6f)
-		      where $sim[0] and 
+              where $sim[0] and
                       $t2.tweetid != $t.tweetid
                       return $t2.tweetid
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
index 5e8b180..bd52bac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                 
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,23 +28,23 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -63,10 +63,10 @@ for $t1 in dataset('TweetMessages')
 where $t1.tweetid > int64("240")
 order by $t1.tweetid
 return {
-    "tweet": {"id": $t1.tweetid, "topics" : $t1.message-text} ,             
+    "tweet": {"id": $t1.tweetid, "topics" : $t1.message-text} ,
     "similar-tweets": for $t2 in dataset('TweetMessages')
                       let $sim := edit-distance-check($t1.message-text, $t2.message-text, 7)
-		      where $sim[0] and 
+              where $sim[0] and
                       $t2.tweetid != $t1.tweetid
                       order by $t2.tweetid
                       return {"id": $t2.tweetid, "topics" : $t2.message-text}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
index c5d13c5..27b0e37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                 
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,23 +28,23 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -63,10 +63,10 @@ for $t1 in dataset('TweetMessages')
 where $t1.tweetid > int64("240")
 order by $t1.tweetid
 return {
-    "tweet": {"id": $t1.tweetid, "topics" : $t1.referred-topics} ,             
+    "tweet": {"id": $t1.tweetid, "topics" : $t1.referred-topics} ,
     "similar-tweets": for $t2 in dataset('TweetMessages')
                       let $sim := similarity-jaccard-check($t1.referred-topics, $t2.referred-topics, 0.5f)
-		      where $sim[0] and 
+              where $sim[0] and
                       $t2.tweetid != $t1.tweetid
                       order by $t2.tweetid
                       return {"id": $t2.tweetid, "topics" : $t2.referred-topics}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check-after-btree-access.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check-after-btree-access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check-after-btree-access.aql
index 39ed374..5586919 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check-after-btree-access.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/inverted-index-join/word-jaccard-check-after-btree-access.aql
@@ -18,9 +18,9 @@
  */
 /*
  * Description    : Fuzzy self joins a dataset, TweetMessages, based on the similarity-jaccard-check function of its text-messages' word tokens.
- *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be 
- *					transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into 
- *					multiple indexed nested loop joins of various type of indexes.
+ *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be
+ *                    transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
+ *                    multiple indexed nested loop joins of various type of indexes.
  * Success        : Yes
  */
 
@@ -29,23 +29,23 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageType as closed {
-	tweetid: int64,
-	user: TwitterUserType,
-	sender-location: point,
-	send-time: datetime,
-	referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    tweetid: int64,
+    user: TwitterUserType,
+    sender-location: point,
+    send-time: datetime,
+    referred-topics: {{ string }},
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
index 53ee86b..9c9e406 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/limit-issue353.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : This test case is to verify the fix for issue353
- 				: https://code.google.com/p/asterixdb/issues/detail?id=353
+                 : https://code.google.com/p/asterixdb/issues/detail?id=353
  * Expected Res : Success
  * Date         : 28th April 2013
  */
@@ -29,27 +29,27 @@ create dataverse tpch;
 use dataverse tpch;
 
 create type LineItemType as closed {
-  l_orderkey: int32, 
-  l_partkey: int32, 
-  l_suppkey: int32, 
-  l_linenumber: int32, 
-  l_quantity: double, 
+  l_orderkey: int32,
+  l_partkey: int32,
+  l_suppkey: int32,
+  l_linenumber: int32,
+  l_quantity: double,
   l_extendedprice: double,
-  l_discount: double, 
+  l_discount: double,
   l_tax: double,
-  l_returnflag: string, 
-  l_linestatus: string, 
+  l_returnflag: string,
+  l_linestatus: string,
   l_shipdate: string,
-  l_commitdate: string, 
-  l_receiptdate: string, 
-  l_shipinstruct: string, 
-  l_shipmode: string, 
+  l_commitdate: string,
+  l_receiptdate: string,
+  l_shipinstruct: string,
+  l_shipmode: string,
   l_comment: string
 }
 
 create dataset LineItem(LineItemType)
   primary key l_orderkey, l_linenumber;
-  
+
 write output to asterix_nc1:"/tmp/push_limit.adm";
 
 for $l in dataset('LineItem')

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
index 978fee3..93c9532 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.aql
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as closed {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
index e990e93..cb9a633 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.aql
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
-} 
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
+}
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as closed {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
index 4857735..90e7cb9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as closed {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -62,10 +62,10 @@ for $t1 in dataset('TweetMessages')
 where $t1.nested.tweetid > int64("240")
 order by $t1.nested.tweetid
 return {
-    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.message-text} ,            
+    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.message-text} ,
     "similar-tweets": for $t2 in dataset('TweetMessages')
                       let $sim := edit-distance-check($t1.nested.message-text, $t2.nested.message-text, 7)
-		      where $sim[0] and
+              where $sim[0] and
                       $t2.nested.tweetid != $t1.nested.tweetid
                       order by $t2.nested.tweetid
                       return {"id": $t2.nested.tweetid, "topics" : $t2.nested.message-text}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
index 50b2554..128b068 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as closed {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)
@@ -62,10 +62,10 @@ for $t1 in dataset('TweetMessages')
 where $t1.nested.tweetid > int64("240")
 order by $t1.nested.tweetid
 return {
-    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.referred-topics} ,            
+    "tweet": {"id": $t1.nested.tweetid, "topics" : $t1.nested.referred-topics} ,
     "similar-tweets": for $t2 in dataset('TweetMessages')
                       let $sim := similarity-jaccard-check($t1.nested.referred-topics, $t2.nested.referred-topics, 0.5f)
-		      where $sim[0] and
+              where $sim[0] and
                       $t2.nested.tweetid != $t1.nested.tweetid
                       order by $t2.nested.tweetid
                       return {"id": $t2.nested.tweetid, "topics" : $t2.nested.referred-topics}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
index abda422..0fd522d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.aql
@@ -19,8 +19,8 @@
 /*
  * Description    : Fuzzy self joins a dataset, TweetMessages, based on the similarity-jaccard-check function of its text-messages' word tokens.
  *                  TweetMessages has a keyword index on text-message and btree index on the primary key tweetid, and we expect the join to be
- *					transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
- *					multiple indexed nested loop joins of various type of indexes.
+ *                    transformed into btree and inverted indexed nested-loop joins. We test whether the join condition can be transformed into
+ *                    multiple indexed nested loop joins of various type of indexes.
  * Success        : Yes
  */
 
@@ -29,27 +29,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
-	user: TwitterUserType,
-	sender-location: point,
-	send-time: datetime,
-	referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    tweetid: int64,
+    user: TwitterUserType,
+    sender-location: point,
+    send-time: datetime,
+    referred-topics: {{ string }},
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as closed {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
index 96927f9..b259612 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as open {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as open {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
index 0899338..4fb3041 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary rtree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,27 +28,27 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as closed {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
-	message-text: string,
-	countA: int32,
-	countB: int32
+    message-text: string,
+    countA: int32,
+    countB: int32
 }
 
 create type TweetMessageType as open {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
index 4def993..7991694 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,26 +28,26 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as open {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
         message-text: string,
-	countA: int32
+    countA: int32
 }
 
 create type TweetMessageType as open {
-	nested:  TweetMessageNestedType
+    nested:  TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
index cf3aad2..81746b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,25 +28,25 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as open {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
         message-text: string
 }
 
 create type TweetMessageType as open {
-	nested:  TweetMessageNestedType
+    nested:  TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
index 29092d7..d23c8fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,26 +28,26 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as open {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
         message-text: string,
-	countA: int32
+    countA: int32
 }
 
 create type TweetMessageType as open {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d6cf641a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
index dc9961b..f58b102 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.aql
@@ -18,7 +18,7 @@
  */
 /*
  * Description  : Test that left-outer-join may use two available indexes, one for primary index in prob subtree and another for secondary btree index in index subtree.
- * Issue        : 730, 741                
+ * Issue        : 730, 741
  * Expected Res : Success
  * Date         : 8th May 2014
  */
@@ -28,25 +28,25 @@ create dataverse test;
 use dataverse test;
 
 create type TwitterUserType as closed {
-	screen-name: string,
-	lang: string,
-	friends-count: int32,
-	statuses-count: int32,
-	name: string,
-	followers-count: int32
+    screen-name: string,
+    lang: string,
+    friends-count: int32,
+    statuses-count: int32,
+    name: string,
+    followers-count: int32
 }
 
 create type TweetMessageNestedType as open {
-	tweetid: int64,
+    tweetid: int64,
         user: TwitterUserType,
         sender-location: point,
-	send-time: datetime,
+    send-time: datetime,
         referred-topics: {{ string }},
         message-text: string
 }
 
 create type TweetMessageType as open {
-	nested: TweetMessageNestedType
+    nested: TweetMessageNestedType
 }
 
 create dataset TweetMessages(TweetMessageType)


Mime
View raw message