You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by am...@apache.org on 2016/03/11 11:38:41 UTC

[19/19] incubator-asterixdb git commit: use localfs instead of the class name of the adapter

use localfs instead of the class name of the adapter

Change-Id: If0c8fafbbc52bbe0f7ac3ec8b5f23781a8017390
Reviewed-on: https://asterix-gerrit.ics.uci.edu/706
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>


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

Branch: refs/heads/master
Commit: 4db8a9d9bf223219e9565c8ee0e583c0bd89cd2f
Parents: 6f7efb6
Author: Till Westmann <ti...@apache.org>
Authored: Thu Mar 10 20:11:02 2016 -0800
Committer: abdullah alamoudi <ba...@gmail.com>
Committed: Fri Mar 11 02:32:35 2016 -0800

----------------------------------------------------------------------
 asterix-app/src/test/resources/dapd/q2.aql       |   2 +-
 .../resources/demo0216/01-load-dblp-large.aql    |   2 +-
 .../resources/demo0216/03-load-dblp-small.aql    |   2 +-
 .../test/resources/demo0927/local/load-cust.aql  |   2 +-
 .../test/resources/demo0927/local/load-ord.aql   |   2 +-
 .../resources/demo1112/local/01-load-cust.aql    |   2 +-
 .../resources/demo1112/local/03-load-ord.aql     |   2 +-
 .../resources/demo_aql/local/01-load-cust.aql    |   2 +-
 .../resources/demo_aql/local/04-load-ord.aql     |   2 +-
 .../resources/demo_aql/local/101-load-dblp.aql   |   2 +-
 .../test/resources/dmlts/scripts/load-cust.aql   |   2 +-
 .../fuzzyjoin/amerix/10-load-csx-small.aql       |   2 +-
 .../resources/fuzzyjoin/amerix/10-load-csx.aql   |   2 +-
 .../resources/fuzzyjoin/amerix/10-load-dblp.aql  |   2 +-
 .../test/resources/fuzzyjoin/dblp/010-load.aql   |   2 +-
 .../resources/fuzzyjoin/pub/010-load-dblp.aql    |   2 +-
 .../resources/fuzzyjoin/pub/040-load-csx.aql     |   2 +-
 .../fuzzyjoin/users-visitors/010-load-users.aql  |   2 +-
 .../users-visitors/040-load-visitors.aql         |   2 +-
 .../integration/updates/load-dataset.aql         |   2 +-
 .../metadata/results/custord/custord_q10.adm     |   2 +-
 .../queries/consolidate-selects-complex.aql      |   2 +-
 .../optimizerts/queries/count-tweets.aql         |   2 +-
 .../orders-index-search-conjunctive-open_01.aql  |   2 +-
 .../orders-index-search-conjunctive-open_02.aql  |   2 +-
 .../orders-index-search-conjunctive_01.aql       |   2 +-
 .../orders-index-search-conjunctive_02.aql       |   2 +-
 .../queries/q01_pricing_summary_report_nt.aql    |   2 +-
 .../queries/rtree-secondary-index-open.aql       |   2 +-
 .../queries/rtree-secondary-index.aql            |   2 +-
 .../scan-delete-rtree-secondary-index.aql        |   2 +-
 .../skip-index/skip-rtree-secondary-index.aql    |   2 +-
 .../consolidate-selects-complex.sqlpp            |   2 +-
 .../optimizerts/queries_sqlpp/count-tweets.sqlpp |   2 +-
 ...orders-index-search-conjunctive-open_01.sqlpp |   2 +-
 ...orders-index-search-conjunctive-open_02.sqlpp |   2 +-
 .../orders-index-search-conjunctive_01.sqlpp     |   2 +-
 .../orders-index-search-conjunctive_02.sqlpp     |   2 +-
 .../q01_pricing_summary_report_nt.sqlpp          |   2 +-
 .../rtree-secondary-index-open.sqlpp             |   2 +-
 .../queries_sqlpp/rtree-secondary-index.sqlpp    |   2 +-
 .../scan-delete-rtree-secondary-index.sqlpp      |   2 +-
 .../skip-index/skip-rtree-secondary-index.sqlpp  |   2 +-
 .../parserts/queries/load-del-dataset.aql        |   2 +-
 .../queries_sqlpp/load-del-dataset.sqlpp         |   2 +-
 .../avg_double_null/avg_double_null.1.ddl.aql    |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.aql        |   2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.aql      |   2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.aql      |   2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.aql      |   2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.aql        |   2 +-
 .../count_null/count_null.1.ddl.aql              |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.aql    |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.aql      |   2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.aql      |   2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.aql      |   2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.aql      |   2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.aql        |   2 +-
 .../avg_double_null/avg_double_null.1.ddl.aql    |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.aql        |   2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.aql      |   2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.aql      |   2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.aql      |   2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.aql        |   2 +-
 .../aggregate/count_null/count_null.1.ddl.aql    |   2 +-
 .../global-avg_null/global-avg_null.1.ddl.aql    |   2 +-
 .../local-avg_double_null.1.ddl.aql              |   2 +-
 .../local-avg_float_null.1.ddl.aql               |   2 +-
 .../local-avg_int16_null.1.ddl.aql               |   2 +-
 .../local-avg_int32_null.1.ddl.aql               |   2 +-
 .../local-avg_int64_null.1.ddl.aql               |   2 +-
 .../local-avg_int8_null.1.ddl.aql                |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.aql    |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.aql      |   2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.aql      |   2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.aql      |   2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.aql      |   2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.aql        |   2 +-
 .../binary/equal_join/equal_join.2.update.aql    |   4 ++--
 .../binary/index_join/index_join.2.update.aql    |   4 ++--
 .../queries/binary/insert/insert.2.update.aql    |   4 ++--
 .../binary/query_id/query_id.2.update.aql        |   2 +-
 .../datetime_range/datetime_range.2.update.aql   |   2 +-
 .../cross-dv07/cross-dv07.2.update.aql           |   2 +-
 .../cross-dv19/cross-dv19.1.ddl.aql              |   2 +-
 .../insert_across_dataverses.2.update.aql        |   2 +-
 .../join_across_dataverses.2.update.aql          |   4 ++--
 .../customer_q_01/customer_q_01.1.ddl.aql        |   2 +-
 .../customer_q_02/customer_q_02.1.ddl.aql        |   2 +-
 .../customer_q_03/customer_q_03.1.ddl.aql        |   2 +-
 .../customer_q_04/customer_q_04.1.ddl.aql        |   2 +-
 .../customer_q_05/customer_q_05.1.ddl.aql        |   2 +-
 .../customer_q_06/customer_q_06.1.ddl.aql        |   2 +-
 .../customer_q_07/customer_q_07.1.ddl.aql        |   2 +-
 .../customer_q_08/customer_q_08.1.ddl.aql        |   2 +-
 .../denorm-cust-order_01.2.update.aql            |   4 ++--
 .../denorm-cust-order_02.2.update.aql            |   4 ++--
 .../denorm-cust-order_03.2.update.aql            |   4 ++--
 .../custord/freq-clerk/freq-clerk.2.update.aql   |   2 +-
 .../custord/join_q_01/join_q_01.1.ddl.aql        |   4 ++--
 .../custord/join_q_02/join_q_02.1.ddl.aql        |   4 ++--
 .../custord/join_q_03/join_q_03.1.ddl.aql        |   4 ++--
 .../custord/join_q_04/join_q_04.1.ddl.aql        |   4 ++--
 .../custord/load-test/load-test.2.update.aql     |   2 +-
 .../custord/order_q_01/order_q_01.1.ddl.aql      |   2 +-
 .../custord/order_q_02/order_q_02.1.ddl.aql      |   2 +-
 .../custord/order_q_03/order_q_03.1.ddl.aql      |   2 +-
 .../custord/order_q_04/order_q_04.1.ddl.aql      |   2 +-
 .../custord/order_q_05/order_q_05.1.ddl.aql      |   2 +-
 .../custord/order_q_06/order_q_06.1.ddl.aql      |   2 +-
 .../runtimets/queries/dapd/q1/q1.1.ddl.aql       |   2 +-
 .../runtimets/queries/dapd/q2/q2.1.ddl.aql       |   2 +-
 .../runtimets/queries/dapd/q3/q3.2.update.aql    |   2 +-
 .../compact-dataset-and-its-indexes.2.update.aql |   2 +-
 ...e-from-loaded-dataset-with-index.2.update.aql |   2 +-
 .../delete-from-loaded-dataset.2.update.aql      |   2 +-
 .../delete-multi-statement.2.update.aql          |  16 ++++++++--------
 .../queries/dml/delete-syntax-change.aql         |   2 +-
 .../delete-syntax-change.2.update.aql            |   2 +-
 .../dml/drop-index/drop-index.2.update.aql       |   2 +-
 .../empty-load-with-index.2.update.aql           |   4 ++--
 ...dataset-with-index-on-open-field.2.update.aql |   2 +-
 ...sert-and-scan-dataset-with-index.2.update.aql |   2 +-
 .../insert-and-scan-dataset.2.update.aql         |   2 +-
 .../insert-and-scan-joined-datasets.2.update.aql |   4 ++--
 ...nsert-duplicated-keys-from-query.2.update.aql |   4 ++--
 ...nto-loaded-dataset-with-index_01.2.update.aql |   2 +-
 ...nto-loaded-dataset-with-index_02.2.update.aql |   4 ++--
 .../insert-into-loaded-dataset_01.2.update.aql   |   2 +-
 .../insert-into-loaded-dataset_02.2.update.aql   |   6 +++---
 .../queries/dml/insert/insert.2.update.aql       |   4 ++--
 .../insert_less_nc/insert_less_nc.2.update.aql   |   4 ++--
 ...oad-with-autogenerated-pk_txt_01.2.update.aql |   2 +-
 .../load-with-index-open.2.update.aql            |   2 +-
 .../load-with-index/load-with-index.2.update.aql |   2 +-
 .../load-with-ngram-index-open.2.update.aql      |   2 +-
 .../load-with-ngram-index.2.update.aql           |   2 +-
 .../load-with-rtree-index-open.2.update.aql      |   2 +-
 .../load-with-rtree-index.2.update.aql           |   2 +-
 .../load-with-word-index-open.2.update.aql       |   2 +-
 .../load-with-word-index.2.update.aql            |   2 +-
 .../query-issue288/query-issue288.2.update.aql   |   2 +-
 .../query-issue382/query-issue382.2.update.aql   |   2 +-
 ...e-btree-secondary-index-nullable.2.update.aql |   2 +-
 ...elete-btree-secondary-index-open.2.update.aql |   2 +-
 ...x-ngram-secondary-index-nullable.2.update.aql |   2 +-
 ...index-ngram-secondary-index-open.2.update.aql |   2 +-
 ...rted-index-ngram-secondary-index.2.update.aql |   2 +-
 ...ex-word-secondary-index-nullable.2.update.aql |   2 +-
 ...-index-word-secondary-index-open.2.update.aql |   2 +-
 ...erted-index-word-secondary-index.2.update.aql |   2 +-
 ...e-rtree-secondary-index-nullable.2.update.aql |   2 +-
 ...elete-rtree-secondary-index-open.2.update.aql |   2 +-
 ...can-delete-rtree-secondary-index.2.update.aql |   2 +-
 ...t-btree-secondary-index-nullable.2.update.aql |   2 +-
 ...nsert-btree-secondary-index-open.2.update.aql |   2 +-
 ...x-ngram-secondary-index-nullable.2.update.aql |   2 +-
 ...index-ngram-secondary-index-open.2.update.aql |   2 +-
 ...rted-index-ngram-secondary-index.2.update.aql |   2 +-
 ...ex-word-secondary-index-nullable.2.update.aql |   2 +-
 ...-index-word-secondary-index-open.2.update.aql |   2 +-
 ...erted-index-word-secondary-index.2.update.aql |   2 +-
 ...t-rtree-secondary-index-nullable.2.update.aql |   2 +-
 ...nsert-rtree-secondary-index-open.2.update.aql |   2 +-
 ...can-insert-rtree-secondary-index.2.update.aql |   4 ++--
 .../using-constant-merge-policy.2.update.aql     |   2 +-
 ...g-correlated-prefix-merge-policy.2.update.aql |   2 +-
 .../using-no-merge-policy.2.update.aql           |   2 +-
 .../using-prefix-merge-policy.2.update.aql       |   2 +-
 .../queries/employee/q_01/q_01.1.ddl.aql         |   2 +-
 .../queries/employee/q_02/q_02.1.ddl.aql         |   2 +-
 ...1_pricing_summary_report_failure.2.update.aql |   2 +-
 .../queries/flwor/at00/at00.2.update.aql         |   2 +-
 .../queries/flwor/at04/at04.2.update.aql         |   2 +-
 .../queries/flwor/at05/at05.2.update.aql         |   2 +-
 .../queries/flwor/at06/at06.2.update.aql         |   2 +-
 .../fuzzyjoin/dblp-1_1/dblp-1_1.2.update.aql     |   2 +-
 .../dblp-1_2.1.1/dblp-1_2.1.1.2.update.aql       |   2 +-
 .../fuzzyjoin/dblp-1_2.1/dblp-1_2.1.2.update.aql |   2 +-
 .../fuzzyjoin/dblp-1_2/dblp-1_2.2.update.aql     |   2 +-
 .../dblp-2.1_5.3.1/dblp-2.1_5.3.1.2.update.aql   |   2 +-
 .../fuzzyjoin/dblp-2.2/dblp-2.2.2.update.aql     |   4 ++--
 .../fuzzyjoin/dblp-2_1/dblp-2_1.2.update.aql     |   2 +-
 .../fuzzyjoin/dblp-2_2/dblp-2_2.2.update.aql     |   2 +-
 .../fuzzyjoin/dblp-2_3/dblp-2_3.2.update.aql     |   2 +-
 .../fuzzyjoin/dblp-2_4/dblp-2_4.2.update.aql     |   2 +-
 .../fuzzyjoin/dblp-2_5.1/dblp-2_5.1.2.update.aql |   2 +-
 .../fuzzyjoin/dblp-2_5.2/dblp-2_5.2.2.update.aql |   2 +-
 .../dblp-2_5.3.1/dblp-2_5.3.1.2.update.aql       |   2 +-
 .../fuzzyjoin/dblp-2_5.3/dblp-2_5.3.2.update.aql |   2 +-
 .../fuzzyjoin/dblp-2_5/dblp-2_5.2.update.aql     |   2 +-
 .../fuzzyjoin/dblp-3_1.1/dblp-3_1.1.2.update.aql |   2 +-
 .../fuzzyjoin/dblp-3_1.2/dblp-3_1.2.2.update.aql |   2 +-
 .../fuzzyjoin/dblp-3_1/dblp-3_1.2.update.aql     |   2 +-
 .../dblp-aqlplus_1/dblp-aqlplus_1.2.update.aql   |   2 +-
 .../dblp-aqlplus_2/dblp-aqlplus_2.2.update.aql   |   2 +-
 .../dblp-csx-2_1/dblp-csx-2_1.2.update.aql       |   4 ++--
 .../dblp-csx-2_2/dblp-csx-2_2.2.update.aql       |   4 ++--
 .../dblp-csx-2_3/dblp-csx-2_3.2.update.aql       |   4 ++--
 .../dblp-csx-2_4/dblp-csx-2_4.2.update.aql       |   4 ++--
 .../dblp-csx-2_5.1/dblp-csx-2_5.1.2.update.aql   |   4 ++--
 .../dblp-csx-2_5.2/dblp-csx-2_5.2.2.update.aql   |   4 ++--
 .../dblp-csx-2_5.3.1.2.update.aql                |   4 ++--
 .../dblp-csx-2_5.3/dblp-csx-2_5.3.2.update.aql   |   4 ++--
 .../dblp-csx-2_5/dblp-csx-2_5.2.update.aql       |   4 ++--
 .../dblp-csx-3_1/dblp-csx-3_1.2.update.aql       |   4 ++--
 .../dblp-csx-3_2/dblp-csx-3_2.2.update.aql       |   4 ++--
 .../dblp-csx-3_3/dblp-csx-3_3.2.update.aql       |   4 ++--
 .../dblp-csx-3_4/dblp-csx-3_4.2.update.aql       |   4 ++--
 .../dblp-csx-3_5.1/dblp-csx-3_5.1.2.update.aql   |   4 ++--
 .../dblp-csx-3_5.2/dblp-csx-3_5.2.2.update.aql   |   4 ++--
 .../dblp-csx-3_5.3.1.2.update.aql                |   4 ++--
 .../dblp-csx-3_5.3/dblp-csx-3_5.3.2.update.aql   |   4 ++--
 .../dblp-csx-3_5.4.1.2.update.aql                |   4 ++--
 .../dblp-csx-3_5.4/dblp-csx-3_5.4.2.update.aql   |   4 ++--
 .../dblp-csx-3_5/dblp-csx-3_5.2.update.aql       |   4 ++--
 .../dblp-csx-aqlplus_1.2.update.aql              |   4 ++--
 .../dblp-csx-aqlplus_2.2.update.aql              |   4 ++--
 .../dblp-csx-aqlplus_3.2.update.aql              |   4 ++--
 .../dblp-csx-dblp-aqlplus_1.2.update.aql         |   4 ++--
 .../dblp-lookup_1/dblp-lookup_1.2.update.aql     |   2 +-
 .../dblp-splits-3_1/dblp-splits-3_1.1.ddl.aql    |   2 +-
 .../dblp-splits-3_1/dblp-splits-3_1.2.update.aql |   2 +-
 .../events-users-aqlplus_1.2.update.aql          |   2 +-
 .../fuzzyjoin/opentype/opentype.2.update.aql     |   2 +-
 .../user-int-aqlplus_1.2.update.aql              |   2 +-
 .../user-int-aqlplus_2.2.update.aql              |   2 +-
 .../user-int-aqlplus_3.2.update.aql              |   2 +-
 .../user-lot-aqlplus_1.1.2.update.aql            |   2 +-
 .../user-lot-aqlplus_1.2.update.aql              |   2 +-
 .../user-lot-aqlplus_2.2.update.aql              |   2 +-
 .../user-lot-aqlplus_3.2.update.aql              |   2 +-
 .../user-vis-int-3_1.2.update.aql                |   4 ++--
 .../user-vis-int-aqlplus_1.2.update.aql          |   4 ++--
 .../user-vis-int-aqlplus_2.2.update.aql          |   4 ++--
 .../user-vis-int-aqlplus_3.2.update.aql          |   4 ++--
 ...r-vis-int-vis-user-lot-aqlplus_1.2.update.aql |   4 ++--
 .../user-vis-lot-3_1.2.update.aql                |   4 ++--
 .../user-vis-lot-aqlplus_1.2.update.aql          |   4 ++--
 .../user-vis-lot-aqlplus_2.2.update.aql          |   4 ++--
 .../user-vis-lot-aqlplus_3.2.update.aql          |   4 ++--
 .../user-vis-lot-aqlplus_4.2.update.aql          |   4 ++--
 .../user-vis-lot-aqlplus_5.2.update.aql          |   4 ++--
 .../user-vis-lot-int-aqlplus_1.2.update.aql      |   4 ++--
 .../user-vis-lot-int-aqlplus_2.2.update.aql      |   4 ++--
 .../issue_251_dataset_hint_5.2.update.aql        |   2 +-
 .../btree-index-nested-loop-join.2.update.aql    |   6 +++---
 .../btree-primary-equi-join.2.update.aql         |   4 ++--
 .../btree-secondary-equi-join_01.2.update.aql    |   4 ++--
 .../btree-secondary-equi-join_02.2.update.aql    |   4 ++--
 .../btree-secondary-equi-join_03.2.update.aql    |   4 ++--
 ...tree-secondary-self-equi-join_01.2.update.aql |   2 +-
 .../rtree-spatial-intersect-point.2.update.aql   |   4 ++--
 ...ree-spatial-self-intersect-point.2.update.aql |   2 +-
 ...probe-pidx-with-join-btree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-btree-sidx2.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx1.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.2.update.aql |   2 +-
 ...ex-composite-key-mixed-intervals.2.update.aql |   2 +-
 .../btree-index-composite-key.2.update.aql       |   2 +-
 .../btree-index-limit-orderby-01.2.update.aql    |   2 +-
 .../btree-index-limit-orderby-02.2.update.aql    |   2 +-
 .../btree-index-rewrite-multiple.2.update.aql    |   2 +-
 .../cust-index-age-nullable.2.update.aql         |   2 +-
 .../inverted-index-ngram-contains.2.update.aql   |   2 +-
 ...dex-ngram-edit-distance-contains.2.update.aql |   2 +-
 ...-index-ngram-edit-distance-panic.2.update.aql |   2 +-
 ...-ngram-edit-distance-word-tokens.2.update.aql |   2 +-
 ...verted-index-ngram-edit-distance.2.update.aql |   2 +-
 .../inverted-index-ngram-jaccard.2.update.aql    |   2 +-
 ...-index-olist-edit-distance-panic.2.update.aql |   2 +-
 ...verted-index-olist-edit-distance.2.update.aql |   2 +-
 .../inverted-index-olist-jaccard.2.update.aql    |   2 +-
 .../inverted-index-ulist-jaccard.2.update.aql    |   2 +-
 .../inverted-index-word-contains.2.update.aql    |   2 +-
 .../inverted-index-word-jaccard.2.update.aql     |   2 +-
 ...s-index-custkey-conjunctive-open.2.update.aql |   2 +-
 ...orders-index-custkey-conjunctive.2.update.aql |   2 +-
 .../orders-index-custkey-open.2.update.aql       |   2 +-
 .../orders-index-custkey.2.update.aql            |   2 +-
 .../range-search-open.2.update.aql               |   2 +-
 .../range-search/range-search.2.update.aql       |   2 +-
 ...e-secondary-index-circular-query.2.update.aql |   2 +-
 .../rtree-secondary-index-nullable.2.update.aql  |   2 +-
 .../rtree-secondary-index-open.2.update.aql      |   2 +-
 .../rtree-secondary-index.2.update.aql           |   2 +-
 .../verify/index-verify.2.update.aql             |   4 ++--
 .../ngram-edit-distance-inline.2.update.aql      |   4 ++--
 .../ngram-edit-distance.2.update.aql             |   4 ++--
 .../ngram-jaccard-inline.2.update.aql            |   4 ++--
 .../ngram-jaccard/ngram-jaccard.2.update.aql     |   4 ++--
 .../olist-edit-distance-inline.2.update.aql      |   4 ++--
 .../olist-edit-distance.2.update.aql             |   4 ++--
 .../olist-jaccard-inline.2.update.aql            |   4 ++--
 .../olist-jaccard/olist-jaccard.2.update.aql     |   4 ++--
 .../ulist-jaccard-inline.2.update.aql            |   4 ++--
 .../ulist-jaccard/ulist-jaccard.2.update.aql     |   4 ++--
 .../word-jaccard-inline.2.update.aql             |   4 ++--
 .../word-jaccard/word-jaccard.2.update.aql       |   4 ++--
 .../ngram-edit-distance-inline.2.update.aql      |   4 ++--
 .../ngram-edit-distance.2.update.aql             |   4 ++--
 .../ngram-jaccard-inline.2.update.aql            |   4 ++--
 .../ngram-jaccard/ngram-jaccard.2.update.aql     |   4 ++--
 .../olist-edit-distance-inline.2.update.aql      |   4 ++--
 .../olist-edit-distance.2.update.aql             |   4 ++--
 .../olist-jaccard-inline.2.update.aql            |   4 ++--
 .../olist-jaccard/olist-jaccard.2.update.aql     |   4 ++--
 .../ulist-jaccard-inline.2.update.aql            |   4 ++--
 .../ulist-jaccard/ulist-jaccard.2.update.aql     |   4 ++--
 .../word-jaccard-inline.2.update.aql             |   4 ++--
 .../word-jaccard/word-jaccard.2.update.aql       |   4 ++--
 .../query_issue285-2.2.update.aql                |   4 ++--
 .../query_issue285/query_issue285.2.update.aql   |   4 ++--
 .../query_issue658/query_issue658.2.update.aql   |   4 ++--
 .../load/adm_binary/adm_binary.2.update.aql      |   2 +-
 .../queries/load/csv_01/csv_01.2.update.aql      |   2 +-
 .../queries/load/csv_02/csv_02.2.update.aql      |   2 +-
 .../queries/load/csv_03/csv_03.2.update.aql      |   2 +-
 .../queries/load/csv_04/csv_04.2.update.aql      |   2 +-
 .../queries/load/csv_05/csv_05.2.update.aql      |   2 +-
 .../queries/load/csv_06/csv_06.2.update.aql      |   2 +-
 .../queries/load/csv_07/csv_07.2.update.aql      |   2 +-
 .../load/csv_08_header_cr/csv_08.2.update.aql    |   2 +-
 .../load/csv_08_header_crlf/csv_08.2.update.aql  |   2 +-
 .../load/csv_08_header_lf/csv_08.2.update.aql    |   2 +-
 .../issue289_query/issue289_query.2.update.aql   |   2 +-
 .../issue650_query/issue650_query.2.update.aql   |   2 +-
 .../misc/flushtest/flushtest.2.update.aql        |   2 +-
 .../groupby-orderby-count.1.ddl.aql              |   2 +-
 .../nested-loop-join_01.2.update.aql             |   4 ++--
 .../prefix-search/prefix-search.2.update.aql     |   2 +-
 .../misc/stable_sort/stable_sort.2.update.aql    |   2 +-
 .../compact-dataset-and-its-indexes.2.update.aql |   2 +-
 ...e-from-loaded-dataset-with-index.2.update.aql |   2 +-
 .../nested-index-dml/delete-syntax-change.aql    |   2 +-
 .../drop-index/drop-index.2.update.aql           |   2 +-
 ...nto-loaded-dataset-with-index_01.2.update.aql |   2 +-
 ...nto-loaded-dataset-with-index_02.2.update.aql |   2 +-
 .../load-with-index/load-with-index.2.update.aql |   2 +-
 .../load-with-ngram-index.2.update.aql           |   2 +-
 .../load-with-rtree-index.2.update.aql           |   2 +-
 .../load-with-word-index.2.update.aql            |   2 +-
 .../nested-uuid-load.2.update.aql                |   2 +-
 ...e-btree-secondary-index-nullable.2.update.aql |   2 +-
 ...x-ngram-secondary-index-nullable.2.update.aql |   2 +-
 ...rted-index-ngram-secondary-index.2.update.aql |   2 +-
 ...ex-word-secondary-index-nullable.2.update.aql |   2 +-
 ...erted-index-word-secondary-index.2.update.aql |   2 +-
 ...e-rtree-secondary-index-nullable.2.update.aql |   2 +-
 ...can-delete-rtree-secondary-index.2.update.aql |   2 +-
 ...t-btree-secondary-index-nullable.2.update.aql |   2 +-
 ...x-ngram-secondary-index-nullable.2.update.aql |   2 +-
 ...rted-index-ngram-secondary-index.2.update.aql |   2 +-
 ...ex-word-secondary-index-nullable.2.update.aql |   2 +-
 ...erted-index-word-secondary-index.2.update.aql |   2 +-
 ...t-rtree-secondary-index-nullable.2.update.aql |   2 +-
 ...can-insert-rtree-secondary-index.2.update.aql |   4 ++--
 .../btree-primary-equi-join.2.update.aql         |   4 ++--
 .../btree-secondary-equi-join.2.update.aql       |   4 ++--
 .../ngram-edit-distance-inline.2.update.aql      |   4 ++--
 .../ngram-edit-distance.2.update.aql             |   4 ++--
 .../ngram-jaccard-inline.2.update.aql            |   4 ++--
 .../ngram-jaccard/ngram-jaccard.2.update.aql     |   4 ++--
 .../rtree-spatial-intersect-point.2.update.aql   |   4 ++--
 .../word-jaccard-inline.2.update.aql             |   4 ++--
 .../word-jaccard/word-jaccard.2.update.aql       |   4 ++--
 ...probe-pidx-with-join-btree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-btree-sidx2.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx1.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.2.update.aql |   2 +-
 ...ex-composite-key-mixed-intervals.2.update.aql |   2 +-
 .../btree-index-composite-key.2.update.aql       |   2 +-
 .../btree-index-rewrite-multiple.2.update.aql    |   2 +-
 .../cust-index-age-nullable.2.update.aql         |   2 +-
 .../inverted-index-ngram-contains.2.update.aql   |   2 +-
 ...dex-ngram-edit-distance-contains.2.update.aql |   2 +-
 ...-index-ngram-edit-distance-panic.2.update.aql |   2 +-
 ...-ngram-edit-distance-word-tokens.2.update.aql |   2 +-
 ...verted-index-ngram-edit-distance.2.update.aql |   2 +-
 .../inverted-index-ngram-jaccard.2.update.aql    |   2 +-
 ...-index-olist-edit-distance-panic.2.update.aql |   2 +-
 ...verted-index-olist-edit-distance.2.update.aql |   2 +-
 .../inverted-index-olist-jaccard.2.update.aql    |   2 +-
 .../inverted-index-ulist-jaccard.2.update.aql    |   2 +-
 .../inverted-index-word-contains.2.update.aql    |   2 +-
 .../inverted-index-word-jaccard.2.update.aql     |   2 +-
 ...s-index-custkey-conjunctive-open.2.update.aql |   2 +-
 ...orders-index-custkey-conjunctive.2.update.aql |   2 +-
 .../orders-index-custkey-open.2.update.aql       |   2 +-
 .../orders-index-custkey.2.update.aql            |   2 +-
 .../range-search-open.2.update.aql               |   2 +-
 .../range-search/range-search.2.update.aql       |   2 +-
 .../rtree-secondary-index-nullable.2.update.aql  |   2 +-
 .../rtree-secondary-index-open.2.update.aql      |   2 +-
 .../rtree-secondary-index.2.update.aql           |   2 +-
 .../btree-secondary-equi-join.2.update.aql       |   4 ++--
 .../ngram-edit-distance-inline.2.update.aql      |   4 ++--
 .../ngram-edit-distance.2.update.aql             |   4 ++--
 .../ngram-jaccard-inline.2.update.aql            |   4 ++--
 .../ngram-jaccard/ngram-jaccard.2.update.aql     |   4 ++--
 .../rtree-spatial-intersect-point.2.update.aql   |   4 ++--
 .../word-jaccard-inline.2.update.aql             |   4 ++--
 .../word-jaccard/word-jaccard.2.update.aql       |   4 ++--
 ...probe-pidx-with-join-btree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-btree-sidx2.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.2.update.aql |   2 +-
 ...ex-composite-key-mixed-intervals.2.update.aql |   2 +-
 .../btree-index-composite-key.2.update.aql       |   2 +-
 .../btree-index-rewrite-multiple.2.update.aql    |   2 +-
 .../inverted-index-ngram-contains.2.update.aql   |   2 +-
 ...dex-ngram-edit-distance-contains.2.update.aql |   2 +-
 ...-index-ngram-edit-distance-panic.2.update.aql |   2 +-
 ...-ngram-edit-distance-word-tokens.2.update.aql |   2 +-
 ...verted-index-ngram-edit-distance.2.update.aql |   2 +-
 .../inverted-index-ngram-jaccard.2.update.aql    |   2 +-
 .../inverted-index-word-contains.2.update.aql    |   2 +-
 .../inverted-index-word-jaccard.2.update.aql     |   2 +-
 ...orders-index-custkey-conjunctive.2.update.aql |   2 +-
 .../orders-index-custkey.2.update.aql            |   2 +-
 .../range-search/range-search.2.update.aql       |   2 +-
 .../rtree-secondary-index.2.update.aql           |   2 +-
 .../query-issue208/query-issue208.2.update.aql   |   2 +-
 .../query-issue350-2.2.update.aql                |   2 +-
 .../query-issue350/query-issue350.2.update.aql   |   2 +-
 .../btree-secondary-equi-join.2.update.aql       |   4 ++--
 .../ngram-edit-distance-inline.2.update.aql      |   4 ++--
 .../ngram-edit-distance.2.update.aql             |   4 ++--
 .../ngram-jaccard-inline.2.update.aql            |   4 ++--
 .../ngram-jaccard/ngram-jaccard.2.update.aql     |   4 ++--
 .../rtree-spatial-intersect-point.2.update.aql   |   4 ++--
 .../word-jaccard-inline.2.update.aql             |   4 ++--
 .../word-jaccard/word-jaccard.2.update.aql       |   4 ++--
 ...probe-pidx-with-join-btree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-btree-sidx2.2.update.aql |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.2.update.aql |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.2.update.aql |   2 +-
 ...ex-composite-key-mixed-intervals.2.update.aql |   2 +-
 .../btree-index-composite-key.2.update.aql       |   2 +-
 .../btree-index-rewrite-multiple.2.update.aql    |   2 +-
 .../inverted-index-ngram-contains.2.update.aql   |   2 +-
 ...dex-ngram-edit-distance-contains.2.update.aql |   2 +-
 ...-index-ngram-edit-distance-panic.2.update.aql |   2 +-
 ...-ngram-edit-distance-word-tokens.2.update.aql |   2 +-
 ...verted-index-ngram-edit-distance.2.update.aql |   2 +-
 .../inverted-index-ngram-jaccard.2.update.aql    |   2 +-
 .../inverted-index-word-contains.2.update.aql    |   2 +-
 .../inverted-index-word-jaccard.2.update.aql     |   2 +-
 ...orders-index-custkey-conjunctive.2.update.aql |   2 +-
 .../orders-index-custkey.2.update.aql            |   2 +-
 .../range-search/range-search.2.update.aql       |   2 +-
 .../rtree-secondary-index.2.update.aql           |   2 +-
 .../orderby_limit_01.2.update.aql                |   2 +-
 .../orderby_limit_offset_01.2.update.aql         |   2 +-
 .../orderby_limit_primary_index_01.2.update.aql  |   2 +-
 .../somesat_02/somesat_02.2.update.aql           |   4 ++--
 .../runtimets/queries/scan/10/10.2.update.aql    |   2 +-
 .../runtimets/queries/scan/20/20.2.update.aql    |   2 +-
 .../runtimets/queries/scan/30/30.1.ddl.aql       |   2 +-
 .../scan/alltypes_01/alltypes_01.1.ddl.aql       |   2 +-
 .../runtimets/queries/scan/alltypes_02.aql       |   2 +-
 .../scan/alltypes_02/alltypes_02.1.ddl.aql       |   2 +-
 .../issue238_query_1.2.update.aql                |   2 +-
 .../issue238_query_2.2.update.aql                |   2 +-
 .../numeric_types_01/numeric_types_01.1.ddl.aql  |   2 +-
 .../spatial_types_01/spatial_types_01.1.ddl.aql  |   2 +-
 .../spatial_types_02/spatial_types_02.1.ddl.aql  |   2 +-
 .../scan/temp_types_01/temp_types_01.1.ddl.aql   |   2 +-
 .../temp_types_02/temp_types_02.2.update.aql     |   2 +-
 .../count-nullable/count-nullable.1.ddl.aql      |   2 +-
 .../cust-filter/cust-filter.1.ddl.aql            |   2 +-
 .../has-param1/has-param1.1.ddl.aql              |   2 +-
 .../fuzzyeq-edit-distance.2.update.aql           |   2 +-
 .../fuzzyeq-similarity-jaccard.2.update.aql      |   2 +-
 .../similarity-jaccard-check_query.2.update.aql  |   2 +-
 ...arity-jaccard-sorted-check_query.2.update.aql |   2 +-
 .../similarity-jaccard-sorted_query.2.update.aql |   2 +-
 .../similarity-jaccard_query.2.update.aql        |   2 +-
 .../cell-aggregation-with-filtering.2.update.aql |   2 +-
 .../cell-aggregation/cell-aggregation.1.ddl.aql  |   2 +-
 .../circle-intersect-circle.1.ddl.aql            |   2 +-
 .../create-rtree-index.2.update.aql              |   2 +-
 .../distance-between-points.1.ddl.aql            |   2 +-
 .../line-intersect-circle.1.ddl.aql              |   2 +-
 .../line-intersect-line.1.ddl.aql                |   2 +-
 .../line-intersect-polygon.1.ddl.aql             |   2 +-
 .../line-intersect-rectangle.1.ddl.aql           |   2 +-
 .../point-equals-point.1.ddl.aql                 |   2 +-
 .../point-in-circle/point-in-circle.1.ddl.aql    |   2 +-
 .../point-in-polygon/point-in-polygon.1.ddl.aql  |   2 +-
 .../point-in-rectangle.1.ddl.aql                 |   2 +-
 .../point-on-line/point-on-line.1.ddl.aql        |   2 +-
 .../polygon-intersect-circle.1.ddl.aql           |   2 +-
 .../polygon-intersect-polygon.1.ddl.aql          |   2 +-
 .../polygon-intersect-rectangle.1.ddl.aql        |   2 +-
 .../rectangle-intersect-circle.1.ddl.aql         |   2 +-
 .../rectangle-intersect-rectangle.1.ddl.aql      |   2 +-
 .../spatial/spatial-area/spatial-area.1.ddl.aql  |   2 +-
 ...e-from-loaded-dataset-with-index.2.update.aql |   2 +-
 .../delete-from-loaded-dataset.2.update.aql      |   2 +-
 .../drop-index/drop-index.2.update.aql           |   2 +-
 .../empty-load-with-index.2.update.aql           |   4 ++--
 ...sert-and-scan-dataset-with-index.2.update.aql |   2 +-
 .../insert-and-scan-dataset.2.update.aql         |   2 +-
 .../q01_pricing_summary_report_nt.2.update.aql   |   2 +-
 ...can-delete-rtree-secondary-index.2.update.aql |   2 +-
 .../scan-insert-persistent-to-temp.2.update.aql  |   4 ++--
 ...can-insert-rtree-secondary-index.2.update.aql |   4 ++--
 .../scan-insert-temp-to-persistent.2.update.aql  |   4 ++--
 .../insert_from_delimited_ds.2.update.aql        |   2 +-
 .../insert_from_ext_ds.1.ddl.aql                 |   2 +-
 .../q01_pricing_summary_report_nt.2.update.aql   |   2 +-
 .../q02_minimum_cost_supplier.2.update.aql       |  16 ++++++++--------
 .../q03_shipping_priority_nt.2.update.aql        |   6 +++---
 .../q04_order_priority.2.update.aql              |  16 ++++++++--------
 .../q05_local_supplier_volume.2.update.aql       |  16 ++++++++--------
 .../q06_forecast_revenue_change.2.update.aql     |  16 ++++++++--------
 .../q07_volume_shipping.2.update.aql             |  16 ++++++++--------
 .../q08_national_market_share.2.update.aql       |  16 ++++++++--------
 .../q09_product_type_profit_nt.2.update.aql      |  16 ++++++++--------
 .../q10_returned_item.2.update.aql               |  16 ++++++++--------
 .../q10_returned_item_int64.2.update.aql         |  16 ++++++++--------
 .../q11_important_stock.2.update.aql             |  16 ++++++++--------
 .../q12_shipping/q12_shipping.2.update.aql       |  16 ++++++++--------
 .../q13_customer_distribution.2.update.aql       |  16 ++++++++--------
 .../q14_promotion_effect.2.update.aql            |  16 ++++++++--------
 .../q15_top_supplier.2.update.aql                |  16 ++++++++--------
 .../q16_parts_supplier_relationship.2.update.aql |  16 ++++++++--------
 .../q17_large_gby_variant.2.update.aql           |  16 ++++++++--------
 ...q17_small_quantity_order_revenue.2.update.aql |  16 ++++++++--------
 .../q18_large_volume_customer.2.update.aql       |  16 ++++++++--------
 .../q19_discounted_revenue.2.update.aql          |  16 ++++++++--------
 .../q20_potential_part_promotion.2.update.aql    |  16 ++++++++--------
 ...uppliers_who_kept_orders_waiting.2.update.aql |  16 ++++++++--------
 .../q22_global_sales_opportunity.2.update.aql    |  16 ++++++++--------
 .../query-issue601/query-issue601.2.update.aql   |   2 +-
 .../query-issue785-2.2.update.aql                |  12 ++++++------
 .../query-issue785/query-issue785.2.update.aql   |  12 ++++++------
 .../query-issue786/query-issue786.2.update.aql   |  12 ++++++------
 .../tpch/distinct_by/distinct_by.2.update.aql    |   2 +-
 .../tpch/group_no_agg/group_no_agg.2.update.aql  |   2 +-
 .../nest_aggregate/nest_aggregate.2.update.aql   |  12 ++++++------
 .../nest_aggregate2/nest_aggregate2.2.update.aql |  12 ++++++------
 .../q01_pricing_summary_report_nt.2.update.aql   |   2 +-
 .../q02_minimum_cost_supplier.2.update.aql       |  16 ++++++++--------
 .../q03_shipping_priority_nt.2.update.aql        |   6 +++---
 .../q04_order_priority.2.update.aql              |  16 ++++++++--------
 .../q05_local_supplier_volume.2.update.aql       |  16 ++++++++--------
 .../q06_forecast_revenue_change.2.update.aql     |  16 ++++++++--------
 .../q07_volume_shipping.2.update.aql             |  16 ++++++++--------
 .../q08_national_market_share.2.update.aql       |  16 ++++++++--------
 .../q09_product_type_profit_nt.2.update.aql      |  16 ++++++++--------
 .../q10_returned_item.2.update.aql               |  16 ++++++++--------
 .../q10_returned_item_int64.2.update.aql         |  16 ++++++++--------
 .../q11_important_stock.2.update.aql             |  16 ++++++++--------
 .../tpch/q12_shipping/q12_shipping.2.update.aql  |  16 ++++++++--------
 .../q13_customer_distribution.2.update.aql       |  16 ++++++++--------
 .../q14_promotion_effect.2.update.aql            |  16 ++++++++--------
 .../q15_top_supplier.2.update.aql                |  16 ++++++++--------
 .../q16_parts_supplier_relationship.2.update.aql |  16 ++++++++--------
 .../q17_large_gby_variant.2.update.aql           |  16 ++++++++--------
 ...q17_small_quantity_order_revenue.2.update.aql |  16 ++++++++--------
 .../q18_large_volume_customer.2.update.aql       |  16 ++++++++--------
 .../q19_discounted_revenue.2.update.aql          |  16 ++++++++--------
 .../q20_potential_part_promotion.2.update.aql    |  16 ++++++++--------
 ...uppliers_who_kept_orders_waiting.2.update.aql |  16 ++++++++--------
 .../q22_global_sales_opportunity.2.update.aql    |  16 ++++++++--------
 .../query-ASTERIXDB-1127.2.update.aql            |  16 ++++++++--------
 .../query-issue562/query-issue562.2.update.aql   |  16 ++++++++--------
 .../query-issue601/query-issue601.2.update.aql   |   2 +-
 .../query-issue785-2.2.update.aql                |  12 ++++++------
 .../query-issue785/query-issue785.2.update.aql   |  12 ++++++------
 .../query-issue786/query-issue786.2.update.aql   |  12 ++++++------
 .../query-issue810-2.2.update.aql                |   2 +-
 .../query-issue810-3.2.update.aql                |   2 +-
 .../query-issue810/query-issue810.2.update.aql   |   2 +-
 .../query-issue827-2.2.update.aql                |   2 +-
 .../query-issue827/query-issue827.2.update.aql   |   2 +-
 .../query-ASTERIXDB-1047.2.update.aql            |   2 +-
 .../multiple-secondaries.2.update.aql            |   6 +++---
 .../nested-index/nested-index.2.update.aql       |   6 +++---
 .../nullable-index/nullable-index.2.update.aql   |   6 +++---
 .../upsert/open-index/open-index.2.update.aql    |   6 +++---
 .../primary-secondary-inverted.2.update.aql      |   4 ++--
 .../primary-secondary-rtree.2.update.aql         |   6 +++---
 .../avg_double_null/avg_double_null.1.ddl.sqlpp  |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp      |   2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp    |   2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp    |   2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp    |   2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp      |   2 +-
 .../count_null/count_null.1.ddl.sqlpp            |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp  |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp    |   2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp    |   2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp    |   2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp    |   2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp      |   2 +-
 .../avg_double_null/avg_double_null.1.ddl.sqlpp  |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp      |   2 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp    |   2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp    |   2 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp    |   2 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp      |   2 +-
 .../aggregate/count_null/count_null.1.ddl.sqlpp  |   2 +-
 .../global-avg_null/global-avg_null.1.ddl.sqlpp  |   2 +-
 .../local-avg_double_null.1.ddl.sqlpp            |   2 +-
 .../local-avg_float_null.1.ddl.sqlpp             |   2 +-
 .../local-avg_int16_null.1.ddl.sqlpp             |   2 +-
 .../local-avg_int32_null.1.ddl.sqlpp             |   2 +-
 .../local-avg_int64_null.1.ddl.sqlpp             |   2 +-
 .../local-avg_int8_null.1.ddl.sqlpp              |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp  |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp    |   2 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp    |   2 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp    |   2 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp    |   2 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp      |   2 +-
 .../binary/equal_join/equal_join.2.update.sqlpp  |   4 ++--
 .../binary/index_join/index_join.2.update.sqlpp  |   4 ++--
 .../binary/insert/insert.2.update.sqlpp          |   4 ++--
 .../datetime_range/datetime_range.2.update.sqlpp |   2 +-
 .../cross-dv07/cross-dv07.2.update.sqlpp         |   2 +-
 .../cross-dv19/cross-dv19.1.ddl.sqlpp            |   2 +-
 .../insert_across_dataverses.2.update.sqlpp      |   2 +-
 .../join_across_dataverses.2.update.sqlpp        |   4 ++--
 .../customer_q_01/customer_q_01.1.ddl.sqlpp      |   2 +-
 .../customer_q_02/customer_q_02.1.ddl.sqlpp      |   2 +-
 .../customer_q_03/customer_q_03.1.ddl.sqlpp      |   2 +-
 .../customer_q_04/customer_q_04.1.ddl.sqlpp      |   2 +-
 .../customer_q_05/customer_q_05.1.ddl.sqlpp      |   2 +-
 .../customer_q_06/customer_q_06.1.ddl.sqlpp      |   2 +-
 .../customer_q_07/customer_q_07.1.ddl.sqlpp      |   2 +-
 .../customer_q_08/customer_q_08.1.ddl.sqlpp      |   2 +-
 .../denorm-cust-order_01.2.update.sqlpp          |   4 ++--
 .../denorm-cust-order_02.2.update.sqlpp          |   4 ++--
 .../denorm-cust-order_03.2.update.sqlpp          |   4 ++--
 .../custord/freq-clerk/freq-clerk.2.update.sqlpp |   2 +-
 .../custord/join_q_01/join_q_01.1.ddl.sqlpp      |   4 ++--
 .../custord/join_q_02/join_q_02.1.ddl.sqlpp      |   4 ++--
 .../custord/join_q_03/join_q_03.1.ddl.sqlpp      |   4 ++--
 .../custord/join_q_04/join_q_04.1.ddl.sqlpp      |   4 ++--
 .../custord/join_q_05/join_q_05.1.ddl.sqlpp      |   4 ++--
 .../custord/join_q_06/join_q_06.1.ddl.sqlpp      |   2 +-
 .../custord/join_q_07/join_q_07.1.ddl.sqlpp      |   2 +-
 .../custord/load-test/load-test.2.update.sqlpp   |   2 +-
 .../custord/order_q_01/order_q_01.1.ddl.sqlpp    |   2 +-
 .../custord/order_q_02/order_q_02.1.ddl.sqlpp    |   2 +-
 .../custord/order_q_03/order_q_03.1.ddl.sqlpp    |   2 +-
 .../custord/order_q_04/order_q_04.1.ddl.sqlpp    |   2 +-
 .../custord/order_q_05/order_q_05.1.ddl.sqlpp    |   2 +-
 .../custord/order_q_06/order_q_06.1.ddl.sqlpp    |   2 +-
 .../queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp         |   2 +-
 .../queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp         |   2 +-
 .../queries_sqlpp/dapd/q3/q3.2.update.sqlpp      |   2 +-
 ...ompact-dataset-and-its-indexes.2.update.sqlpp |   2 +-
 ...from-loaded-dataset-with-index.2.update.sqlpp |   2 +-
 .../delete-from-loaded-dataset.2.update.sqlpp    |   2 +-
 .../delete-multi-statement.2.update.sqlpp        |  16 ++++++++--------
 .../queries_sqlpp/dml/delete-syntax-change.sqlpp |   2 +-
 .../delete-syntax-change.2.update.sqlpp          |   2 +-
 .../dml/drop-index/drop-index.2.update.sqlpp     |   2 +-
 .../empty-load-with-index.2.update.sqlpp         |   4 ++--
 ...taset-with-index-on-open-field.2.update.sqlpp |   2 +-
 ...rt-and-scan-dataset-with-index.2.update.sqlpp |   2 +-
 .../insert-and-scan-dataset.2.update.sqlpp       |   2 +-
 ...nsert-and-scan-joined-datasets.2.update.sqlpp |   4 ++--
 ...o-loaded-dataset-with-index_01.2.update.sqlpp |   2 +-
 ...o-loaded-dataset-with-index_02.2.update.sqlpp |   4 ++--
 .../insert-into-loaded-dataset_01.2.update.sqlpp |   2 +-
 .../insert-into-loaded-dataset_02.2.update.sqlpp |   6 +++---
 .../dml/insert/insert.2.update.sqlpp             |   4 ++--
 .../insert_less_nc/insert_less_nc.2.update.sqlpp |   4 ++--
 ...d-with-autogenerated-pk_txt_01.2.update.sqlpp |   2 +-
 .../load-with-index-open.2.update.sqlpp          |   2 +-
 .../load-with-index.2.update.sqlpp               |   2 +-
 .../load-with-ngram-index-open.2.update.sqlpp    |   2 +-
 .../load-with-ngram-index.2.update.sqlpp         |   2 +-
 .../load-with-rtree-index-open.2.update.sqlpp    |   2 +-
 .../load-with-rtree-index.2.update.sqlpp         |   2 +-
 .../load-with-word-index-open.2.update.sqlpp     |   2 +-
 .../load-with-word-index.2.update.sqlpp          |   2 +-
 .../query-issue288/query-issue288.2.update.sqlpp |   2 +-
 .../query-issue382/query-issue382.2.update.sqlpp |   2 +-
 ...btree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ete-btree-secondary-index-open.2.update.sqlpp |   2 +-
 ...ngram-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...dex-ngram-secondary-index-open.2.update.sqlpp |   2 +-
 ...ed-index-ngram-secondary-index.2.update.sqlpp |   2 +-
 ...-word-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ndex-word-secondary-index-open.2.update.sqlpp |   2 +-
 ...ted-index-word-secondary-index.2.update.sqlpp |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ete-rtree-secondary-index-open.2.update.sqlpp |   2 +-
 ...n-delete-rtree-secondary-index.2.update.sqlpp |   2 +-
 ...btree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ert-btree-secondary-index-open.2.update.sqlpp |   2 +-
 ...ngram-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...dex-ngram-secondary-index-open.2.update.sqlpp |   2 +-
 ...ed-index-ngram-secondary-index.2.update.sqlpp |   2 +-
 ...-word-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ndex-word-secondary-index-open.2.update.sqlpp |   2 +-
 ...ted-index-word-secondary-index.2.update.sqlpp |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ert-rtree-secondary-index-open.2.update.sqlpp |   2 +-
 ...n-insert-rtree-secondary-index.2.update.sqlpp |   4 ++--
 .../using-constant-merge-policy.2.update.sqlpp   |   2 +-
 ...correlated-prefix-merge-policy.2.update.sqlpp |   2 +-
 .../using-no-merge-policy.2.update.sqlpp         |   2 +-
 .../using-prefix-merge-policy.2.update.sqlpp     |   2 +-
 .../queries_sqlpp/employee/q_01/q_01.1.ddl.sqlpp |   2 +-
 .../queries_sqlpp/employee/q_02/q_02.1.ddl.sqlpp |   2 +-
 ...pricing_summary_report_failure.2.update.sqlpp |   2 +-
 .../queries_sqlpp/flwor/at00/at00.2.update.sqlpp |   2 +-
 .../queries_sqlpp/flwor/at04/at04.2.update.sqlpp |   2 +-
 .../queries_sqlpp/flwor/at05/at05.2.update.sqlpp |   2 +-
 .../queries_sqlpp/flwor/at06/at06.2.update.sqlpp |   2 +-
 .../fuzzyjoin/dblp-1_1/dblp-1_1.2.update.sqlpp   |   2 +-
 .../dblp-1_2.1.1/dblp-1_2.1.1.2.update.sqlpp     |   2 +-
 .../dblp-1_2.1/dblp-1_2.1.2.update.sqlpp         |   2 +-
 .../fuzzyjoin/dblp-1_2/dblp-1_2.2.update.sqlpp   |   2 +-
 .../dblp-2.1_5.3.1/dblp-2.1_5.3.1.2.update.sqlpp |   2 +-
 .../fuzzyjoin/dblp-2.2/dblp-2.2.2.update.sqlpp   |   4 ++--
 .../fuzzyjoin/dblp-2_1/dblp-2_1.2.update.sqlpp   |   2 +-
 .../fuzzyjoin/dblp-2_2/dblp-2_2.2.update.sqlpp   |   2 +-
 .../fuzzyjoin/dblp-2_3/dblp-2_3.2.update.sqlpp   |   2 +-
 .../fuzzyjoin/dblp-2_4/dblp-2_4.2.update.sqlpp   |   2 +-
 .../dblp-2_5.1/dblp-2_5.1.2.update.sqlpp         |   2 +-
 .../dblp-2_5.2/dblp-2_5.2.2.update.sqlpp         |   2 +-
 .../dblp-2_5.3.1/dblp-2_5.3.1.2.update.sqlpp     |   2 +-
 .../dblp-2_5.3/dblp-2_5.3.2.update.sqlpp         |   2 +-
 .../fuzzyjoin/dblp-2_5/dblp-2_5.2.update.sqlpp   |   2 +-
 .../dblp-3_1.1/dblp-3_1.1.2.update.sqlpp         |   2 +-
 .../dblp-3_1.2/dblp-3_1.2.2.update.sqlpp         |   2 +-
 .../fuzzyjoin/dblp-3_1/dblp-3_1.2.update.sqlpp   |   2 +-
 .../dblp-aqlplus_1/dblp-aqlplus_1.2.update.sqlpp |   2 +-
 .../dblp-aqlplus_2/dblp-aqlplus_2.2.update.sqlpp |   2 +-
 .../dblp-csx-2_1/dblp-csx-2_1.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_2/dblp-csx-2_2.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_3/dblp-csx-2_3.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_4/dblp-csx-2_4.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_5.1/dblp-csx-2_5.1.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_5.2/dblp-csx-2_5.2.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_5.3.1.2.update.sqlpp              | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_5.3/dblp-csx-2_5.3.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-2_5/dblp-csx-2_5.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_1/dblp-csx-3_1.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_2/dblp-csx-3_2.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_3/dblp-csx-3_3.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_4/dblp-csx-3_4.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.1/dblp-csx-3_5.1.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.2/dblp-csx-3_5.2.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.3.1.2.update.sqlpp              | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.3/dblp-csx-3_5.3.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.4.1.2.update.sqlpp              | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5.4/dblp-csx-3_5.4.2.update.sqlpp | Bin 1232 -> 1116 bytes
 .../dblp-csx-3_5/dblp-csx-3_5.2.update.sqlpp     | Bin 1232 -> 1116 bytes
 .../dblp-csx-aqlplus_1.2.update.sqlpp            | Bin 1248 -> 1132 bytes
 .../dblp-csx-aqlplus_2.2.update.sqlpp            | Bin 1248 -> 1132 bytes
 .../dblp-csx-aqlplus_3.2.update.sqlpp            | Bin 1248 -> 1132 bytes
 .../dblp-csx-dblp-aqlplus_1.2.update.sqlpp       | Bin 1248 -> 1132 bytes
 .../dblp-lookup_1/dblp-lookup_1.2.update.sqlpp   |   2 +-
 .../dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp  |   2 +-
 .../dblp-splits-3_1.2.update.sqlpp               |   2 +-
 .../events-users-aqlplus_1.2.update.sqlpp        |   2 +-
 .../fuzzyjoin/opentype/opentype.2.update.sqlpp   |   2 +-
 .../user-int-aqlplus_1.2.update.sqlpp            |   2 +-
 .../user-int-aqlplus_2.2.update.sqlpp            |   2 +-
 .../user-int-aqlplus_3.2.update.sqlpp            |   2 +-
 .../user-lot-aqlplus_1.1.2.update.sqlpp          |   2 +-
 .../user-lot-aqlplus_1.2.update.sqlpp            |   2 +-
 .../user-lot-aqlplus_2.2.update.sqlpp            |   2 +-
 .../user-lot-aqlplus_3.2.update.sqlpp            |   2 +-
 .../user-vis-int-3_1.2.update.sqlpp              |   4 ++--
 .../user-vis-int-aqlplus_1.2.update.sqlpp        |   4 ++--
 .../user-vis-int-aqlplus_2.2.update.sqlpp        |   4 ++--
 .../user-vis-int-aqlplus_3.2.update.sqlpp        |   4 ++--
 ...vis-int-vis-user-lot-aqlplus_1.2.update.sqlpp |   4 ++--
 .../user-vis-lot-3_1.2.update.sqlpp              |   4 ++--
 .../user-vis-lot-aqlplus_1.2.update.sqlpp        |   4 ++--
 .../user-vis-lot-aqlplus_2.2.update.sqlpp        |   4 ++--
 .../user-vis-lot-aqlplus_3.2.update.sqlpp        |   4 ++--
 .../user-vis-lot-aqlplus_4.2.update.sqlpp        |   4 ++--
 .../user-vis-lot-aqlplus_5.2.update.sqlpp        |   4 ++--
 .../user-vis-lot-int-aqlplus_1.2.update.sqlpp    |   4 ++--
 .../user-vis-lot-int-aqlplus_2.2.update.sqlpp    |   4 ++--
 .../issue_251_dataset_hint_5.2.update.sqlpp      |   2 +-
 .../btree-index-nested-loop-join.2.update.sqlpp  |   6 +++---
 .../btree-primary-equi-join.2.update.sqlpp       |   4 ++--
 .../btree-secondary-equi-join_01.2.update.sqlpp  | Bin 1227 -> 1111 bytes
 .../btree-secondary-equi-join_02.2.update.sqlpp  | Bin 1525 -> 1409 bytes
 .../btree-secondary-equi-join_03.2.update.sqlpp  | Bin 1655 -> 1539 bytes
 .../rtree-spatial-intersect-point.2.update.sqlpp |   4 ++--
 ...obe-pidx-with-join-btree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-btree-sidx2.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx1.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx2.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx2.2.update.sqlpp |   2 +-
 ...-composite-key-mixed-intervals.2.update.sqlpp |   2 +-
 .../btree-index-composite-key.2.update.sqlpp     |   2 +-
 .../btree-index-rewrite-multiple.2.update.sqlpp  |   2 +-
 .../cust-index-age-nullable.2.update.sqlpp       |   2 +-
 .../inverted-index-ngram-contains.2.update.sqlpp |   2 +-
 ...x-ngram-edit-distance-contains.2.update.sqlpp |   2 +-
 ...ndex-ngram-edit-distance-panic.2.update.sqlpp |   2 +-
 ...gram-edit-distance-word-tokens.2.update.sqlpp |   2 +-
 ...rted-index-ngram-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.2.update.sqlpp  |   2 +-
 ...ndex-olist-edit-distance-panic.2.update.sqlpp |   2 +-
 ...rted-index-olist-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-olist-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-ulist-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-word-contains.2.update.sqlpp  |   2 +-
 .../inverted-index-word-jaccard.2.update.sqlpp   |   2 +-
 ...index-custkey-conjunctive-open.2.update.sqlpp |   2 +-
 ...ders-index-custkey-conjunctive.2.update.sqlpp |   2 +-
 .../orders-index-custkey-open.2.update.sqlpp     |   2 +-
 .../orders-index-custkey.2.update.sqlpp          |   2 +-
 .../range-search-open.2.update.sqlpp             |   2 +-
 .../range-search/range-search.2.update.sqlpp     |   2 +-
 ...secondary-index-circular-query.2.update.sqlpp |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 .../rtree-secondary-index-open.2.update.sqlpp    |   2 +-
 .../rtree-secondary-index.2.update.sqlpp         |   2 +-
 .../ngram-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../ngram-edit-distance.2.update.sqlpp           |   4 ++--
 .../ngram-jaccard-inline.2.update.sqlpp          | Bin 1820 -> 1704 bytes
 .../ngram-jaccard/ngram-jaccard.2.update.sqlpp   | Bin 1673 -> 1557 bytes
 .../olist-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../olist-edit-distance.2.update.sqlpp           |   4 ++--
 .../olist-jaccard-inline.2.update.sqlpp          |   4 ++--
 .../olist-jaccard/olist-jaccard.2.update.sqlpp   |   4 ++--
 .../ulist-jaccard-inline.2.update.sqlpp          |   4 ++--
 .../ulist-jaccard/ulist-jaccard.2.update.sqlpp   |   4 ++--
 .../word-jaccard-inline.2.update.sqlpp           | Bin 1819 -> 1703 bytes
 .../word-jaccard/word-jaccard.2.update.sqlpp     | Bin 1672 -> 1556 bytes
 .../ngram-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../ngram-edit-distance.2.update.sqlpp           |   4 ++--
 .../ngram-jaccard-inline.2.update.sqlpp          | Bin 1679 -> 1563 bytes
 .../ngram-jaccard/ngram-jaccard.2.update.sqlpp   | Bin 1532 -> 1416 bytes
 .../olist-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../olist-edit-distance.2.update.sqlpp           |   4 ++--
 .../olist-jaccard-inline.2.update.sqlpp          |   4 ++--
 .../olist-jaccard/olist-jaccard.2.update.sqlpp   |   4 ++--
 .../ulist-jaccard-inline.2.update.sqlpp          |   4 ++--
 .../ulist-jaccard/ulist-jaccard.2.update.sqlpp   |   4 ++--
 .../word-jaccard-inline.2.update.sqlpp           | Bin 1678 -> 1562 bytes
 .../word-jaccard/word-jaccard.2.update.sqlpp     | Bin 1531 -> 1415 bytes
 .../query_issue285-2.2.update.sqlpp              | Bin 1528 -> 1412 bytes
 .../query_issue285/query_issue285.2.update.sqlpp | Bin 1528 -> 1412 bytes
 .../query_issue658/query_issue658.2.update.sqlpp | Bin 1358 -> 1242 bytes
 .../load/adm_binary/adm_binary.2.update.sqlpp    |   2 +-
 .../load/csv_01/csv_01.2.update.sqlpp            |   2 +-
 .../load/csv_02/csv_02.2.update.sqlpp            |   2 +-
 .../load/csv_03/csv_03.2.update.sqlpp            |   2 +-
 .../load/csv_04/csv_04.2.update.sqlpp            |   2 +-
 .../load/csv_05/csv_05.2.update.sqlpp            |   2 +-
 .../load/csv_06/csv_06.2.update.sqlpp            |   2 +-
 .../load/csv_07/csv_07.2.update.sqlpp            |   2 +-
 .../load/csv_08_header_cr/csv_08.2.update.sqlpp  |   2 +-
 .../csv_08_header_crlf/csv_08.2.update.sqlpp     |   2 +-
 .../load/csv_08_header_lf/csv_08.2.update.sqlpp  |   2 +-
 .../issue289_query/issue289_query.2.update.sqlpp |   2 +-
 .../issue650_query/issue650_query.2.update.sqlpp |   2 +-
 .../misc/flushtest/flushtest.2.update.sqlpp      |   2 +-
 .../groupby-orderby-count.1.ddl.sqlpp            |   2 +-
 .../nested-loop-join_01.2.update.sqlpp           |   4 ++--
 .../prefix-search/prefix-search.2.update.sqlpp   |   2 +-
 .../misc/stable_sort/stable_sort.2.update.sqlpp  |   2 +-
 ...ompact-dataset-and-its-indexes.2.update.sqlpp |   2 +-
 ...from-loaded-dataset-with-index.2.update.sqlpp |   2 +-
 .../nested-index-dml/delete-syntax-change.sqlpp  |   2 +-
 .../drop-index/drop-index.2.update.sqlpp         |   2 +-
 ...o-loaded-dataset-with-index_01.2.update.sqlpp |   2 +-
 ...o-loaded-dataset-with-index_02.2.update.sqlpp |   2 +-
 .../load-with-index.2.update.sqlpp               |   2 +-
 .../load-with-ngram-index.2.update.sqlpp         |   2 +-
 .../load-with-rtree-index.2.update.sqlpp         |   2 +-
 .../load-with-word-index.2.update.sqlpp          |   2 +-
 .../nested-uuid-load.2.update.sqlpp              |   2 +-
 ...btree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ngram-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ed-index-ngram-secondary-index.2.update.sqlpp |   2 +-
 ...-word-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ted-index-word-secondary-index.2.update.sqlpp |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...n-delete-rtree-secondary-index.2.update.sqlpp |   2 +-
 ...btree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ngram-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ed-index-ngram-secondary-index.2.update.sqlpp |   2 +-
 ...-word-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...ted-index-word-secondary-index.2.update.sqlpp |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 ...n-insert-rtree-secondary-index.2.update.sqlpp |   4 ++--
 .../btree-primary-equi-join.2.update.sqlpp       |   4 ++--
 .../btree-secondary-equi-join.2.update.sqlpp     | Bin 1672 -> 1556 bytes
 .../ngram-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../ngram-edit-distance.2.update.sqlpp           |   4 ++--
 .../ngram-jaccard-inline.2.update.sqlpp          | Bin 1829 -> 1713 bytes
 .../ngram-jaccard/ngram-jaccard.2.update.sqlpp   | Bin 1682 -> 1566 bytes
 .../rtree-spatial-intersect-point.2.update.sqlpp |   4 ++--
 .../word-jaccard-inline.2.update.sqlpp           | Bin 1828 -> 1712 bytes
 .../word-jaccard/word-jaccard.2.update.sqlpp     | Bin 1681 -> 1565 bytes
 ...obe-pidx-with-join-btree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-btree-sidx2.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx1.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx2.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx2.2.update.sqlpp |   2 +-
 ...-composite-key-mixed-intervals.2.update.sqlpp |   2 +-
 .../btree-index-composite-key.2.update.sqlpp     |   2 +-
 .../btree-index-rewrite-multiple.2.update.sqlpp  |   2 +-
 .../cust-index-age-nullable.2.update.sqlpp       |   2 +-
 .../inverted-index-ngram-contains.2.update.sqlpp |   2 +-
 ...x-ngram-edit-distance-contains.2.update.sqlpp |   2 +-
 ...ndex-ngram-edit-distance-panic.2.update.sqlpp |   2 +-
 ...gram-edit-distance-word-tokens.2.update.sqlpp |   2 +-
 ...rted-index-ngram-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.2.update.sqlpp  |   2 +-
 ...ndex-olist-edit-distance-panic.2.update.sqlpp |   2 +-
 ...rted-index-olist-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-olist-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-ulist-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-word-contains.2.update.sqlpp  |   2 +-
 .../inverted-index-word-jaccard.2.update.sqlpp   |   2 +-
 ...index-custkey-conjunctive-open.2.update.sqlpp |   2 +-
 ...ders-index-custkey-conjunctive.2.update.sqlpp |   2 +-
 .../orders-index-custkey-open.2.update.sqlpp     |   2 +-
 .../orders-index-custkey.2.update.sqlpp          |   2 +-
 .../range-search-open.2.update.sqlpp             |   2 +-
 .../range-search/range-search.2.update.sqlpp     |   2 +-
 ...rtree-secondary-index-nullable.2.update.sqlpp |   2 +-
 .../rtree-secondary-index-open.2.update.sqlpp    |   2 +-
 .../rtree-secondary-index.2.update.sqlpp         |   2 +-
 .../btree-secondary-equi-join.2.update.sqlpp     | Bin 1849 -> 1733 bytes
 .../ngram-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../ngram-edit-distance.2.update.sqlpp           |   4 ++--
 .../ngram-jaccard-inline.2.update.sqlpp          | Bin 1992 -> 1876 bytes
 .../ngram-jaccard/ngram-jaccard.2.update.sqlpp   | Bin 1845 -> 1729 bytes
 .../rtree-spatial-intersect-point.2.update.sqlpp |   4 ++--
 .../word-jaccard-inline.2.update.sqlpp           | Bin 1991 -> 1875 bytes
 .../word-jaccard/word-jaccard.2.update.sqlpp     | Bin 1844 -> 1728 bytes
 ...obe-pidx-with-join-btree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-btree-sidx2.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx2.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx2.2.update.sqlpp |   2 +-
 ...-composite-key-mixed-intervals.2.update.sqlpp |   2 +-
 .../btree-index-composite-key.2.update.sqlpp     |   2 +-
 .../btree-index-rewrite-multiple.2.update.sqlpp  |   2 +-
 .../inverted-index-ngram-contains.2.update.sqlpp |   2 +-
 ...x-ngram-edit-distance-contains.2.update.sqlpp |   2 +-
 ...ndex-ngram-edit-distance-panic.2.update.sqlpp |   2 +-
 ...gram-edit-distance-word-tokens.2.update.sqlpp |   2 +-
 ...rted-index-ngram-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-word-contains.2.update.sqlpp  |   2 +-
 .../inverted-index-word-jaccard.2.update.sqlpp   |   2 +-
 ...ders-index-custkey-conjunctive.2.update.sqlpp |   2 +-
 .../orders-index-custkey.2.update.sqlpp          |   2 +-
 .../range-search/range-search.2.update.sqlpp     |   2 +-
 .../rtree-secondary-index.2.update.sqlpp         |   2 +-
 .../query-issue208/query-issue208.2.update.sqlpp |   2 +-
 .../query-issue350-2.2.update.sqlpp              |   2 +-
 .../query-issue350/query-issue350.2.update.sqlpp |   2 +-
 .../btree-secondary-equi-join.2.update.sqlpp     | Bin 1759 -> 1643 bytes
 .../ngram-edit-distance-inline.2.update.sqlpp    |   4 ++--
 .../ngram-edit-distance.2.update.sqlpp           |   4 ++--
 .../ngram-jaccard-inline.2.update.sqlpp          | Bin 1902 -> 1786 bytes
 .../ngram-jaccard/ngram-jaccard.2.update.sqlpp   | Bin 1755 -> 1639 bytes
 .../rtree-spatial-intersect-point.2.update.sqlpp |   4 ++--
 .../word-jaccard-inline.2.update.sqlpp           | Bin 1901 -> 1785 bytes
 .../word-jaccard/word-jaccard.2.update.sqlpp     | Bin 1754 -> 1638 bytes
 ...obe-pidx-with-join-btree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-btree-sidx2.2.update.sqlpp |   2 +-
 ...be-pidx-with-join-invidx-sidx2.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx1.2.update.sqlpp |   2 +-
 ...obe-pidx-with-join-rtree-sidx2.2.update.sqlpp |   2 +-
 ...-composite-key-mixed-intervals.2.update.sqlpp |   2 +-
 .../btree-index-composite-key.2.update.sqlpp     |   2 +-
 .../btree-index-rewrite-multiple.2.update.sqlpp  |   2 +-
 .../inverted-index-ngram-contains.2.update.sqlpp |   2 +-
 ...x-ngram-edit-distance-contains.2.update.sqlpp |   2 +-
 ...ndex-ngram-edit-distance-panic.2.update.sqlpp |   2 +-
 ...gram-edit-distance-word-tokens.2.update.sqlpp |   2 +-
 ...rted-index-ngram-edit-distance.2.update.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.2.update.sqlpp  |   2 +-
 .../inverted-index-word-contains.2.update.sqlpp  |   2 +-
 .../inverted-index-word-jaccard.2.update.sqlpp   |   2 +-
 ...ders-index-custkey-conjunctive.2.update.sqlpp |   2 +-
 .../orders-index-custkey.2.update.sqlpp          |   2 +-
 .../range-search/range-search.2.update.sqlpp     |   2 +-
 .../rtree-secondary-index.2.update.sqlpp         |   2 +-
 .../query-ASTERIXDB-1005.2.update.sqlpp          |   2 +-
 .../somesat_02/somesat_02.2.update.sqlpp         |   4 ++--
 .../queries_sqlpp/scan/10/10.2.update.sqlpp      |   2 +-
 .../queries_sqlpp/scan/20/20.2.update.sqlpp      |   2 +-
 .../queries_sqlpp/scan/30/30.1.ddl.sqlpp         |   2 +-
 .../scan/alltypes_01/alltypes_01.1.ddl.sqlpp     |   2 +-
 .../queries_sqlpp/scan/alltypes_02.sqlpp         |   2 +-
 .../scan/alltypes_02/alltypes_02.1.ddl.sqlpp     |   2 +-
 .../issue238_query_1.2.update.sqlpp              |   2 +-
 .../issue238_query_2.2.update.sqlpp              |   2 +-
 .../numeric_types_01.1.ddl.sqlpp                 |   2 +-
 .../spatial_types_01.1.ddl.sqlpp                 |   2 +-
 .../spatial_types_02.1.ddl.sqlpp                 |   2 +-
 .../scan/temp_types_01/temp_types_01.1.ddl.sqlpp |   2 +-
 .../temp_types_02/temp_types_02.2.update.sqlpp   |   2 +-
 .../count-nullable/count-nullable.1.ddl.sqlpp    |   2 +-
 .../cust-filter/cust-filter.1.ddl.sqlpp          |   2 +-
 .../has-param1/has-param1.1.ddl.sqlpp            |   2 +-
 .../fuzzyeq-edit-distance.2.update.sqlpp         |   2 +-
 .../fuzzyeq-similarity-jaccard.2.update.sqlpp    |   2 +-
 ...similarity-jaccard-check_query.2.update.sqlpp |   2 +-
 ...ity-jaccard-sorted-check_query.2.update.sqlpp |   2 +-
 ...imilarity-jaccard-sorted_query.2.update.sqlpp |   2 +-
 .../similarity-jaccard_query.2.update.sqlpp      |   2 +-
 ...ell-aggregation-with-filtering.2.update.sqlpp |   2 +-
 .../cell-aggregation.1.ddl.sqlpp                 |   2 +-
 .../circle-intersect-circle.1.ddl.sqlpp          |   2 +-
 .../create-rtree-index.2.update.sqlpp            |   2 +-
 .../distance-between-points.1.ddl.sqlpp          |   2 +-
 .../line-intersect-circle.1.ddl.sqlpp            |   2 +-
 .../line-intersect-line.1.ddl.sqlpp              |   2 +-
 .../line-intersect-polygon.1.ddl.sqlpp           |   2 +-
 .../line-intersect-rectangle.1.ddl.sqlpp         |   2 +-
 .../point-equals-point.1.ddl.sqlpp               |   2 +-
 .../point-in-circle/point-in-circle.1.ddl.sqlpp  |   2 +-
 .../point-in-polygon.1.ddl.sqlpp                 |   2 +-
 .../point-in-rectangle.1.ddl.sqlpp               |   2 +-
 .../point-on-line/point-on-line.1.ddl.sqlpp      |   2 +-
 .../polygon-intersect-circle.1.ddl.sqlpp         |   2 +-
 .../polygon-intersect-polygon.1.ddl.sqlpp        |   2 +-
 .../polygon-intersect-rectangle.1.ddl.sqlpp      |   2 +-
 .../rectangle-intersect-circle.1.ddl.sqlpp       |   2 +-
 .../rectangle-intersect-rectangle.1.ddl.sqlpp    |   2 +-
 .../spatial-area/spatial-area.1.ddl.sqlpp        |   2 +-
 ...from-loaded-dataset-with-index.2.update.sqlpp |   2 +-
 .../delete-from-loaded-dataset.2.update.sqlpp    |   2 +-
 .../drop-index/drop-index.2.update.sqlpp         |   2 +-
 .../empty-load-with-index.2.update.sqlpp         |   4 ++--
 ...rt-and-scan-dataset-with-index.2.update.sqlpp |   2 +-
 .../insert-and-scan-dataset.2.update.sqlpp       |   2 +-
 .../q01_pricing_summary_report_nt.2.update.sqlpp |   2 +-
 ...n-delete-rtree-secondary-index.2.update.sqlpp |   2 +-
 ...scan-insert-persistent-to-temp.2.update.sqlpp |   4 ++--
 ...n-insert-rtree-secondary-index.2.update.sqlpp |   4 ++--
 ...scan-insert-temp-to-persistent.2.update.sqlpp |   4 ++--
 .../insert_from_delimited_ds.2.update.sqlpp      |   2 +-
 .../insert_from_ext_ds.1.ddl.sqlpp               |   2 +-
 .../q01_pricing_summary_report_nt.2.update.sqlpp |   2 +-
 .../q02_minimum_cost_supplier.2.update.sqlpp     |  16 ++++++++--------
 .../q03_shipping_priority_nt.2.update.sqlpp      |   6 +++---
 .../q04_order_priority.2.update.sqlpp            |  16 ++++++++--------
 .../q05_local_supplier_volume.2.update.sqlpp     |  16 ++++++++--------
 .../q06_forecast_revenue_change.2.update.sqlpp   |  16 ++++++++--------
 .../q07_volume_shipping.2.update.sqlpp           |  16 ++++++++--------
 .../q08_national_market_share.2.update.sqlpp     |  16 ++++++++--------
 .../q09_product_type_profit_nt.2.update.sqlpp    |  16 ++++++++--------
 .../q10_returned_item.2.update.sqlpp             |  16 ++++++++--------
 .../q10_returned_item_int64.2.update.sqlpp       |  16 ++++++++--------
 .../q11_important_stock.2.update.sqlpp           |  16 ++++++++--------
 .../q12_shipping/q12_shipping.2.update.sqlpp     |  16 ++++++++--------
 .../q13_customer_distribution.2.update.sqlpp     |  16 ++++++++--------
 .../q14_promotion_effect.2.update.sqlpp          |  16 ++++++++--------
 .../q15_top_supplier.2.update.sqlpp              |  16 ++++++++--------
 ...16_parts_supplier_relationship.2.update.sqlpp |  16 ++++++++--------
 .../q17_large_gby_variant.2.update.sqlpp         |  16 ++++++++--------
 ...7_small_quantity_order_revenue.2.update.sqlpp |  16 ++++++++--------
 .../q18_large_volume_customer.2.update.sqlpp     |  16 ++++++++--------
 .../q19_discounted_revenue.2.update.sqlpp        |  16 ++++++++--------
 .../q20_potential_part_promotion.2.update.sqlpp  |  16 ++++++++--------
 ...pliers_who_kept_orders_waiting.2.update.sqlpp |  16 ++++++++--------
 .../q22_global_sales_opportunity.2.update.sqlpp  |  16 ++++++++--------
 .../query-issue601/query-issue601.2.update.sqlpp |   2 +-
 .../query-issue785-2.2.update.sqlpp              |  12 ++++++------
 .../query-issue785/query-issue785.2.update.sqlpp |  12 ++++++------
 .../query-issue786/query-issue786.2.update.sqlpp |  12 ++++++------
 .../tpch/distinct_by/distinct_by.2.update.sqlpp  |   2 +-
 .../group_no_agg/group_no_agg.2.update.sqlpp     |   2 +-
 .../nest_aggregate/nest_aggregate.2.update.sqlpp |  12 ++++++------
 .../nest_aggregate2.2.update.sqlpp               |  12 ++++++------
 .../q01_pricing_summary_report_nt.2.update.sqlpp |   2 +-
 .../q02_minimum_cost_supplier.2.update.sqlpp     |  16 ++++++++--------
 .../q03_shipping_priority_nt.2.update.sqlpp      |   6 +++---
 .../q04_order_priority.2.update.sqlpp            |  16 ++++++++--------
 .../q05_local_supplier_volume.2.update.sqlpp     |  16 ++++++++--------
 .../q06_forecast_revenue_change.2.update.sqlpp   |  16 ++++++++--------
 .../q07_volume_shipping.2.update.sqlpp           |  16 ++++++++--------
 .../q08_national_market_share.2.update.sqlpp     |  16 ++++++++--------
 .../q09_product_type_profit_nt.2.update.sqlpp    |  16 ++++++++--------
 .../q10_returned_item.2.update.sqlpp             |  16 ++++++++--------
 .../q10_returned_item_int64.2.update.sqlpp       |  16 ++++++++--------
 .../q11_important_stock.2.update.sqlpp           |  16 ++++++++--------
 .../q12_shipping/q12_shipping.2.update.sqlpp     |  16 ++++++++--------
 .../q13_customer_distribution.2.update.sqlpp     |  16 ++++++++--------
 .../q14_promotion_effect.2.update.sqlpp          |  16 ++++++++--------
 .../q15_top_supplier.2.update.sqlpp              |  16 ++++++++--------
 ...16_parts_supplier_relationship.2.update.sqlpp |  16 ++++++++--------
 .../q17_large_gby_variant.2.update.sqlpp         |  16 ++++++++--------
 ...7_small_quantity_order_revenue.2.update.sqlpp |  16 ++++++++--------
 .../q18_large_volume_customer.2.update.sqlpp     |  16 ++++++++--------
 .../q19_discounted_revenue.2.update.sqlpp        |  16 ++++++++--------
 .../q20_potential_part_promotion.2.update.sqlpp  |  16 ++++++++--------
 ...pliers_who_kept_orders_waiting.2.update.sqlpp |  16 ++++++++--------
 .../q22_global_sales_opportunity.2.update.sqlpp  |  16 ++++++++--------
 .../query-issue562/query-issue562.2.update.sqlpp |  16 ++++++++--------
 .../query-issue601/query-issue601.2.update.sqlpp |   2 +-
 .../query-issue785-2.2.update.sqlpp              |  12 ++++++------
 .../query-issue785/query-issue785.2.update.sqlpp |  12 ++++++------
 .../query-issue786/query-issue786.2.update.sqlpp |  12 ++++++------
 .../query-issue810-2.2.update.sqlpp              |   2 +-
 .../query-issue810-3.2.update.sqlpp              |   2 +-
 .../query-issue810/query-issue810.2.update.sqlpp |   2 +-
 .../query-issue827-2.2.update.sqlpp              |   2 +-
 .../query-issue827/query-issue827.2.update.sqlpp |   2 +-
 .../cross-dataverse/cross-dv19/cross-dv19.1.adm  |   4 ++--
 .../resources/spatial/local/spatial-load.aql     |   2 +-
 .../tpch/queries/asterix/load_data_adm.aql       |  16 ++++++++--------
 .../tpch/queries/asterix/load_data_tbl_100x.aql  |  16 ++++++++--------
 .../tpch/queries/asterix/load_data_tbl_1x.aql    |  16 ++++++++--------
 .../tpch/queries/local/load_adm_data.aql         |  16 ++++++++--------
 .../local/load_tbl_data_0.001x_2nodes.aql        |  16 ++++++++--------
 .../queries/local/load_tbl_data_10x_1node.aql    |  16 ++++++++--------
 .../queries/local/load_tbl_data_1x_1node.aql     |  16 ++++++++--------
 .../queries/local/load_tbl_data_20x_2node.aql    |  16 ++++++++--------
 .../primary_index_only.3.update.aql              |   2 +-
 ...ary_plus_default_secondary_index.3.update.aql |   2 +-
 ...ary_plus_keyword_secondary_index.3.update.aql |   2 +-
 ..._plus_multiple_secondary_indices.3.update.aql |   2 +-
 .../primary_plus_ngram_index.3.update.aql        |   2 +-
 .../primary_plus_rtree_index.3.update.aql        |   2 +-
 .../primary_index_only.3.update.aql              |   2 +-
 ...ary_plus_default_secondary_index.3.update.aql |   2 +-
 ...ary_plus_keyword_secondary_index.3.update.aql |   2 +-
 ..._plus_multiple_secondary_indices.3.update.aql |   2 +-
 .../primary_plus_ngram_index.3.update.aql        |   2 +-
 .../primary_plus_rtree_index.3.update.aql        |   2 +-
 .../delete_after_recovery.3.update.aql           |   2 +-
 .../insert_after_recovery.3.update.aql           |   2 +-
 .../load_after_recovery.5.update.aql             |   2 +-
 .../delete_after_recovery.3.update.aql           |   2 +-
 .../insert_after_recovery.3.update.aql           |   2 +-
 .../load_after_recovery.5.update.aql             |   2 +-
 1151 files changed, 2101 insertions(+), 2101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/dapd/q2.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dapd/q2.aql b/asterix-app/src/test/resources/dapd/q2.aql
index 464bf8b..f40f857 100644
--- a/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterix-app/src/test/resources/dapd/q2.aql
@@ -58,7 +58,7 @@ declare dataset Event(EventType)
   primary key event_id on group1;
 
 load dataset Event 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
 
 write output to asterix_nc1:"/tmp/dapd_q2.adm";

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql b/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
index 4b581a9..24d7a77 100644
--- a/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
+++ b/asterix-app/src/test/resources/demo0216/01-load-dblp-large.aql
@@ -33,5 +33,5 @@ declare dataset DBLP(DBLPType)
  primary key id on group1;
 
 load dataset DBLP 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="rainbow-01:///home/hyracks/demo-data/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":") pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql b/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
index 54b1f55..20509aa 100644
--- a/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
+++ b/asterix-app/src/test/resources/demo0216/03-load-dblp-small.aql
@@ -33,6 +33,6 @@ declare dataset DBLPSmall(DBLPType)
  primary key id on group1;
 
 load dataset DBLPSmall 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="rainbow-01:///home/hyracks/demo-data/dblp-small-id.txt"),("format"="delimited-text"),("delimiter"=":") pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo0927/local/load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/load-cust.aql b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
index 71ce704..0588b7f 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-cust.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
@@ -41,6 +41,6 @@ declare dataset Customers(CustomerType)
   primary key cid on group1;
 
 load dataset Customers 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo0927/local/load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo0927/local/load-ord.aql b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
index 8377df6..a828b6e 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-ord.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
@@ -33,6 +33,6 @@ declare dataset Orders(OrderType)
   primary key oid on group1;
 
 load dataset Orders from asterix_nc1:"/tmp/orderData.json";
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
index 15d4d78..768c844 100644
--- a/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo1112/local/01-load-cust.aql
@@ -41,6 +41,6 @@ declare dataset Customers(CustomerType)
   primary key cid on group1;
 
 load dataset Customers 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
index 367d1d6..6866f18 100644
--- a/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
+++ b/asterix-app/src/test/resources/demo1112/local/03-load-ord.aql
@@ -33,5 +33,5 @@ declare dataset Orders(OrderType)
   primary key oid on group1;
 
 load dataset Orders 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/orderData.adm"),("format"="adm")) pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
index fab7181..12a0207 100644
--- a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
@@ -39,6 +39,6 @@ declare dataset Customers(CustomerType)
   primary key cid on group1;
 
 load dataset Customers 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/customer.adm"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
index d20db92..b447d46 100644
--- a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
@@ -33,5 +33,5 @@ declare dataset Orders(OrderType)
   primary key oid on group1;
 
 load dataset Orders 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/orders.adm"),("format"="adm"));

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
index c810f14..b1dc420 100644
--- a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
@@ -32,5 +32,5 @@ declare dataset DBLP(DBLPType)
  primary key id on group1;
 
 load dataset DBLP 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql b/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
index f5ec9c0..a74bdae 100644
--- a/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
+++ b/asterix-app/src/test/resources/dmlts/scripts/load-cust.aql
@@ -45,5 +45,5 @@ create dataset Customers(CustomerType)
   primary key cid on group1;
 
 load dataset Customers 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1://data/custord-tiny/customer-tiny.adm"),("format"="adm")) pre-sorted;

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
index 28274bb..97e8c79 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx-small.aql
@@ -32,7 +32,7 @@ declare dataset CSXSmall(CSXType)
   primary key id on group1;
 
 load dataset CSXSmall
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1://data/fuzzyjoin/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
index 8cbad2d..a5a1e1f 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-csx.aql
@@ -32,7 +32,7 @@ declare dataset CSX(CSXType)
   primary key id on group1;
 
 load dataset CSX 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1://data/fuzzyjoin/pub/csx-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
index 0d2fb35..e35290a 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/amerix/10-load-dblp.aql
@@ -32,7 +32,7 @@ declare dataset DBLP(DBLPType)
   primary key id on group1;
 
 load dataset DBLP 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1://data/fuzzyjoin/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql b/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
index 8113b6f..1f2995b 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/dblp/010-load.aql
@@ -32,6 +32,6 @@ declare dataset DBLP(DBLPType)
   primary key id on group1;
 
 load dataset DBLP 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///asterix/asterix-app/data/dblp-small/dblp-small-id.txt"),("format"="delimited-text"),("delimiter=":")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
index 6e0dd91..85d29ce 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/010-load-dblp.aql
@@ -33,6 +33,6 @@ declare dataset DBLP(DBLPType)
 
 // load dataset DBLP from asterix_nc1:'/asterix/asterix-app/data/pub-small/dblp-small-id.txt'
 load dataset DBLP 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///fuzzyjoin/data/dblp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
index 48a9a3c..28d08f3 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/pub/040-load-csx.aql
@@ -33,6 +33,6 @@ declare dataset CSX(CSXType)
 
 // load dataset CSX from asterix_nc1:'/asterix/asterix-app/data/pub-small/csx-small-id.txt'
 load dataset  CSX
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///asterix/asterix-app/data/pub-small/csx-small-id.txt"),("format"="delimited-text"),("delimiter"=":"),("quote"="\u0000")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
index 7ec7194..f5e73eb 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/010-load-users.aql
@@ -31,6 +31,6 @@ declare dataset Users(UserType)
   primary key uid on group1;
 
 load dataset Users 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/users.json"),("format"="adm")) pre-sorted;
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
index d59aed9..85154b6 100644
--- a/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
+++ b/asterix-app/src/test/resources/fuzzyjoin/users-visitors/040-load-visitors.aql
@@ -31,7 +31,7 @@ declare dataset Visitors(VisitorType)
   primary key vid on group1;
 
 load dataset Visitors 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1:///asterix/asterix-app/data/users-visitors-small/visitors.json"),("format"="asm")) pre-sorted;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/4db8a9d9/asterix-app/src/test/resources/integration/updates/load-dataset.aql
----------------------------------------------------------------------
diff --git a/asterix-app/src/test/resources/integration/updates/load-dataset.aql b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
index 48bb41a..7b9eb66 100644
--- a/asterix-app/src/test/resources/integration/updates/load-dataset.aql
+++ b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
@@ -36,5 +36,5 @@ declare dataset Customers(CustomerType)
   primary key cid on group1;
 
 load dataset Customers 
-using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
+using localfs
 (("path"="asterix_nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;