You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by pr...@apache.org on 2016/10/17 19:55:36 UTC

[46/50] [abbrv] asterixdb git commit: merge master

merge master


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

Branch: refs/heads/ecarm002/interval_join_merge
Commit: ed86c88a80f4e34cced61851daea034cdf4ccb99
Parents: 0b90051 68c6a99
Author: Preston Carman <pr...@apache.org>
Authored: Fri Sep 30 14:00:16 2016 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Fri Sep 30 14:00:16 2016 -0700

----------------------------------------------------------------------
 .gitignore                                      |   9 -
 .../apache/asterix/active/ActiveManager.java    |  22 +-
 .../ActiveSourceOperatorNodePushable.java       |  13 +-
 .../active/message/ActiveManagerMessage.java    |   8 +-
 .../active/message/ActivePartitionMessage.java  |   8 +-
 .../asterix/optimizer/base/RuleCollections.java |  13 +-
 ...IntroduceSecondaryIndexInsertDeleteRule.java | 801 +++++++---------
 .../rules/PushAggregateIntoGroupbyRule.java     | 486 ----------
 .../PushAggregateIntoNestedSubplanRule.java     | 486 ++++++++++
 .../rules/RemoveUnusedOneToOneEquiJoinRule.java |  37 +-
 .../rules/ReplaceSinkOpWithCommitOpRule.java    |   2 +-
 .../rules/SetAsterixPhysicalOperatorsRule.java  |   4 +-
 .../rules/am/InvertedIndexAccessMethod.java     |   2 +-
 .../subplan/InlineAllNtsInSubplanVisitor.java   |  30 +-
 ...ineSubplanInputForNestedTupleSourceRule.java |  14 +-
 .../rules/typecast/StaticTypeCastUtil.java      |   3 +-
 .../translator/AbstractLangTranslator.java      |  22 +-
 .../AqlPlusExpressionToPlanTranslator.java      |   2 +-
 .../asterix/translator/IStatementExecutor.java  |  10 +
 .../translator/IStatementExecutorFactory.java   |   1 -
 .../LangExpressionToPlanTranslator.java         | 131 +--
 .../asterix/translator/SessionConfig.java       | 264 ++++++
 .../SqlppExpressionToPlanTranslator.java        |   2 +-
 .../asterix/translator/TypeTranslator.java      |  83 +-
 .../translator/util/FunctionCollection.java     |   1 -
 .../asterix-algebra/src/main/javacc/AQLPlus.jj  |   3 +-
 .../asterix-app/data/tinysocial/twu_update.adm  |   8 +
 .../asterix-app/data/tpcds/catalog_sales.csv    |   8 +-
 asterixdb/asterix-app/data/tpcds/date_dim.csv   |   2 +-
 .../asterix-app/data/tpcds/store_sales.csv      |  16 +-
 .../closed-nullable-fields-issue_1616.adm       |   2 +
 .../apache/asterix/api/common/APIFramework.java |   7 +-
 ...rixAppRuntimeContextProviderForRecovery.java |   6 -
 .../common/AsterixHyracksIntegrationUtil.java   |  11 +-
 .../asterix/api/http/servlet/APIServlet.java    |   4 +-
 .../api/http/servlet/ClusterAPIServlet.java     |  73 +-
 .../servlet/ClusterCCDetailsAPIServlet.java     | 101 ++
 .../servlet/ClusterNodeDetailsAPIServlet.java   |  88 +-
 .../api/http/servlet/QueryResultAPIServlet.java |   2 +-
 .../api/http/servlet/QueryServiceServlet.java   | 115 ++-
 .../api/http/servlet/RESTAPIServlet.java        |   4 +-
 .../api/http/servlet/ShutdownAPIServlet.java    |  23 +-
 .../asterix/api/java/AsterixJavaClient.java     |   4 +-
 .../app/cc/AsterixResourceIdManager.java        |   6 +-
 .../asterix/app/external/FeedOperations.java    |   4 +-
 .../app/external/FeedWorkCollection.java        |   4 +-
 .../app/nc/AsterixNCAppRuntimeContext.java      |  23 +-
 .../asterix/app/result/ResultPrinter.java       |   3 +-
 .../apache/asterix/app/result/ResultUtil.java   |   2 +-
 .../DefaultStatementExecutorFactory.java        |   2 +-
 .../asterix/app/translator/QueryTranslator.java | 144 ++-
 .../bootstrap/CCApplicationEntryPoint.java      |  16 +-
 .../bootstrap/ClusterLifecycleListener.java     |  15 +-
 .../hyracks/bootstrap/ClusterWorkExecutor.java  |   4 +-
 .../bootstrap/GlobalRecoveryManager.java        |  10 +-
 .../bootstrap/NCApplicationEntryPoint.java      |  25 +-
 .../asterix/messaging/CCMessageBroker.java      |   5 +-
 .../asterix/messaging/NCMessageBroker.java      |  55 +-
 .../resources/asterix-build-configuration.xml   |   2 +-
 .../aql/translator/QueryTranslatorTest.java     |   8 +-
 .../asterix/test/metadata/MetadataTest.java     |   2 +-
 .../asterix/test/optimizer/OptimizerTest.java   |   2 +-
 .../asterix/test/runtime/ExecutionTest.java     |  15 +-
 .../test/runtime/SqlppExecutionTest.java        |  12 +-
 .../asterix/test/sqlpp/OptimizerParserTest.java |   5 +-
 .../asterix/test/sqlpp/ParserTestExecutor.java  |  11 +-
 .../asterix/test/sqlpp/RuntimeParserTest.java   |   2 +-
 .../asterix/test/sqlpp/SmokeParserTest.java     |   2 +-
 .../metadata/results/basic/meta01/meta01.1.adm  |   1 +
 .../metadata_datatype/metadata_datatype.1.adm   |   1 +
 .../metadata_dataverse/metadata_dataverse.1.adm |   1 +
 .../queries/aggregate/constant-agg.sqlpp        |   4 +-
 .../queries/aggregate/constant-gby-agg.sqlpp    |   4 +-
 .../queries/aggregate/count-dataset.sqlpp       |   4 +-
 .../queries/aggregate/list-dataset.sqlpp        |   2 +-
 .../aggregate/query-ASTERIXDB-1626-2.sqlpp      |  35 +
 .../aggregate/query-ASTERIXDB-1626-3.sqlpp      |  37 +
 .../aggregate/query-ASTERIXDB-1626.sqlpp        |  35 +
 .../primary-between-join_01.sqlpp               |   4 +-
 .../queries/join-singletonbranch-2.sqlpp        |   4 +-
 .../queries/join-singletonbranch-3.sqlpp        |   4 +-
 .../queries/join-singletonbranch.sqlpp          |   4 +-
 .../optimizerts/queries/loj-core.sqlpp          |   4 +-
 .../optimizerts/queries/loj-sugar.sqlpp         |   4 +-
 .../queries/query-ASTERIXDB-159-3.sqlpp         |   4 +-
 .../optimizerts/queries/select-self-join.aql    |  40 +
 .../optimizerts/queries/subquery/exists.sqlpp   |  10 +-
 .../optimizerts/queries/subquery/in.sqlpp       |   4 +-
 .../queries/subquery/in_correlated.sqlpp        |   4 +-
 .../queries/subquery/not_exists.sqlpp           |  10 +-
 .../queries/subquery/query-ASTERIXDB-1572.sqlpp |  41 +
 .../queries/tpcds/query-ASTERIXDB-1580.sqlpp    |  86 +-
 .../tpcds/query-ASTERIXDB-1581-correlated.sqlpp |  34 +-
 .../queries/tpcds/query-ASTERIXDB-1581.sqlpp    |  34 +-
 .../queries/tpcds/query-ASTERIXDB-1591.sqlpp    | 306 ++++++
 .../queries/tpcds/query-ASTERIXDB-1596.sqlpp    |  86 +-
 .../optimizerts/queries/tpch/q12_shipping.sqlpp |   4 +-
 ...oin-probe-pidx-with-join-btree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-btree-sidx_02.sqlpp |  14 +-
 .../primary-equi-join-multipred.sqlpp           |  12 +-
 .../primary-equi-join-neg_01.sqlpp              |   4 +-
 .../primary-equi-join-neg_02.sqlpp              |   4 +-
 .../btree-index-join/primary-equi-join_01.sqlpp |   4 +-
 .../btree-index-join/primary-equi-join_02.sqlpp |   4 +-
 .../btree-index-join/primary-equi-join_03.sqlpp |  12 +-
 .../btree-index-join/primary-equi-join_04.sqlpp |  12 +-
 .../btree-index-join/primary-equi-join_05.sqlpp |   8 +-
 .../btree-index-join/primary-ge-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-ge-join_02.sqlpp   |   4 +-
 .../btree-index-join/primary-gt-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-gt-join_02.sqlpp   |   4 +-
 .../btree-index-join/primary-le-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-le-join_02.sqlpp   |   4 +-
 .../btree-index-join/primary-lt-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-lt-join_02.sqlpp   |   4 +-
 .../secondary-equi-join-multiindex.sqlpp        |  16 +-
 .../secondary-equi-join-multipred.sqlpp         |   4 +-
 .../secondary-equi-join_01.sqlpp                |   4 +-
 .../secondary-equi-join_02.sqlpp                |   4 +-
 .../secondary-equi-join_03.sqlpp                |   2 +-
 .../btree-index/btree-datetime-01.sqlpp         |   4 +-
 .../btree-index/btree-datetime-02.sqlpp         |   4 +-
 .../btree-index/btree-datetime-03.sqlpp         |   2 +-
 .../btree-index/btree-datetime-04.sqlpp         |   2 +-
 .../btree-index/btree-secondary-33.sqlpp        |   2 +-
 .../btree-index/btree-secondary-34.sqlpp        |   2 +-
 .../btree-index/btree-secondary-35.sqlpp        |   2 +-
 .../btree-index/btree-secondary-36.sqlpp        |   2 +-
 .../btree-index/btree-secondary-37.sqlpp        |   2 +-
 .../btree-index/btree-secondary-38.sqlpp        |   2 +-
 .../btree-index/btree-secondary-39.sqlpp        |   2 +-
 .../btree-index/btree-secondary-40.sqlpp        |   2 +-
 .../btree-index/btree-secondary-41.sqlpp        |   2 +-
 .../btree-index/btree-secondary-42.sqlpp        |   2 +-
 .../btree-index/btree-secondary-43.sqlpp        |   2 +-
 .../btree-index/btree-secondary-44.sqlpp        |   2 +-
 .../btree-index/btree-secondary-45.sqlpp        |   2 +-
 .../btree-index/btree-secondary-46.sqlpp        |   2 +-
 .../btree-index/btree-secondary-47.sqlpp        |   2 +-
 .../btree-index/btree-secondary-48.sqlpp        |   2 +-
 .../btree-index/btree-secondary-49.sqlpp        |   2 +-
 .../btree-index/btree-secondary-50.sqlpp        |   2 +-
 .../btree-index/btree-secondary-51.sqlpp        |   2 +-
 .../btree-index/btree-secondary-52.sqlpp        |   2 +-
 .../btree-index/btree-secondary-53.sqlpp        |   2 +-
 .../btree-index/btree-secondary-54.sqlpp        |   2 +-
 .../btree-index/btree-secondary-55.sqlpp        |   2 +-
 .../btree-index/btree-secondary-56.sqlpp        |   2 +-
 .../btree-index/btree-secondary-57.sqlpp        |   2 +-
 .../btree-index/btree-secondary-58.sqlpp        |   2 +-
 .../btree-index/btree-secondary-59.sqlpp        |   2 +-
 .../btree-index/btree-secondary-60.sqlpp        |   2 +-
 .../btree-index/btree-secondary-61.sqlpp        |   2 +-
 .../btree-index/btree-secondary-62.sqlpp        |   2 +-
 .../btree-index/btree-secondary-63.sqlpp        |   2 +-
 .../optimizerts/queries_sqlpp/collocated.sqlpp  |   8 +-
 .../consolidate-selects-complex.sqlpp           |   2 +-
 .../consolidate-selects-simple.sqlpp            |   4 +-
 .../queries_sqlpp/count-tweets.sqlpp            |   4 +-
 .../queries_sqlpp/cust_group_no_agg.sqlpp       |   4 +-
 .../queries_sqlpp/denorm-cust-order.sqlpp       |  12 +-
 .../queries_sqlpp/distinct_aggregate.sqlpp      |   8 +-
 .../optimizerts/queries_sqlpp/fj-dblp-csx.sqlpp |   4 +-
 .../optimizerts/queries_sqlpp/fj-phase1.sqlpp   |   8 +-
 .../queries_sqlpp/fj-phase2-with-hints.sqlpp    |   2 +-
 .../queries_sqlpp/hashjoin-with-unnest.sqlpp    |   2 +-
 .../inlined_q18_large_volume_customer.sqlpp     |  22 +-
 .../insert-and-scan-dataset-with-index.sqlpp    |   4 +-
 .../queries_sqlpp/insert-and-scan-dataset.sqlpp |   2 +-
 .../insert-and-scan-joined-datasets.sqlpp       |   2 +-
 .../queries_sqlpp/introhashpartitionmerge.sqlpp |   4 +-
 .../ngram-contains-panic.sqlpp                  |   2 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |   2 +-
 .../ngram-edit-distance-check-panic.sqlpp       |   2 +-
 .../ngram-edit-distance-check.sqlpp             |   2 +-
 .../ngram-edit-distance-panic.sqlpp             |   2 +-
 .../ngram-edit-distance.sqlpp                   |   2 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |   2 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |   2 +-
 .../ngram-jaccard-check.sqlpp                   |   2 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |   2 +-
 .../olist-edit-distance-check-panic.sqlpp       |   8 +-
 .../olist-edit-distance-check.sqlpp             |   8 +-
 .../olist-edit-distance-panic.sqlpp             |   8 +-
 .../olist-edit-distance.sqlpp                   |   8 +-
 .../olist-fuzzyeq-edit-distance.sqlpp           |   8 +-
 .../olist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../olist-jaccard-check.sqlpp                   |   8 +-
 .../inverted-index-basic/olist-jaccard.sqlpp    |   8 +-
 .../ulist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../ulist-jaccard-check.sqlpp                   |   8 +-
 .../inverted-index-basic/ulist-jaccard.sqlpp    |   8 +-
 .../inverted-index-basic/word-contains.sqlpp    |   2 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |   2 +-
 .../word-jaccard-check.sqlpp                    |   2 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |   2 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |   2 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |   2 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |   2 +-
 .../ngram-edit-distance-check-let.sqlpp         |   2 +-
 .../ngram-edit-distance-check-substring.sqlpp   |   2 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |   2 +-
 .../ngram-jaccard-check-let.sqlpp               |   2 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |   2 +-
 .../olist-edit-distance-check-let-panic.sqlpp   |   8 +-
 .../olist-edit-distance-check-let.sqlpp         |   8 +-
 .../olist-jaccard-check-let.sqlpp               |   8 +-
 .../ulist-jaccard-check-let.sqlpp               |   8 +-
 .../word-jaccard-check-let.sqlpp                |   2 +-
 .../word-jaccard-check-multi-let.sqlpp          |   2 +-
 .../ngram-edit-distance-inline.sqlpp            |   2 +-
 .../ngram-edit-distance.sqlpp                   |   4 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |   4 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |   4 +-
 .../ngram-jaccard-inline.sqlpp                  |   2 +-
 .../ngram-jaccard.sqlpp                         |   4 +-
 .../olist-edit-distance-inline.sqlpp            |   8 +-
 .../olist-edit-distance.sqlpp                   |   8 +-
 .../olist-fuzzyeq-edit-distance.sqlpp           |   8 +-
 .../olist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../olist-jaccard-inline.sqlpp                  |   8 +-
 .../olist-jaccard.sqlpp                         |   8 +-
 .../ulist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../ulist-jaccard-inline.sqlpp                  |   8 +-
 .../ulist-jaccard.sqlpp                         |   8 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |   4 +-
 .../word-jaccard-inline.sqlpp                   |   2 +-
 .../word-jaccard.sqlpp                          |   4 +-
 .../inverted-index-join/issue741.sqlpp          |   8 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  14 +-
 ...be-pidx-with-join-jaccard-check-idx_01.sqlpp |  14 +-
 .../inverted-index-join/ngram-contains.sqlpp    |   2 +-
 .../ngram-edit-distance-check_01.sqlpp          |   4 +-
 .../ngram-edit-distance-check_02.sqlpp          |   4 +-
 .../ngram-edit-distance-check_03.sqlpp          |   2 +-
 .../ngram-edit-distance-check_04.sqlpp          |   2 +-
 .../ngram-edit-distance-contains.sqlpp          |   4 +-
 .../ngram-edit-distance_01.sqlpp                |   4 +-
 .../ngram-edit-distance_02.sqlpp                |   4 +-
 .../ngram-edit-distance_03.sqlpp                |   2 +-
 .../ngram-edit-distance_04.sqlpp                |   2 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |   2 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_02.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |   2 +-
 .../ngram-jaccard-check_01.sqlpp                |   4 +-
 .../ngram-jaccard-check_02.sqlpp                |   4 +-
 .../ngram-jaccard-check_03.sqlpp                |   2 +-
 .../ngram-jaccard-check_04.sqlpp                |   2 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_02.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |   2 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  |   2 +-
 .../olist-edit-distance-check_01.sqlpp          |   8 +-
 .../olist-edit-distance-check_02.sqlpp          |   8 +-
 .../olist-edit-distance-check_03.sqlpp          |   8 +-
 .../olist-edit-distance-check_04.sqlpp          |   8 +-
 .../olist-edit-distance_01.sqlpp                |   8 +-
 .../olist-edit-distance_02.sqlpp                |   8 +-
 .../olist-edit-distance_03.sqlpp                |   8 +-
 .../olist-edit-distance_04.sqlpp                |   8 +-
 .../olist-fuzzyeq-edit-distance_01.sqlpp        |   8 +-
 .../olist-fuzzyeq-edit-distance_02.sqlpp        |   8 +-
 .../olist-fuzzyeq-edit-distance_03.sqlpp        |   8 +-
 .../olist-fuzzyeq-jaccard_01.sqlpp              |   8 +-
 .../olist-fuzzyeq-jaccard_02.sqlpp              |   8 +-
 .../olist-fuzzyeq-jaccard_03.sqlpp              |   8 +-
 .../olist-jaccard-check_01.sqlpp                |   8 +-
 .../olist-jaccard-check_02.sqlpp                |   8 +-
 .../olist-jaccard-check_03.sqlpp                |   8 +-
 .../olist-jaccard-check_04.sqlpp                |   8 +-
 .../inverted-index-join/olist-jaccard_01.sqlpp  |   8 +-
 .../inverted-index-join/olist-jaccard_02.sqlpp  |   8 +-
 .../inverted-index-join/olist-jaccard_03.sqlpp  |   8 +-
 .../inverted-index-join/olist-jaccard_04.sqlpp  |   8 +-
 .../ulist-fuzzyeq-jaccard_01.sqlpp              |   8 +-
 .../ulist-fuzzyeq-jaccard_02.sqlpp              |   8 +-
 .../ulist-fuzzyeq-jaccard_03.sqlpp              |   8 +-
 .../ulist-jaccard-check_01.sqlpp                |   8 +-
 .../ulist-jaccard-check_02.sqlpp                |   8 +-
 .../ulist-jaccard-check_03.sqlpp                |   8 +-
 .../ulist-jaccard-check_04.sqlpp                |   8 +-
 .../inverted-index-join/ulist-jaccard_01.sqlpp  |   8 +-
 .../inverted-index-join/ulist-jaccard_02.sqlpp  |   8 +-
 .../inverted-index-join/ulist-jaccard_03.sqlpp  |   8 +-
 .../inverted-index-join/ulist-jaccard_04.sqlpp  |   8 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_02.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_03.sqlpp               |   2 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  14 +-
 .../word-jaccard-check_01.sqlpp                 |   4 +-
 .../word-jaccard-check_02.sqlpp                 |   4 +-
 .../word-jaccard-check_03.sqlpp                 |   2 +-
 .../word-jaccard-check_04.sqlpp                 |   2 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_02.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_03.sqlpp   |   2 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   |   2 +-
 .../queries_sqlpp/join-super-key_01.sqlpp       |  26 +-
 .../queries_sqlpp/join-super-key_02.sqlpp       |  26 +-
 .../queries_sqlpp/limit-issue353.sqlpp          |   8 +-
 .../queries_sqlpp/loj-super-key_01.sqlpp        |  26 +-
 .../queries_sqlpp/loj-super-key_02.sqlpp        |  26 +-
 .../queries_sqlpp/nest_aggregate.sqlpp          |  32 +-
 ...oin-probe-pidx-with-join-btree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-btree-sidx_02.sqlpp |  14 +-
 .../primary-equi-join-multipred.sqlpp           |  12 +-
 .../primary-equi-join-neg_01.sqlpp              |   4 +-
 .../btree-index-join/primary-equi-join_01.sqlpp |   4 +-
 .../btree-index-join/primary-equi-join_02.sqlpp |   4 +-
 .../btree-index-join/primary-equi-join_03.sqlpp |  12 +-
 .../btree-index-join/primary-equi-join_04.sqlpp |  12 +-
 .../btree-index-join/primary-equi-join_05.sqlpp |   8 +-
 .../btree-index-join/primary-ge-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-gt-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-le-join_01.sqlpp   |   4 +-
 .../btree-index-join/primary-lt-join_01.sqlpp   |   4 +-
 .../secondary-equi-join-multiindex.sqlpp        |  16 +-
 .../secondary-equi-join-multipred.sqlpp         |   4 +-
 .../secondary-equi-join_01.sqlpp                |   4 +-
 .../btree-index/btree-secondary-33.sqlpp        |   2 +-
 .../btree-index/btree-secondary-34.sqlpp        |   2 +-
 .../btree-index/btree-secondary-35.sqlpp        |   2 +-
 .../btree-index/btree-secondary-36.sqlpp        |   2 +-
 .../btree-index/btree-secondary-37.sqlpp        |   2 +-
 .../btree-index/btree-secondary-38.sqlpp        |   2 +-
 .../btree-index/btree-secondary-39.sqlpp        |   2 +-
 .../btree-index/btree-secondary-40.sqlpp        |   2 +-
 .../btree-index/btree-secondary-41.sqlpp        |   2 +-
 .../btree-index/btree-secondary-42.sqlpp        |   2 +-
 .../btree-index/btree-secondary-43.sqlpp        |   2 +-
 .../btree-index/btree-secondary-44.sqlpp        |   2 +-
 .../btree-index/btree-secondary-45.sqlpp        |   2 +-
 .../btree-index/btree-secondary-46.sqlpp        |   2 +-
 .../btree-index/btree-secondary-47.sqlpp        |   2 +-
 .../btree-index/btree-secondary-48.sqlpp        |   2 +-
 .../btree-index/btree-secondary-49.sqlpp        |   2 +-
 .../btree-index/btree-secondary-50.sqlpp        |   2 +-
 .../btree-index/btree-secondary-51.sqlpp        |   2 +-
 .../btree-index/btree-secondary-52.sqlpp        |   2 +-
 .../btree-index/btree-secondary-53.sqlpp        |   2 +-
 .../btree-index/btree-secondary-54.sqlpp        |   2 +-
 .../btree-index/btree-secondary-55.sqlpp        |   2 +-
 .../btree-index/btree-secondary-56.sqlpp        |   2 +-
 .../btree-index/btree-secondary-57.sqlpp        |   2 +-
 .../btree-index/btree-secondary-58.sqlpp        |   2 +-
 .../btree-index/btree-secondary-59.sqlpp        |   2 +-
 .../btree-index/btree-secondary-60.sqlpp        |   2 +-
 .../btree-index/btree-secondary-61.sqlpp        |   2 +-
 .../btree-index/btree-secondary-62.sqlpp        |   2 +-
 .../btree-index/btree-secondary-63.sqlpp        |   2 +-
 .../ngram-contains-panic.sqlpp                  |   2 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |   2 +-
 .../ngram-edit-distance-check-panic.sqlpp       |   2 +-
 .../ngram-edit-distance-check.sqlpp             |   2 +-
 .../ngram-edit-distance-panic.sqlpp             |   2 +-
 .../ngram-edit-distance.sqlpp                   |   2 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |   2 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |   2 +-
 .../ngram-jaccard-check.sqlpp                   |   2 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |   2 +-
 .../olist-edit-distance-check-panic.sqlpp       |   8 +-
 .../olist-edit-distance-check.sqlpp             |   8 +-
 .../olist-edit-distance-panic.sqlpp             |   8 +-
 .../olist-edit-distance.sqlpp                   |   8 +-
 .../olist-fuzzyeq-edit-distance.sqlpp           |   8 +-
 .../olist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../olist-jaccard-check.sqlpp                   |   8 +-
 .../inverted-index-basic/olist-jaccard.sqlpp    |   8 +-
 .../ulist-fuzzyeq-jaccard.sqlpp                 |   8 +-
 .../ulist-jaccard-check.sqlpp                   |   8 +-
 .../inverted-index-basic/ulist-jaccard.sqlpp    |   8 +-
 .../inverted-index-basic/word-contains.sqlpp    |   2 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |   2 +-
 .../word-jaccard-check.sqlpp                    |   2 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |   2 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |   2 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |   2 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |   2 +-
 .../ngram-edit-distance-check-let.sqlpp         |   2 +-
 .../ngram-edit-distance-check-substring.sqlpp   |   2 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |   2 +-
 .../ngram-jaccard-check-let.sqlpp               |   2 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |   2 +-
 .../olist-edit-distance-check-let-panic.sqlpp   |   8 +-
 .../olist-edit-distance-check-let.sqlpp         |   8 +-
 .../olist-jaccard-check-let.sqlpp               |   8 +-
 .../ulist-jaccard-check-let.sqlpp               |   8 +-
 .../word-jaccard-check-let.sqlpp                |   2 +-
 .../word-jaccard-check-multi-let.sqlpp          |   2 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  14 +-
 ...be-pidx-with-join-jaccard-check-idx_01.sqlpp |  14 +-
 .../ngram-edit-distance-check_01.sqlpp          |   4 +-
 .../ngram-edit-distance-contains.sqlpp          |   4 +-
 .../ngram-edit-distance-inline.sqlpp            |   2 +-
 .../ngram-edit-distance_01.sqlpp                |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |   4 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |   4 +-
 .../ngram-jaccard-check_01.sqlpp                |   4 +-
 .../ngram-jaccard-inline.sqlpp                  |   2 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |   4 +-
 .../olist-edit-distance-check_01.sqlpp          |   8 +-
 .../olist-edit-distance-inline.sqlpp            |   8 +-
 .../olist-edit-distance_01.sqlpp                |   8 +-
 .../olist-fuzzyeq-edit-distance_01.sqlpp        |   8 +-
 .../olist-fuzzyeq-jaccard_01.sqlpp              |   8 +-
 .../olist-jaccard-check_01.sqlpp                |   8 +-
 .../olist-jaccard-inline.sqlpp                  |   8 +-
 .../inverted-index-join/olist-jaccard_01.sqlpp  |   8 +-
 .../ulist-fuzzyeq-jaccard_01.sqlpp              |   8 +-
 .../ulist-jaccard-check_01.sqlpp                |   8 +-
 .../ulist-jaccard-inline.sqlpp                  |   8 +-
 .../inverted-index-join/ulist-jaccard_01.sqlpp  |   8 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |   4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  14 +-
 .../word-jaccard-check_01.sqlpp                 |   4 +-
 .../word-jaccard-inline.sqlpp                   |   2 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |   4 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  14 +-
 .../spatial-intersect-point_01.sqlpp            |   2 +-
 .../spatial-intersect-point_02.sqlpp            |   2 +-
 .../spatial-intersect-point_03.sqlpp            |   2 +-
 ...n-probe-pidx-with-join-btree-sidx_01_1.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_01_2.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_02_1.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_02_2.sqlpp |  14 +-
 .../secondary-composite-key-join_01.sqlpp       |   2 +-
 .../secondary-composite-key-join_02.sqlpp       |   2 +-
 .../secondary-composite-key-join_03.sqlpp       |   2 +-
 ...secondary-composite-key-prefix-join_01.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_02.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_03.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_04.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_05.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_06.sqlpp |   2 +-
 .../secondary-equi-join-multiindex.sqlpp        |  16 +-
 .../secondary-equi-join-multipred.sqlpp         |   4 +-
 .../secondary-equi-join_01.sqlpp                |   4 +-
 .../secondary-equi-join_02.sqlpp                |   4 +-
 .../secondary-equi-join_03.sqlpp                |   4 +-
 .../secondary-equi-join_04.sqlpp                |   2 +-
 .../secondary-equi-join_05.sqlpp                |   4 +-
 .../btree-index/btree-secondary-33.sqlpp        |   2 +-
 .../btree-index/btree-secondary-34.sqlpp        |   2 +-
 .../btree-index/btree-secondary-35.sqlpp        |   2 +-
 .../btree-index/btree-secondary-36.sqlpp        |   2 +-
 .../btree-index/btree-secondary-37.sqlpp        |   2 +-
 .../btree-index/btree-secondary-38.sqlpp        |   2 +-
 .../btree-index/btree-secondary-39.sqlpp        |   2 +-
 .../btree-index/btree-secondary-40.sqlpp        |   2 +-
 .../btree-index/btree-secondary-41.sqlpp        |   2 +-
 .../btree-index/btree-secondary-42.sqlpp        |   2 +-
 .../btree-index/btree-secondary-43.sqlpp        |   2 +-
 .../btree-index/btree-secondary-44.sqlpp        |   2 +-
 .../btree-index/btree-secondary-45.sqlpp        |   2 +-
 .../btree-index/btree-secondary-46.sqlpp        |   2 +-
 .../btree-index/btree-secondary-47.sqlpp        |   2 +-
 .../btree-index/btree-secondary-48.sqlpp        |   2 +-
 .../btree-index/btree-secondary-49.sqlpp        |   2 +-
 .../btree-index/btree-secondary-50.sqlpp        |   2 +-
 .../btree-index/btree-secondary-51.sqlpp        |   2 +-
 .../btree-index/btree-secondary-52.sqlpp        |   2 +-
 .../btree-index/btree-secondary-53.sqlpp        |   2 +-
 .../btree-index/btree-secondary-54.sqlpp        |   2 +-
 .../btree-index/btree-secondary-55.sqlpp        |   2 +-
 .../btree-index/btree-secondary-56.sqlpp        |   2 +-
 .../btree-index/btree-secondary-57.sqlpp        |   2 +-
 .../btree-index/btree-secondary-58.sqlpp        |   2 +-
 .../btree-index/btree-secondary-59.sqlpp        |   2 +-
 .../btree-index/btree-secondary-60.sqlpp        |   2 +-
 .../btree-index/btree-secondary-61.sqlpp        |   2 +-
 .../btree-index/btree-secondary-62.sqlpp        |   2 +-
 .../btree-index/btree-secondary-63.sqlpp        |   2 +-
 .../ngram-contains-panic.sqlpp                  |   2 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |   2 +-
 .../ngram-edit-distance-check-panic.sqlpp       |   2 +-
 .../ngram-edit-distance-check.sqlpp             |   2 +-
 .../ngram-edit-distance-panic.sqlpp             |   2 +-
 .../ngram-edit-distance.sqlpp                   |   2 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |   2 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |   2 +-
 .../ngram-jaccard-check.sqlpp                   |   2 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |   2 +-
 .../inverted-index-basic/word-contains.sqlpp    |   2 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |   2 +-
 .../word-jaccard-check.sqlpp                    |   2 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |   2 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |   2 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |   2 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |   2 +-
 .../ngram-edit-distance-check-let.sqlpp         |   2 +-
 .../ngram-edit-distance-check-substring.sqlpp   |   2 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |   2 +-
 .../ngram-jaccard-check-let.sqlpp               |   2 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |   2 +-
 .../word-jaccard-check-let.sqlpp                |   2 +-
 .../word-jaccard-check-multi-let.sqlpp          |   2 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  14 +-
 .../inverted-index-join/ngram-contains_01.sqlpp |   4 +-
 .../inverted-index-join/ngram-contains_02.sqlpp |   4 +-
 .../inverted-index-join/ngram-contains_03.sqlpp |   2 +-
 .../inverted-index-join/ngram-contains_04.sqlpp |   4 +-
 .../ngram-edit-distance-check_01.sqlpp          |   4 +-
 .../ngram-edit-distance-check_02.sqlpp          |   4 +-
 .../ngram-edit-distance-check_03.sqlpp          |   2 +-
 .../ngram-edit-distance-check_04.sqlpp          |   4 +-
 .../ngram-edit-distance-check_05.sqlpp          |   4 +-
 .../ngram-edit-distance-contains.sqlpp          |   4 +-
 .../ngram-edit-distance-inline.sqlpp            |   2 +-
 .../ngram-edit-distance_01.sqlpp                |   4 +-
 .../ngram-edit-distance_02.sqlpp                |   4 +-
 .../ngram-edit-distance_03.sqlpp                |   2 +-
 .../ngram-edit-distance_04.sqlpp                |   4 +-
 .../ngram-edit-distance_05.sqlpp                |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |   2 +-
 .../ngram-fuzzyeq-edit-distance_04.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_05.sqlpp        |   4 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_02.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |   2 +-
 .../ngram-fuzzyeq-jaccard_04.sqlpp              |   4 +-
 .../ngram-jaccard-check_01.sqlpp                |   4 +-
 .../ngram-jaccard-check_02.sqlpp                |   4 +-
 .../ngram-jaccard-check_03.sqlpp                |   2 +-
 .../ngram-jaccard-check_04.sqlpp                |   4 +-
 .../ngram-jaccard-inline.sqlpp                  |   2 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_02.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |   2 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  |   4 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_02.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_03.sqlpp               |   2 +-
 .../word-fuzzyeq-jaccard_04.sqlpp               |   4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  14 +-
 .../word-jaccard-check_01.sqlpp                 |   4 +-
 .../word-jaccard-check_02.sqlpp                 |   4 +-
 .../word-jaccard-check_03.sqlpp                 |   2 +-
 .../word-jaccard-check_04.sqlpp                 |   4 +-
 .../word-jaccard-inline.sqlpp                   |   2 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_02.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_03.sqlpp   |   2 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   |   4 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  14 +-
 .../spatial-intersect-point_01.sqlpp            |   2 +-
 .../spatial-intersect-point_02.sqlpp            |   2 +-
 .../spatial-intersect-point_03.sqlpp            |   2 +-
 .../spatial-intersect-point_04.sqlpp            |   2 +-
 .../spatial-intersect-point_05.sqlpp            |   2 +-
 .../optimizerts/queries_sqlpp/nested_loj2.sqlpp |  18 +-
 .../optimizerts/queries_sqlpp/nested_loj3.sqlpp |  24 +-
 ...n-probe-pidx-with-join-btree-sidx_01_1.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_01_2.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_02_1.sqlpp |  14 +-
 ...n-probe-pidx-with-join-btree-sidx_02_2.sqlpp |  14 +-
 .../secondary-composite-key-join_01.sqlpp       |   2 +-
 .../secondary-composite-key-join_02.sqlpp       |   2 +-
 .../secondary-composite-key-join_03.sqlpp       |   2 +-
 ...secondary-composite-key-prefix-join_01.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_02.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_03.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_04.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_05.sqlpp |   2 +-
 ...secondary-composite-key-prefix-join_06.sqlpp |   2 +-
 .../secondary-equi-join-multiindex.sqlpp        |  16 +-
 .../secondary-equi-join-multipred.sqlpp         |   4 +-
 .../secondary-equi-join_01.sqlpp                |   4 +-
 .../secondary-equi-join_02.sqlpp                |   4 +-
 .../secondary-equi-join_03.sqlpp                |   2 +-
 .../secondary-equi-join_04.sqlpp                |   4 +-
 .../secondary-equi-join_05.sqlpp                |   4 +-
 .../btree-index/btree-secondary-33.sqlpp        |   2 +-
 .../btree-index/btree-secondary-34.sqlpp        |   2 +-
 .../btree-index/btree-secondary-35.sqlpp        |   2 +-
 .../btree-index/btree-secondary-36.sqlpp        |   2 +-
 .../btree-index/btree-secondary-37.sqlpp        |   2 +-
 .../btree-index/btree-secondary-38.sqlpp        |   2 +-
 .../btree-index/btree-secondary-39.sqlpp        |   2 +-
 .../btree-index/btree-secondary-40.sqlpp        |   2 +-
 .../btree-index/btree-secondary-41.sqlpp        |   2 +-
 .../btree-index/btree-secondary-42.sqlpp        |   2 +-
 .../btree-index/btree-secondary-43.sqlpp        |   2 +-
 .../btree-index/btree-secondary-44.sqlpp        |   2 +-
 .../btree-index/btree-secondary-45.sqlpp        |   2 +-
 .../btree-index/btree-secondary-46.sqlpp        |   2 +-
 .../btree-index/btree-secondary-47.sqlpp        |   2 +-
 .../btree-index/btree-secondary-48.sqlpp        |   2 +-
 .../btree-index/btree-secondary-49.sqlpp        |   2 +-
 .../btree-index/btree-secondary-50.sqlpp        |   2 +-
 .../btree-index/btree-secondary-51.sqlpp        |   2 +-
 .../btree-index/btree-secondary-52.sqlpp        |   2 +-
 .../btree-index/btree-secondary-53.sqlpp        |   2 +-
 .../btree-index/btree-secondary-54.sqlpp        |   2 +-
 .../btree-index/btree-secondary-55.sqlpp        |   2 +-
 .../btree-index/btree-secondary-56.sqlpp        |   2 +-
 .../btree-index/btree-secondary-57.sqlpp        |   2 +-
 .../btree-index/btree-secondary-58.sqlpp        |   2 +-
 .../btree-index/btree-secondary-59.sqlpp        |   2 +-
 .../btree-index/btree-secondary-60.sqlpp        |   2 +-
 .../btree-index/btree-secondary-61.sqlpp        |   2 +-
 .../btree-index/btree-secondary-62.sqlpp        |   2 +-
 .../btree-index/btree-secondary-63.sqlpp        |   2 +-
 .../ngram-contains-panic.sqlpp                  |   2 +-
 .../inverted-index-basic/ngram-contains.sqlpp   |   2 +-
 .../ngram-edit-distance-check-panic.sqlpp       |   2 +-
 .../ngram-edit-distance-check.sqlpp             |   2 +-
 .../ngram-edit-distance-panic.sqlpp             |   2 +-
 .../ngram-edit-distance.sqlpp                   |   2 +-
 .../ngram-fuzzyeq-edit-distance.sqlpp           |   2 +-
 .../ngram-fuzzyeq-jaccard.sqlpp                 |   2 +-
 .../ngram-jaccard-check.sqlpp                   |   2 +-
 .../inverted-index-basic/ngram-jaccard.sqlpp    |   2 +-
 .../inverted-index-basic/word-contains.sqlpp    |   2 +-
 .../word-fuzzyeq-jaccard.sqlpp                  |   2 +-
 .../word-jaccard-check.sqlpp                    |   2 +-
 .../inverted-index-basic/word-jaccard.sqlpp     |   2 +-
 ...it-distance-check-let-panic-nopanic_01.sqlpp |   2 +-
 ...it-distance-check-let-panic-nopanic_02.sqlpp |   2 +-
 .../ngram-edit-distance-check-let-panic.sqlpp   |   2 +-
 .../ngram-edit-distance-check-let.sqlpp         |   2 +-
 .../ngram-edit-distance-check-substring.sqlpp   |   2 +-
 .../ngram-edit-distance-check-word-tokens.sqlpp |   2 +-
 .../ngram-jaccard-check-let.sqlpp               |   2 +-
 .../ngram-jaccard-check-multi-let.sqlpp         |   2 +-
 .../word-jaccard-check-let.sqlpp                |   2 +-
 .../word-jaccard-check-multi-let.sqlpp          |   2 +-
 ...x-with-join-edit-distance-check-idx_01.sqlpp |  14 +-
 .../inverted-index-join/ngram-contains_01.sqlpp |   4 +-
 .../inverted-index-join/ngram-contains_02.sqlpp |   4 +-
 .../inverted-index-join/ngram-contains_03.sqlpp |   2 +-
 .../inverted-index-join/ngram-contains_04.sqlpp |   4 +-
 .../ngram-edit-distance-check_01.sqlpp          |   4 +-
 .../ngram-edit-distance-check_02.sqlpp          |   4 +-
 .../ngram-edit-distance-check_03.sqlpp          |   2 +-
 .../ngram-edit-distance-check_04.sqlpp          |   4 +-
 .../ngram-edit-distance-check_05.sqlpp          |   4 +-
 .../ngram-edit-distance-check_inline_03.sqlpp   |   2 +-
 .../ngram-edit-distance-contains.sqlpp          |   4 +-
 .../ngram-edit-distance_01.sqlpp                |   4 +-
 .../ngram-edit-distance_02.sqlpp                |   4 +-
 .../ngram-edit-distance_03.sqlpp                |   2 +-
 .../ngram-edit-distance_04.sqlpp                |   4 +-
 .../ngram-edit-distance_05.sqlpp                |   4 +-
 .../ngram-edit-distance_inline_03.sqlpp         |   2 +-
 .../ngram-fuzzyeq-edit-distance_01.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.sqlpp        |   2 +-
 .../ngram-fuzzyeq-edit-distance_04.sqlpp        |   4 +-
 .../ngram-fuzzyeq-edit-distance_05.sqlpp        |   4 +-
 .../ngram-fuzzyeq-jaccard_01.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_02.sqlpp              |   4 +-
 .../ngram-fuzzyeq-jaccard_03.sqlpp              |   2 +-
 .../ngram-fuzzyeq-jaccard_04.sqlpp              |   4 +-
 .../ngram-jaccard-check_01.sqlpp                |   4 +-
 .../ngram-jaccard-check_02.sqlpp                |   4 +-
 .../ngram-jaccard-check_03.sqlpp                |   2 +-
 .../ngram-jaccard-check_04.sqlpp                |   4 +-
 .../ngram-jaccard-check_inline_03.sqlpp         |   2 +-
 .../inverted-index-join/ngram-jaccard_01.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_02.sqlpp  |   4 +-
 .../inverted-index-join/ngram-jaccard_03.sqlpp  |   2 +-
 .../inverted-index-join/ngram-jaccard_04.sqlpp  |   4 +-
 .../ngram-jaccard_inline_03.sqlpp               |   2 +-
 .../word-fuzzyeq-jaccard_01.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_02.sqlpp               |   4 +-
 .../word-fuzzyeq-jaccard_03.sqlpp               |   2 +-
 .../word-fuzzyeq-jaccard_04.sqlpp               |   4 +-
 .../word-jaccard-check-after-btree-access.sqlpp |  14 +-
 .../word-jaccard-check_01.sqlpp                 |   4 +-
 .../word-jaccard-check_02.sqlpp                 |   4 +-
 .../word-jaccard-check_03.sqlpp                 |   2 +-
 .../word-jaccard-check_04.sqlpp                 |   4 +-
 .../word-jaccard-check_inline_03.sqlpp          |   2 +-
 .../inverted-index-join/word-jaccard_01.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_02.sqlpp   |   4 +-
 .../inverted-index-join/word-jaccard_03.sqlpp   |   2 +-
 .../inverted-index-join/word-jaccard_04.sqlpp   |   4 +-
 .../word-jaccard_inline_03.sqlpp                |   2 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  14 +-
 .../spatial-intersect-point_01.sqlpp            |   4 +-
 .../spatial-intersect-point_02.sqlpp            |   4 +-
 .../spatial-intersect-point_03.sqlpp            |   2 +-
 .../spatial-intersect-point_04.sqlpp            |   2 +-
 .../spatial-intersect-point_05.sqlpp            |   2 +-
 .../queries_sqlpp/orderby-desc-using-gby.sqlpp  |   8 +-
 .../queries_sqlpp/orders-aggreg.sqlpp           |   8 +-
 .../orders-composite-index-search.sqlpp         |   6 +-
 ...rders-index-search-conjunctive-open_01.sqlpp |   6 +-
 ...rders-index-search-conjunctive-open_02.sqlpp |   6 +-
 .../orders-index-search-conjunctive_01.sqlpp    |   6 +-
 .../orders-index-search-conjunctive_02.sqlpp    |   6 +-
 .../orders-index-search-open.sqlpp              |   6 +-
 .../queries_sqlpp/orders-index-search.sqlpp     |   6 +-
 .../queries_sqlpp/prim-idx-search-open.sqlpp    |   6 +-
 .../queries_sqlpp/prim-idx-search.sqlpp         |   6 +-
 .../pull_select_above_eq_join.sqlpp             |   8 +-
 .../push-project-through-group.sqlpp            |   2 +-
 .../optimizerts/queries_sqlpp/push_limit.sqlpp  |   6 +-
 .../q01_pricing_summary_report_nt.sqlpp         |  24 +-
 .../queries_sqlpp/q03_shipping_priority.sqlpp   |  20 +-
 .../q05_local_supplier_volume.sqlpp             |  30 +-
 .../queries_sqlpp/q08_group_by.sqlpp            |  32 +-
 .../queries_sqlpp/q09_group_by.sqlpp            |  40 +-
 .../queries_sqlpp/query-issue562.sqlpp          |  26 +-
 .../queries_sqlpp/query-issue601.sqlpp          |   8 +-
 .../queries_sqlpp/query-issue697.sqlpp          |   6 +-
 .../queries_sqlpp/query-issue785.sqlpp          |  22 +-
 .../queries_sqlpp/query-issue810-2.sqlpp        |  10 +-
 .../queries_sqlpp/query-issue810.sqlpp          |  10 +-
 .../queries_sqlpp/query-issue827-2.sqlpp        |  24 +-
 .../queries_sqlpp/query_issue849-2.sqlpp        |   2 +-
 .../queries_sqlpp/query_issue849.sqlpp          |   2 +-
 .../sort-hint-on-closed-numeric-desc.sqlpp      |   6 +-
 .../sort-hint-on-closed-numeric.sqlpp           |   6 +-
 .../sort-hint-on-closed-string-desc.sqlpp       |   6 +-
 .../sort-hint-on-closed-string.sqlpp            |   6 +-
 .../rtree-index-join/issue730.sqlpp             |   8 +-
 ...oin-probe-pidx-with-join-rtree-sidx_01.sqlpp |  14 +-
 ...oin-probe-pidx-with-join-rtree-sidx_02.sqlpp |  14 +-
 .../rtree-index-join/query-issue838.sqlpp       |   4 +-
 .../spatial-intersect-point_01.sqlpp            |   2 +-
 .../spatial-intersect-point_02.sqlpp            |   2 +-
 .../spatial-intersect-point_03.sqlpp            |   2 +-
 .../rtree-secondary-index-open.sqlpp            |   2 +-
 .../queries_sqlpp/rtree-secondary-index.sqlpp   |   2 +-
 .../queries_sqlpp/scan-delete-all.sqlpp         |  14 +-
 .../scan-delete-rtree-secondary-index.sqlpp     |   2 +-
 .../optimizerts/queries_sqlpp/scan-delete.sqlpp |  14 +-
 .../scan-insert-secondary-index.sqlpp           |  14 +-
 .../optimizerts/queries_sqlpp/scan-insert.sqlpp |  14 +-
 ...distance-let-to-edit-distance-check_01.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_02.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_03.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_04.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_05.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_06.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_07.sqlpp |   2 +-
 ...distance-let-to-edit-distance-check_08.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_01.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_02.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_03.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_04.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_05.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_06.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_07.sqlpp |   2 +-
 ...dit-distance-to-edit-distance-check_08.sqlpp |   2 +-
 .../fuzzyeq-to-edit-distance-check.sqlpp        |   2 +-
 .../similarity/fuzzyeq-to-jaccard-check.sqlpp   |   2 +-
 .../jaccard-let-to-jaccard-check_01.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_02.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_03.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_04.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_05.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_06.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_07.sqlpp       |   2 +-
 .../jaccard-let-to-jaccard-check_08.sqlpp       |   2 +-
 .../jaccard-to-jaccard-check_01.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_02.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_03.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_04.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_05.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_06.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_07.sqlpp           |   2 +-
 .../jaccard-to-jaccard-check_08.sqlpp           |   2 +-
 ...nt-skip-primary-index-search-in-delete.sqlpp |   8 +-
 .../skip-ngram-index-search-in-delete.sqlpp     |   2 +-
 .../skip-index/skip-ngram-index.sqlpp           |   2 +-
 .../skip-rtree-index-search-in-delete.sqlpp     |   2 +-
 .../skip-index/skip-rtree-secondary-index.sqlpp |   2 +-
 .../skip-secondary-btree-index-2.sqlpp          |   2 +-
 ...secondary-btree-index-search-in-delete.sqlpp |   8 +-
 .../skip-index/skip-secondary-btree-index.sqlpp |   2 +-
 .../skip-word-index-search-in-delete.sqlpp      |   2 +-
 .../skip-index/skip-word-index.sqlpp            |   2 +-
 .../optimizerts/queries_sqlpp/sort-cust.sqlpp   |   8 +-
 .../split-materialization-above-join.sqlpp      |   2 +-
 .../queries_sqlpp/split-materialization.sqlpp   |   8 +-
 .../queries_sqlpp/unnest_list_in_subplan.sqlpp  |   6 +-
 .../aggregate/query-ASTERIXDB-1626-2.plan       |  15 +
 .../aggregate/query-ASTERIXDB-1626-3.plan       |  24 +
 .../results/aggregate/query-ASTERIXDB-1626.plan |  15 +
 .../results/disjunction-to-join-delete-1.plan   |  29 +-
 .../results/disjunction-to-join-delete-2.plan   |  41 +-
 .../results/disjunction-to-join-delete-3.plan   |  39 +-
 .../optimizerts/results/fj-dblp-csx.plan        |   4 +-
 .../inlined_q18_large_volume_customer.plan      |   4 +-
 .../insert-and-scan-dataset-with-index.plan     |  25 +-
 .../ngram-edit-distance-inline.plan             |  10 +-
 .../ngram-edit-distance.plan                    |   4 +-
 .../ngram-fuzzyeq-edit-distance.plan            |   4 +-
 .../olist-edit-distance-inline.plan             |  10 +-
 .../olist-edit-distance.plan                    |   4 +-
 .../olist-fuzzyeq-edit-distance.plan            |   4 +-
 ...dx-with-join-edit-distance-check-idx_01.plan |  10 +-
 ...obe-pidx-with-join-jaccard-check-idx_01.plan |   4 +-
 .../ngram-edit-distance-check_01.plan           |   4 +-
 .../ngram-edit-distance-check_02.plan           |   4 +-
 .../ngram-edit-distance-check_03.plan           |   4 +-
 .../ngram-edit-distance-check_04.plan           |   4 +-
 .../ngram-edit-distance-contains.plan           |   4 +-
 .../ngram-edit-distance_01.plan                 |   4 +-
 .../ngram-edit-distance_02.plan                 |   4 +-
 .../ngram-edit-distance_03.plan                 |   4 +-
 .../ngram-edit-distance_04.plan                 |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.plan         |   4 +-
 .../olist-edit-distance-check_01.plan           |   4 +-
 .../olist-edit-distance-check_02.plan           |   4 +-
 .../olist-edit-distance-check_03.plan           |   4 +-
 .../olist-edit-distance-check_04.plan           |   4 +-
 .../olist-edit-distance_01.plan                 |   4 +-
 .../olist-edit-distance_02.plan                 |   4 +-
 .../olist-edit-distance_03.plan                 |   4 +-
 .../olist-edit-distance_04.plan                 |   4 +-
 .../olist-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../olist-fuzzyeq-edit-distance_02.plan         |   4 +-
 .../olist-fuzzyeq-edit-distance_03.plan         |   4 +-
 .../word-jaccard-check-after-btree-access.plan  |   4 +-
 .../multi-indexes/two-rtree-intersect.plan      |   4 +-
 ...dx-with-join-edit-distance-check-idx_01.plan |  10 +-
 ...obe-pidx-with-join-jaccard-check-idx_01.plan |   4 +-
 .../ngram-edit-distance-check_01.plan           |   4 +-
 .../ngram-edit-distance-contains.plan           |   4 +-
 .../ngram-edit-distance-inline.plan             |  10 +-
 .../ngram-edit-distance_01.plan                 |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../olist-edit-distance-check_01.plan           |   4 +-
 .../olist-edit-distance-inline.plan             |  10 +-
 .../olist-edit-distance_01.plan                 |   4 +-
 .../olist-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../word-jaccard-check-after-btree-access.plan  |   4 +-
 ...dx-with-join-edit-distance-check-idx_01.plan |  10 +-
 .../ngram-edit-distance-check_01.plan           |   4 +-
 .../ngram-edit-distance-check_02.plan           |   4 +-
 .../ngram-edit-distance-check_03.plan           |   4 +-
 .../ngram-edit-distance-check_04.plan           |   4 +-
 .../ngram-edit-distance-contains.plan           |   4 +-
 .../ngram-edit-distance-inline.plan             |  10 +-
 .../ngram-edit-distance_01.plan                 |   4 +-
 .../ngram-edit-distance_02.plan                 |   4 +-
 .../ngram-edit-distance_03.plan                 |   4 +-
 .../ngram-edit-distance_04.plan                 |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_04.plan         |   4 +-
 .../word-jaccard-check-after-btree-access.plan  |   4 +-
 ...dx-with-join-edit-distance-check-idx_01.plan |  10 +-
 .../ngram-edit-distance-check_01.plan           |   4 +-
 .../ngram-edit-distance-check_02.plan           |   4 +-
 .../ngram-edit-distance-check_03.plan           |   4 +-
 .../ngram-edit-distance-check_04.plan           |   4 +-
 .../ngram-edit-distance-check_inline_03.plan    |   4 +-
 .../ngram-edit-distance-contains.plan           |   4 +-
 .../ngram-edit-distance_01.plan                 |   4 +-
 .../ngram-edit-distance_02.plan                 |   4 +-
 .../ngram-edit-distance_03.plan                 |   4 +-
 .../ngram-edit-distance_04.plan                 |   4 +-
 .../ngram-edit-distance_inline_03.plan          |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.plan         |   4 +-
 .../ngram-fuzzyeq-edit-distance_04.plan         |   4 +-
 .../word-jaccard-check-after-btree-access.plan  |   4 +-
 .../results/query-ASTERIXDB-1127.plan           |   4 +-
 .../results/query-ASTERIXDB-159-3.plan          |  54 +-
 .../optimizerts/results/query-issue562.plan     |  12 +-
 .../optimizerts/results/query-issue827-2.plan   |  18 +-
 .../scan-delete-rtree-secondary-index.plan      |  25 +-
 .../results/scan-insert-secondary-index.plan    |  20 +-
 .../optimizerts/results/select-self-join.plan   |  16 +
 .../skip-ngram-index-search-in-delete.plan      |  25 +-
 .../skip-rtree-index-search-in-delete.plan      |  25 +-
 ...-secondary-btree-index-search-in-delete.plan |  25 +-
 .../skip-word-index-search-in-delete.plan       |  25 +-
 .../split-materialization-above-join.plan       |  10 +-
 .../results/split-materialization.plan          |   4 +-
 .../optimizerts/results/subquery/exists.plan    |  10 +-
 .../results/subquery/not_exists.plan            |  10 +-
 .../results/subquery/query-ASTERIXDB-1572.plan  |  78 ++
 .../tpcds/query-ASTERIXDB-1581-correlated.plan  | 108 +--
 .../results/tpcds/query-ASTERIXDB-1581.plan     |  42 +-
 .../results/tpcds/query-ASTERIXDB-1591.plan     | 151 +++
 .../udfs/query-ASTERIXDB-1017-recursive.plan    |   4 +-
 .../results/udfs/query-ASTERIXDB-1020.plan      |   2 +-
 .../results/udfs/query-ASTERIXDB-1029.plan      |   4 +-
 .../results/udfs/query-ASTERIXDB-1029_2.plan    |   4 +-
 .../results/udfs/query-ASTERIXDB-1308-1.plan    |  44 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_02.ast |  12 +-
 .../primary-equi-join-multipred.ast             |  12 +-
 .../primary-equi-join-neg_01.ast                |   4 +-
 .../primary-equi-join-neg_02.ast                |   4 +-
 .../btree-index-join/primary-equi-join_01.ast   |   4 +-
 .../btree-index-join/primary-equi-join_02.ast   |   4 +-
 .../btree-index-join/primary-equi-join_03.ast   |  12 +-
 .../btree-index-join/primary-equi-join_04.ast   |  12 +-
 .../btree-index-join/primary-equi-join_05.ast   |   8 +-
 .../btree-index-join/primary-ge-join_01.ast     |   4 +-
 .../btree-index-join/primary-ge-join_02.ast     |   4 +-
 .../btree-index-join/primary-gt-join_01.ast     |   4 +-
 .../btree-index-join/primary-gt-join_02.ast     |   4 +-
 .../btree-index-join/primary-le-join_01.ast     |   4 +-
 .../btree-index-join/primary-le-join_02.ast     |   4 +-
 .../btree-index-join/primary-lt-join_01.ast     |   4 +-
 .../btree-index-join/primary-lt-join_02.ast     |   4 +-
 .../secondary-equi-join-multiindex.ast          |  16 +-
 .../secondary-equi-join-multipred.ast           |   4 +-
 .../btree-index-join/secondary-equi-join_01.ast |   4 +-
 .../btree-index-join/secondary-equi-join_02.ast |   4 +-
 .../btree-index-join/secondary-equi-join_03.ast |   2 +-
 .../btree-index/btree-datetime-01.ast           |   2 +-
 .../btree-index/btree-datetime-02.ast           |   2 +-
 .../btree-index/btree-datetime-03.ast           |   2 +-
 .../btree-index/btree-datetime-04.ast           |   2 +-
 .../btree-index/btree-secondary-33.ast          |   2 +-
 .../btree-index/btree-secondary-34.ast          |   2 +-
 .../btree-index/btree-secondary-35.ast          |   2 +-
 .../btree-index/btree-secondary-36.ast          |   2 +-
 .../btree-index/btree-secondary-37.ast          |   2 +-
 .../btree-index/btree-secondary-38.ast          |   2 +-
 .../btree-index/btree-secondary-39.ast          |   2 +-
 .../btree-index/btree-secondary-40.ast          |   2 +-
 .../btree-index/btree-secondary-41.ast          |   2 +-
 .../btree-index/btree-secondary-42.ast          |   2 +-
 .../btree-index/btree-secondary-43.ast          |   2 +-
 .../btree-index/btree-secondary-44.ast          |   2 +-
 .../btree-index/btree-secondary-45.ast          |   2 +-
 .../btree-index/btree-secondary-46.ast          |   2 +-
 .../btree-index/btree-secondary-47.ast          |   2 +-
 .../btree-index/btree-secondary-48.ast          |   2 +-
 .../btree-index/btree-secondary-49.ast          |   2 +-
 .../btree-index/btree-secondary-50.ast          |   2 +-
 .../btree-index/btree-secondary-51.ast          |   2 +-
 .../btree-index/btree-secondary-52.ast          |   2 +-
 .../btree-index/btree-secondary-53.ast          |   2 +-
 .../btree-index/btree-secondary-54.ast          |   2 +-
 .../btree-index/btree-secondary-55.ast          |   2 +-
 .../btree-index/btree-secondary-56.ast          |   2 +-
 .../btree-index/btree-secondary-57.ast          |   2 +-
 .../btree-index/btree-secondary-58.ast          |   2 +-
 .../btree-index/btree-secondary-59.ast          |   2 +-
 .../btree-index/btree-secondary-60.ast          |   2 +-
 .../btree-index/btree-secondary-61.ast          |   2 +-
 .../btree-index/btree-secondary-62.ast          |   2 +-
 .../btree-index/btree-secondary-63.ast          |   2 +-
 .../results_parser_sqlpp/collocated.ast         |   8 +-
 .../consolidate-selects-complex.ast             |   2 +-
 .../consolidate-selects-simple.ast              |   4 +-
 .../results_parser_sqlpp/count-tweets.ast       |   4 +-
 .../results_parser_sqlpp/cust_group_no_agg.ast  |   4 +-
 .../results_parser_sqlpp/denorm-cust-order.ast  |  12 +-
 .../results_parser_sqlpp/distinct_aggregate.ast |   8 +-
 .../results_parser_sqlpp/fj-dblp-csx.ast        |   4 +-
 .../results_parser_sqlpp/fj-phase1.ast          |   8 +-
 .../fj-phase2-with-hints.ast                    |   2 +-
 .../hashjoin-with-unnest.ast                    |   2 +-
 .../inlined_q18_large_volume_customer.ast       |  18 +-
 .../insert-and-scan-dataset-with-index.ast      |   4 +-
 .../insert-and-scan-dataset.ast                 |   2 +-
 .../introhashpartitionmerge.ast                 |   4 +-
 .../ngram-contains-panic.ast                    |   2 +-
 .../inverted-index-basic/ngram-contains.ast     |   2 +-
 .../ngram-edit-distance-check-panic.ast         |   2 +-
 .../ngram-edit-distance-check.ast               |   2 +-
 .../ngram-edit-distance-panic.ast               |   2 +-
 .../ngram-edit-distance.ast                     |   2 +-
 .../ngram-fuzzyeq-edit-distance.ast             |   2 +-
 .../ngram-fuzzyeq-jaccard.ast                   |   2 +-
 .../ngram-jaccard-check.ast                     |   2 +-
 .../inverted-index-basic/ngram-jaccard.ast      |   2 +-
 .../olist-edit-distance-check-panic.ast         |   8 +-
 .../olist-edit-distance-check.ast               |   8 +-
 .../olist-edit-distance-panic.ast               |   8 +-
 .../olist-edit-distance.ast                     |   8 +-
 .../olist-fuzzyeq-edit-distance.ast             |   8 +-
 .../olist-fuzzyeq-jaccard.ast                   |   8 +-
 .../olist-jaccard-check.ast                     |   8 +-
 .../inverted-index-basic/olist-jaccard.ast      |   8 +-
 .../ulist-fuzzyeq-jaccard.ast                   |   8 +-
 .../ulist-jaccard-check.ast                     |   8 +-
 .../inverted-index-basic/ulist-jaccard.ast      |   8 +-
 .../inverted-index-basic/word-contains.ast      |   2 +-
 .../word-fuzzyeq-jaccard.ast                    |   2 +-
 .../inverted-index-basic/word-jaccard-check.ast |   2 +-
 .../inverted-index-basic/word-jaccard.ast       |   2 +-
 ...edit-distance-check-let-panic-nopanic_01.ast |   2 +-
 ...edit-distance-check-let-panic-nopanic_02.ast |   2 +-
 .../ngram-edit-distance-check-let-panic.ast     |   2 +-
 .../ngram-edit-distance-check-let.ast           |   2 +-
 .../ngram-edit-distance-check-substring.ast     |   2 +-
 .../ngram-edit-distance-check-word-tokens.ast   |   2 +-
 .../ngram-jaccard-check-let.ast                 |   2 +-
 .../ngram-jaccard-check-multi-let.ast           |   2 +-
 .../olist-edit-distance-check-let-panic.ast     |   8 +-
 .../olist-edit-distance-check-let.ast           |   8 +-
 .../olist-jaccard-check-let.ast                 |   8 +-
 .../ulist-jaccard-check-let.ast                 |   8 +-
 .../word-jaccard-check-let.ast                  |   2 +-
 .../word-jaccard-check-multi-let.ast            |   2 +-
 .../ngram-edit-distance-inline.ast              |   2 +-
 .../ngram-edit-distance.ast                     |   4 +-
 .../ngram-fuzzyeq-edit-distance.ast             |   4 +-
 .../ngram-fuzzyeq-jaccard.ast                   |   4 +-
 .../ngram-jaccard-inline.ast                    |   2 +-
 .../ngram-jaccard.ast                           |   4 +-
 .../olist-edit-distance-inline.ast              |   8 +-
 .../olist-edit-distance.ast                     |   8 +-
 .../olist-fuzzyeq-edit-distance.ast             |   8 +-
 .../olist-fuzzyeq-jaccard.ast                   |   8 +-
 .../olist-jaccard-inline.ast                    |   8 +-
 .../olist-jaccard.ast                           |   8 +-
 .../ulist-fuzzyeq-jaccard.ast                   |   8 +-
 .../ulist-jaccard-inline.ast                    |   8 +-
 .../ulist-jaccard.ast                           |   8 +-
 .../word-fuzzyeq-jaccard.ast                    |   4 +-
 .../word-jaccard-inline.ast                     |   2 +-
 .../word-jaccard.ast                            |   4 +-
 .../inverted-index-join/issue741.ast            |   8 +-
 ...idx-with-join-edit-distance-check-idx_01.ast |  12 +-
 ...robe-pidx-with-join-jaccard-check-idx_01.ast |  12 +-
 .../inverted-index-join/ngram-contains.ast      |   2 +-
 .../ngram-edit-distance-check_01.ast            |   4 +-
 .../ngram-edit-distance-check_02.ast            |   4 +-
 .../ngram-edit-distance-check_03.ast            |   2 +-
 .../ngram-edit-distance-check_04.ast            |   2 +-
 .../ngram-edit-distance-contains.ast            |   4 +-
 .../ngram-edit-distance_01.ast                  |   4 +-
 .../ngram-edit-distance_02.ast                  |   4 +-
 .../ngram-edit-distance_03.ast                  |   2 +-
 .../ngram-edit-distance_04.ast                  |   2 +-
 .../ngram-fuzzyeq-edit-distance_01.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.ast          |   2 +-
 .../ngram-fuzzyeq-jaccard_01.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_02.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_03.ast                |   2 +-
 .../ngram-jaccard-check_01.ast                  |   4 +-
 .../ngram-jaccard-check_02.ast                  |   4 +-
 .../ngram-jaccard-check_03.ast                  |   2 +-
 .../ngram-jaccard-check_04.ast                  |   2 +-
 .../inverted-index-join/ngram-jaccard_01.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_02.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_03.ast    |   2 +-
 .../inverted-index-join/ngram-jaccard_04.ast    |   2 +-
 .../olist-edit-distance-check_01.ast            |   8 +-
 .../olist-edit-distance-check_02.ast            |   8 +-
 .../olist-edit-distance-check_03.ast            |   8 +-
 .../olist-edit-distance-check_04.ast            |   8 +-
 .../olist-edit-distance_01.ast                  |   8 +-
 .../olist-edit-distance_02.ast                  |   8 +-
 .../olist-edit-distance_03.ast                  |   8 +-
 .../olist-edit-distance_04.ast                  |   8 +-
 .../olist-fuzzyeq-edit-distance_01.ast          |   8 +-
 .../olist-fuzzyeq-edit-distance_02.ast          |   8 +-
 .../olist-fuzzyeq-edit-distance_03.ast          |   8 +-
 .../olist-fuzzyeq-jaccard_01.ast                |   8 +-
 .../olist-fuzzyeq-jaccard_02.ast                |   8 +-
 .../olist-fuzzyeq-jaccard_03.ast                |   8 +-
 .../olist-jaccard-check_01.ast                  |   8 +-
 .../olist-jaccard-check_02.ast                  |   8 +-
 .../olist-jaccard-check_03.ast                  |   8 +-
 .../olist-jaccard-check_04.ast                  |   8 +-
 .../inverted-index-join/olist-jaccard_01.ast    |   8 +-
 .../inverted-index-join/olist-jaccard_02.ast    |   8 +-
 .../inverted-index-join/olist-jaccard_03.ast    |   8 +-
 .../inverted-index-join/olist-jaccard_04.ast    |   8 +-
 .../ulist-fuzzyeq-jaccard_01.ast                |   8 +-
 .../ulist-fuzzyeq-jaccard_02.ast                |   8 +-
 .../ulist-fuzzyeq-jaccard_03.ast                |   8 +-
 .../ulist-jaccard-check_01.ast                  |   8 +-
 .../ulist-jaccard-check_02.ast                  |   8 +-
 .../ulist-jaccard-check_03.ast                  |   8 +-
 .../ulist-jaccard-check_04.ast                  |   8 +-
 .../inverted-index-join/ulist-jaccard_01.ast    |   8 +-
 .../inverted-index-join/ulist-jaccard_02.ast    |   8 +-
 .../inverted-index-join/ulist-jaccard_03.ast    |   8 +-
 .../inverted-index-join/ulist-jaccard_04.ast    |   8 +-
 .../word-fuzzyeq-jaccard_01.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_02.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_03.ast                 |   2 +-
 .../word-jaccard-check-after-btree-access.ast   |  12 +-
 .../word-jaccard-check_01.ast                   |   4 +-
 .../word-jaccard-check_02.ast                   |   4 +-
 .../word-jaccard-check_03.ast                   |   2 +-
 .../word-jaccard-check_04.ast                   |   2 +-
 .../inverted-index-join/word-jaccard_01.ast     |   4 +-
 .../inverted-index-join/word-jaccard_02.ast     |   4 +-
 .../inverted-index-join/word-jaccard_03.ast     |   2 +-
 .../inverted-index-join/word-jaccard_04.ast     |   2 +-
 .../results_parser_sqlpp/join-super-key_01.ast  |  26 +-
 .../results_parser_sqlpp/join-super-key_02.ast  |  26 +-
 .../results_parser_sqlpp/limit-issue353.ast     |   8 +-
 .../results_parser_sqlpp/loj-super-key_01.ast   |  26 +-
 .../results_parser_sqlpp/loj-super-key_02.ast   |  26 +-
 .../results_parser_sqlpp/nest_aggregate.ast     |  30 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-btree-sidx_02.ast |  12 +-
 .../primary-equi-join-multipred.ast             |  12 +-
 .../primary-equi-join-neg_01.ast                |   4 +-
 .../btree-index-join/primary-equi-join_01.ast   |   4 +-
 .../btree-index-join/primary-equi-join_02.ast   |   4 +-
 .../btree-index-join/primary-equi-join_03.ast   |  12 +-
 .../btree-index-join/primary-equi-join_04.ast   |  12 +-
 .../btree-index-join/primary-equi-join_05.ast   |   8 +-
 .../btree-index-join/primary-ge-join_01.ast     |   4 +-
 .../btree-index-join/primary-gt-join_01.ast     |   4 +-
 .../btree-index-join/primary-le-join_01.ast     |   4 +-
 .../btree-index-join/primary-lt-join_01.ast     |   4 +-
 .../secondary-equi-join-multiindex.ast          |  16 +-
 .../secondary-equi-join-multipred.ast           |   4 +-
 .../btree-index-join/secondary-equi-join_01.ast |   4 +-
 .../btree-index/btree-secondary-33.ast          |   2 +-
 .../btree-index/btree-secondary-34.ast          |   2 +-
 .../btree-index/btree-secondary-35.ast          |   2 +-
 .../btree-index/btree-secondary-36.ast          |   2 +-
 .../btree-index/btree-secondary-37.ast          |   2 +-
 .../btree-index/btree-secondary-38.ast          |   2 +-
 .../btree-index/btree-secondary-39.ast          |   2 +-
 .../btree-index/btree-secondary-40.ast          |   2 +-
 .../btree-index/btree-secondary-41.ast          |   2 +-
 .../btree-index/btree-secondary-42.ast          |   2 +-
 .../btree-index/btree-secondary-43.ast          |   2 +-
 .../btree-index/btree-secondary-44.ast          |   2 +-
 .../btree-index/btree-secondary-45.ast          |   2 +-
 .../btree-index/btree-secondary-46.ast          |   2 +-
 .../btree-index/btree-secondary-47.ast          |   2 +-
 .../btree-index/btree-secondary-48.ast          |   2 +-
 .../btree-index/btree-secondary-49.ast          |   2 +-
 .../btree-index/btree-secondary-50.ast          |   2 +-
 .../btree-index/btree-secondary-51.ast          |   2 +-
 .../btree-index/btree-secondary-52.ast          |   2 +-
 .../btree-index/btree-secondary-53.ast          |   2 +-
 .../btree-index/btree-secondary-54.ast          |   2 +-
 .../btree-index/btree-secondary-55.ast          |   2 +-
 .../btree-index/btree-secondary-56.ast          |   2 +-
 .../btree-index/btree-secondary-57.ast          |   2 +-
 .../btree-index/btree-secondary-58.ast          |   2 +-
 .../btree-index/btree-secondary-59.ast          |   2 +-
 .../btree-index/btree-secondary-60.ast          |   2 +-
 .../btree-index/btree-secondary-61.ast          |   2 +-
 .../btree-index/btree-secondary-62.ast          |   2 +-
 .../btree-index/btree-secondary-63.ast          |   2 +-
 .../ngram-contains-panic.ast                    |   2 +-
 .../inverted-index-basic/ngram-contains.ast     |   2 +-
 .../ngram-edit-distance-check-panic.ast         |   2 +-
 .../ngram-edit-distance-check.ast               |   2 +-
 .../ngram-edit-distance-panic.ast               |   2 +-
 .../ngram-edit-distance.ast                     |   2 +-
 .../ngram-fuzzyeq-edit-distance.ast             |   2 +-
 .../ngram-fuzzyeq-jaccard.ast                   |   2 +-
 .../ngram-jaccard-check.ast                     |   2 +-
 .../inverted-index-basic/ngram-jaccard.ast      |   2 +-
 .../olist-edit-distance-check-panic.ast         |   8 +-
 .../olist-edit-distance-check.ast               |   8 +-
 .../olist-edit-distance-panic.ast               |   8 +-
 .../olist-edit-distance.ast                     |   8 +-
 .../olist-fuzzyeq-edit-distance.ast             |   8 +-
 .../olist-fuzzyeq-jaccard.ast                   |   8 +-
 .../olist-jaccard-check.ast                     |   8 +-
 .../inverted-index-basic/olist-jaccard.ast      |   8 +-
 .../ulist-fuzzyeq-jaccard.ast                   |   8 +-
 .../ulist-jaccard-check.ast                     |   8 +-
 .../inverted-index-basic/ulist-jaccard.ast      |   8 +-
 .../inverted-index-basic/word-contains.ast      |   2 +-
 .../word-fuzzyeq-jaccard.ast                    |   2 +-
 .../inverted-index-basic/word-jaccard-check.ast |   2 +-
 .../inverted-index-basic/word-jaccard.ast       |   2 +-
 ...edit-distance-check-let-panic-nopanic_01.ast |   2 +-
 ...edit-distance-check-let-panic-nopanic_02.ast |   2 +-
 .../ngram-edit-distance-check-let-panic.ast     |   2 +-
 .../ngram-edit-distance-check-let.ast           |   2 +-
 .../ngram-edit-distance-check-substring.ast     |   2 +-
 .../ngram-edit-distance-check-word-tokens.ast   |   2 +-
 .../ngram-jaccard-check-let.ast                 |   2 +-
 .../ngram-jaccard-check-multi-let.ast           |   2 +-
 .../olist-edit-distance-check-let-panic.ast     |   8 +-
 .../olist-edit-distance-check-let.ast           |   8 +-
 .../olist-jaccard-check-let.ast                 |   8 +-
 .../ulist-jaccard-check-let.ast                 |   8 +-
 .../word-jaccard-check-let.ast                  |   2 +-
 .../word-jaccard-check-multi-let.ast            |   2 +-
 ...idx-with-join-edit-distance-check-idx_01.ast |  12 +-
 ...robe-pidx-with-join-jaccard-check-idx_01.ast |  12 +-
 .../ngram-edit-distance-check_01.ast            |   4 +-
 .../ngram-edit-distance-contains.ast            |   4 +-
 .../ngram-edit-distance-inline.ast              |   2 +-
 .../ngram-edit-distance_01.ast                  |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.ast          |   4 +-
 .../ngram-fuzzyeq-jaccard_01.ast                |   4 +-
 .../ngram-jaccard-check_01.ast                  |   4 +-
 .../ngram-jaccard-inline.ast                    |   2 +-
 .../inverted-index-join/ngram-jaccard_01.ast    |   4 +-
 .../olist-edit-distance-check_01.ast            |   8 +-
 .../olist-edit-distance-inline.ast              |   8 +-
 .../olist-edit-distance_01.ast                  |   8 +-
 .../olist-fuzzyeq-edit-distance_01.ast          |   8 +-
 .../olist-fuzzyeq-jaccard_01.ast                |   8 +-
 .../olist-jaccard-check_01.ast                  |   8 +-
 .../olist-jaccard-inline.ast                    |   8 +-
 .../inverted-index-join/olist-jaccard_01.ast    |   8 +-
 .../ulist-fuzzyeq-jaccard_01.ast                |   8 +-
 .../ulist-jaccard-check_01.ast                  |   8 +-
 .../ulist-jaccard-inline.ast                    |   8 +-
 .../inverted-index-join/ulist-jaccard_01.ast    |   8 +-
 .../word-fuzzyeq-jaccard_01.ast                 |   4 +-
 .../word-jaccard-check-after-btree-access.ast   |  12 +-
 .../word-jaccard-check_01.ast                   |   4 +-
 .../inverted-index-join/word-jaccard-inline.ast |   2 +-
 .../inverted-index-join/word-jaccard_01.ast     |   4 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.ast |  12 +-
 .../spatial-intersect-point_01.ast              |   2 +-
 .../spatial-intersect-point_02.ast              |   2 +-
 .../spatial-intersect-point_03.ast              |   2 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_1.ast |  10 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_2.ast |   8 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_1.ast |  10 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_2.ast |   8 +-
 .../secondary-composite-key-join_01.ast         |   2 +-
 .../secondary-composite-key-join_02.ast         |   2 +-
 .../secondary-composite-key-join_03.ast         |   2 +-
 .../secondary-composite-key-prefix-join_01.ast  |   2 +-
 .../secondary-composite-key-prefix-join_02.ast  |   2 +-
 .../secondary-composite-key-prefix-join_03.ast  |   2 +-
 .../secondary-composite-key-prefix-join_04.ast  |   2 +-
 .../secondary-composite-key-prefix-join_05.ast  |   2 +-
 .../secondary-composite-key-prefix-join_06.ast  |   2 +-
 .../secondary-equi-join-multiindex.ast          |  14 +-
 .../secondary-equi-join-multipred.ast           |   4 +-
 .../btree-index-join/secondary-equi-join_01.ast |   4 +-
 .../btree-index-join/secondary-equi-join_02.ast |   4 +-
 .../btree-index-join/secondary-equi-join_03.ast |   4 +-
 .../btree-index-join/secondary-equi-join_04.ast |   2 +-
 .../btree-index-join/secondary-equi-join_05.ast |   4 +-
 .../btree-index/btree-secondary-33.ast          |   2 +-
 .../btree-index/btree-secondary-34.ast          |   2 +-
 .../btree-index/btree-secondary-35.ast          |   2 +-
 .../btree-index/btree-secondary-36.ast          |   2 +-
 .../btree-index/btree-secondary-37.ast          |   2 +-
 .../btree-index/btree-secondary-38.ast          |   2 +-
 .../btree-index/btree-secondary-39.ast          |   2 +-
 .../btree-index/btree-secondary-40.ast          |   2 +-
 .../btree-index/btree-secondary-41.ast          |   2 +-
 .../btree-index/btree-secondary-42.ast          |   2 +-
 .../btree-index/btree-secondary-43.ast          |   2 +-
 .../btree-index/btree-secondary-44.ast          |   2 +-
 .../btree-index/btree-secondary-45.ast          |   2 +-
 .../btree-index/btree-secondary-46.ast          |   2 +-
 .../btree-index/btree-secondary-47.ast          |   2 +-
 .../btree-index/btree-secondary-48.ast          |   2 +-
 .../btree-index/btree-secondary-49.ast          |   2 +-
 .../btree-index/btree-secondary-50.ast          |   2 +-
 .../btree-index/btree-secondary-51.ast          |   2 +-
 .../btree-index/btree-secondary-52.ast          |   2 +-
 .../btree-index/btree-secondary-53.ast          |   2 +-
 .../btree-index/btree-secondary-54.ast          |   2 +-
 .../btree-index/btree-secondary-55.ast          |   2 +-
 .../btree-index/btree-secondary-56.ast          |   2 +-
 .../btree-index/btree-secondary-57.ast          |   2 +-
 .../btree-index/btree-secondary-58.ast          |   2 +-
 .../btree-index/btree-secondary-59.ast          |   2 +-
 .../btree-index/btree-secondary-60.ast          |   2 +-
 .../btree-index/btree-secondary-61.ast          |   2 +-
 .../btree-index/btree-secondary-62.ast          |   2 +-
 .../btree-index/btree-secondary-63.ast          |   2 +-
 .../ngram-contains-panic.ast                    |   2 +-
 .../inverted-index-basic/ngram-contains.ast     |   2 +-
 .../ngram-edit-distance-check-panic.ast         |   2 +-
 .../ngram-edit-distance-check.ast               |   2 +-
 .../ngram-edit-distance-panic.ast               |   2 +-
 .../ngram-edit-distance.ast                     |   2 +-
 .../ngram-fuzzyeq-edit-distance.ast             |   2 +-
 .../ngram-fuzzyeq-jaccard.ast                   |   2 +-
 .../ngram-jaccard-check.ast                     |   2 +-
 .../inverted-index-basic/ngram-jaccard.ast      |   2 +-
 .../inverted-index-basic/word-contains.ast      |   2 +-
 .../word-fuzzyeq-jaccard.ast                    |   2 +-
 .../inverted-index-basic/word-jaccard-check.ast |   2 +-
 .../inverted-index-basic/word-jaccard.ast       |   2 +-
 ...edit-distance-check-let-panic-nopanic_01.ast |   2 +-
 ...edit-distance-check-let-panic-nopanic_02.ast |   2 +-
 .../ngram-edit-distance-check-let-panic.ast     |   2 +-
 .../ngram-edit-distance-check-let.ast           |   2 +-
 .../ngram-edit-distance-check-substring.ast     |   2 +-
 .../ngram-edit-distance-check-word-tokens.ast   |   2 +-
 .../ngram-jaccard-check-let.ast                 |   2 +-
 .../ngram-jaccard-check-multi-let.ast           |   2 +-
 .../word-jaccard-check-let.ast                  |   2 +-
 .../word-jaccard-check-multi-let.ast            |   2 +-
 ...idx-with-join-edit-distance-check-idx_01.ast |  12 +-
 .../inverted-index-join/ngram-contains_01.ast   |   4 +-
 .../inverted-index-join/ngram-contains_02.ast   |   4 +-
 .../inverted-index-join/ngram-contains_03.ast   |   2 +-
 .../inverted-index-join/ngram-contains_04.ast   |   4 +-
 .../ngram-edit-distance-check_01.ast            |   4 +-
 .../ngram-edit-distance-check_02.ast            |   4 +-
 .../ngram-edit-distance-check_03.ast            |   2 +-
 .../ngram-edit-distance-check_04.ast            |   4 +-
 .../ngram-edit-distance-check_05.ast            |   4 +-
 .../ngram-edit-distance-contains.ast            |   4 +-
 .../ngram-edit-distance-inline.ast              |   2 +-
 .../ngram-edit-distance_01.ast                  |   4 +-
 .../ngram-edit-distance_02.ast                  |   4 +-
 .../ngram-edit-distance_03.ast                  |   2 +-
 .../ngram-edit-distance_04.ast                  |   4 +-
 .../ngram-edit-distance_05.ast                  |   4 +-
 .../ngram-fuzzyeq-edit-distance_01.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.ast          |   2 +-
 .../ngram-fuzzyeq-edit-distance_04.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_05.ast          |   4 +-
 .../ngram-fuzzyeq-jaccard_01.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_02.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_03.ast                |   2 +-
 .../ngram-fuzzyeq-jaccard_04.ast                |   4 +-
 .../ngram-jaccard-check_01.ast                  |   4 +-
 .../ngram-jaccard-check_02.ast                  |   4 +-
 .../ngram-jaccard-check_03.ast                  |   2 +-
 .../ngram-jaccard-check_04.ast                  |   4 +-
 .../ngram-jaccard-inline.ast                    |   2 +-
 .../inverted-index-join/ngram-jaccard_01.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_02.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_03.ast    |   2 +-
 .../inverted-index-join/ngram-jaccard_04.ast    |   4 +-
 .../word-fuzzyeq-jaccard_01.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_02.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_03.ast                 |   2 +-
 .../word-fuzzyeq-jaccard_04.ast                 |   4 +-
 .../word-jaccard-check-after-btree-access.ast   |  12 +-
 .../word-jaccard-check_01.ast                   |   4 +-
 .../word-jaccard-check_02.ast                   |   4 +-
 .../word-jaccard-check_03.ast                   |   2 +-
 .../word-jaccard-check_04.ast                   |   4 +-
 .../inverted-index-join/word-jaccard-inline.ast |   2 +-
 .../inverted-index-join/word-jaccard_01.ast     |   4 +-
 .../inverted-index-join/word-jaccard_02.ast     |   4 +-
 .../inverted-index-join/word-jaccard_03.ast     |   2 +-
 .../inverted-index-join/word-jaccard_04.ast     |   4 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.ast |  12 +-
 .../spatial-intersect-point_01.ast              |   2 +-
 .../spatial-intersect-point_02.ast              |   2 +-
 .../spatial-intersect-point_03.ast              |   2 +-
 .../spatial-intersect-point_04.ast              |   2 +-
 .../spatial-intersect-point_05.ast              |   2 +-
 .../results_parser_sqlpp/nested_loj2.ast        |  18 +-
 .../results_parser_sqlpp/nested_loj3.ast        |  24 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_1.ast |  10 +-
 ...oin-probe-pidx-with-join-btree-sidx_01_2.ast |   8 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_1.ast |  10 +-
 ...oin-probe-pidx-with-join-btree-sidx_02_2.ast |   8 +-
 .../secondary-composite-key-join_01.ast         |   2 +-
 .../secondary-composite-key-join_02.ast         |   2 +-
 .../secondary-composite-key-join_03.ast         |   2 +-
 .../secondary-composite-key-prefix-join_01.ast  |   2 +-
 .../secondary-composite-key-prefix-join_02.ast  |   2 +-
 .../secondary-composite-key-prefix-join_03.ast  |   2 +-
 .../secondary-composite-key-prefix-join_04.ast  |   2 +-
 .../secondary-composite-key-prefix-join_05.ast  |   2 +-
 .../secondary-composite-key-prefix-join_06.ast  |   2 +-
 .../secondary-equi-join-multiindex.ast          |  14 +-
 .../secondary-equi-join-multipred.ast           |   4 +-
 .../btree-index-join/secondary-equi-join_01.ast |   4 +-
 .../btree-index-join/secondary-equi-join_02.ast |   4 +-
 .../btree-index-join/secondary-equi-join_03.ast |   2 +-
 .../btree-index-join/secondary-equi-join_04.ast |   4 +-
 .../btree-index-join/secondary-equi-join_05.ast |   4 +-
 .../btree-index/btree-secondary-33.ast          |   2 +-
 .../btree-index/btree-secondary-34.ast          |   2 +-
 .../btree-index/btree-secondary-35.ast          |   2 +-
 .../btree-index/btree-secondary-36.ast          |   2 +-
 .../btree-index/btree-secondary-37.ast          |   2 +-
 .../btree-index/btree-secondary-38.ast          |   2 +-
 .../btree-index/btree-secondary-39.ast          |   2 +-
 .../btree-index/btree-secondary-40.ast          |   2 +-
 .../btree-index/btree-secondary-41.ast          |   2 +-
 .../btree-index/btree-secondary-42.ast          |   2 +-
 .../btree-index/btree-secondary-43.ast          |   2 +-
 .../btree-index/btree-secondary-44.ast          |   2 +-
 .../btree-index/btree-secondary-45.ast          |   2 +-
 .../btree-index/btree-secondary-46.ast          |   2 +-
 .../btree-index/btree-secondary-47.ast          |   2 +-
 .../btree-index/btree-secondary-48.ast          |   2 +-
 .../btree-index/btree-secondary-49.ast          |   2 +-
 .../btree-index/btree-secondary-50.ast          |   2 +-
 .../btree-index/btree-secondary-51.ast          |   2 +-
 .../btree-index/btree-secondary-52.ast          |   2 +-
 .../btree-index/btree-secondary-53.ast          |   2 +-
 .../btree-index/btree-secondary-54.ast          |   2 +-
 .../btree-index/btree-secondary-55.ast          |   2 +-
 .../btree-index/btree-secondary-56.ast          |   2 +-
 .../btree-index/btree-secondary-57.ast          |   2 +-
 .../btree-index/btree-secondary-58.ast          |   2 +-
 .../btree-index/btree-secondary-59.ast          |   2 +-
 .../btree-index/btree-secondary-60.ast          |   2 +-
 .../btree-index/btree-secondary-61.ast          |   2 +-
 .../btree-index/btree-secondary-62.ast          |   2 +-
 .../btree-index/btree-secondary-63.ast          |   2 +-
 .../ngram-contains-panic.ast                    |   2 +-
 .../inverted-index-basic/ngram-contains.ast     |   2 +-
 .../ngram-edit-distance-check-panic.ast         |   2 +-
 .../ngram-edit-distance-check.ast               |   2 +-
 .../ngram-edit-distance-panic.ast               |   2 +-
 .../ngram-edit-distance.ast                     |   2 +-
 .../ngram-fuzzyeq-edit-distance.ast             |   2 +-
 .../ngram-fuzzyeq-jaccard.ast                   |   2 +-
 .../ngram-jaccard-check.ast                     |   2 +-
 .../inverted-index-basic/ngram-jaccard.ast      |   2 +-
 .../inverted-index-basic/word-contains.ast      |   2 +-
 .../word-fuzzyeq-jaccard.ast                    |   2 +-
 .../inverted-index-basic/word-jaccard-check.ast |   2 +-
 .../inverted-index-basic/word-jaccard.ast       |   2 +-
 ...edit-distance-check-let-panic-nopanic_01.ast |   2 +-
 ...edit-distance-check-let-panic-nopanic_02.ast |   2 +-
 .../ngram-edit-distance-check-let-panic.ast     |   2 +-
 .../ngram-edit-distance-check-let.ast           |   2 +-
 .../ngram-edit-distance-check-substring.ast     |   2 +-
 .../ngram-edit-distance-check-word-tokens.ast   |   2 +-
 .../ngram-jaccard-check-let.ast                 |   2 +-
 .../ngram-jaccard-check-multi-let.ast           |   2 +-
 .../word-jaccard-check-let.ast                  |   2 +-
 .../word-jaccard-check-multi-let.ast            |   2 +-
 ...idx-with-join-edit-distance-check-idx_01.ast |  12 +-
 .../inverted-index-join/ngram-contains_01.ast   |   4 +-
 .../inverted-index-join/ngram-contains_02.ast   |   4 +-
 .../inverted-index-join/ngram-contains_03.ast   |   2 +-
 .../inverted-index-join/ngram-contains_04.ast   |   4 +-
 .../ngram-edit-distance-check_01.ast            |   4 +-
 .../ngram-edit-distance-check_02.ast            |   4 +-
 .../ngram-edit-distance-check_03.ast            |   2 +-
 .../ngram-edit-distance-check_04.ast            |   4 +-
 .../ngram-edit-distance-check_05.ast            |   4 +-
 .../ngram-edit-distance-check_inline_03.ast     |   2 +-
 .../ngram-edit-distance-contains.ast            |   4 +-
 .../ngram-edit-distance_01.ast                  |   4 +-
 .../ngram-edit-distance_02.ast                  |   4 +-
 .../ngram-edit-distance_03.ast                  |   2 +-
 .../ngram-edit-distance_04.ast                  |   4 +-
 .../ngram-edit-distance_05.ast                  |   4 +-
 .../ngram-edit-distance_inline_03.ast           |   2 +-
 .../ngram-fuzzyeq-edit-distance_01.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_02.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_03.ast          |   2 +-
 .../ngram-fuzzyeq-edit-distance_04.ast          |   4 +-
 .../ngram-fuzzyeq-edit-distance_05.ast          |   4 +-
 .../ngram-fuzzyeq-jaccard_01.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_02.ast                |   4 +-
 .../ngram-fuzzyeq-jaccard_03.ast                |   2 +-
 .../ngram-fuzzyeq-jaccard_04.ast                |   4 +-
 .../ngram-jaccard-check_01.ast                  |   4 +-
 .../ngram-jaccard-check_02.ast                  |   4 +-
 .../ngram-jaccard-check_03.ast                  |   2 +-
 .../ngram-jaccard-check_04.ast                  |   4 +-
 .../ngram-jaccard-check_inline_03.ast           |   2 +-
 .../inverted-index-join/ngram-jaccard_01.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_02.ast    |   4 +-
 .../inverted-index-join/ngram-jaccard_03.ast    |   2 +-
 .../inverted-index-join/ngram-jaccard_04.ast    |   4 +-
 .../ngram-jaccard_inline_03.ast                 |   2 +-
 .../word-fuzzyeq-jaccard_01.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_02.ast                 |   4 +-
 .../word-fuzzyeq-jaccard_03.ast                 |   2 +-
 .../word-fuzzyeq-jaccard_04.ast                 |   4 +-
 .../word-jaccard-check-after-btree-access.ast   |  12 +-
 .../word-jaccard-check_01.ast                   |   4 +-
 .../word-jaccard-check_02.ast                   |   4 +-
 .../word-jaccard-check_03.ast                   |   2 +-
 .../word-jaccard-check_04.ast                   |   4 +-
 .../word-jaccard-check_inline_03.ast            |   2 +-
 .../inverted-index-join/word-jaccard_01.ast     |   4 +-
 .../inverted-index-join/word-jaccard_02.ast     |   4 +-
 .../inverted-index-join/word-jaccard_03.ast     |   2 +-
 .../inverted-index-join/word-jaccard_04.ast     |   4 +-
 .../word-jaccard_inline_03.ast                  |   2 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.ast |  12 +-
 .../spatial-intersect-point_01.ast              |   4 +-
 .../spatial-intersect-point_02.ast              |   4 +-
 .../spatial-intersect-point_03.ast              |   2 +-
 .../spatial-intersect-point_04.ast              |   2 +-
 .../spatial-intersect-point_05.ast              |   2 +-
 .../orderby-desc-using-gby.ast                  |   8 +-
 .../results_parser_sqlpp/orders-aggreg.ast      |   4 +-
 .../orders-composite-index-search.ast           |   6 +-
 .../orders-index-search-conjunctive-open_01.ast |   6 +-
 .../orders-index-search-conjunctive-open_02.ast |   6 +-
 .../orders-index-search-conjunctive_01.ast      |   6 +-
 .../orders-index-search-conjunctive_02.ast      |   6 +-
 .../orders-index-search-open.ast                |   6 +-
 .../orders-index-search.ast                     |   6 +-
 .../prim-idx-search-open.ast                    |   6 +-
 .../results_parser_sqlpp/prim-idx-search.ast    |   6 +-
 .../pull_select_above_eq_join.ast               |   8 +-
 .../push-project-through-group.ast              |   2 +-
 .../results_parser_sqlpp/push_limit.ast         |   6 +-
 .../q01_pricing_summary_report_nt.ast           |   8 +-
 .../q03_shipping_priority.ast                   |  18 +-
 .../q05_local_supplier_volume.ast               |  28 +-
 .../results_parser_sqlpp/q08_group_by.ast       |  32 +-
 .../results_parser_sqlpp/q09_group_by.ast       |  40 +-
 .../results_parser_sqlpp/query-issue562.ast     |  20 +-
 .../results_parser_sqlpp/query-issue601.ast     |   8 +-
 .../results_parser_sqlpp/query-issue697.ast     |   4 +-
 .../results_parser_sqlpp/query-issue785.ast     |  20 +-
 .../results_parser_sqlpp/query-issue810-2.ast   |   8 +-
 .../results_parser_sqlpp/query-issue810.ast     |   8 +-
 .../results_parser_sqlpp/query-issue827-2.ast   |   8 +-
 .../results_parser_sqlpp/query_issue849-2.ast   |   2 +-
 .../results_parser_sqlpp/query_issue849.ast     |   2 +-
 .../sort-hint-on-closed-numeric-desc.ast        |   6 +-
 .../sort-hint-on-closed-numeric.ast             |   6 +-
 .../sort-hint-on-closed-string-desc.ast         |   6 +-
 .../sort-hint-on-closed-string.ast              |   6 +-
 .../rtree-index-join/issue730.ast               |   8 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_01.ast |  12 +-
 ...rjoin-probe-pidx-with-join-rtree-sidx_02.ast |  12 +-
 .../rtree-index-join/query-issue838.ast         |   4 +-
 .../spatial-intersect-point_01.ast              |   2 +-
 .../spatial-intersect-point_02.ast              |   2 +-
 .../spatial-intersect-point_03.ast              |   2 +-
 .../rtree-secondary-index-open.ast              |   2 +-
 .../rtree-secondary-index.ast                   |   2 +-
 .../results_parser_sqlpp/scan-delete-all.ast    |  14 +-
 .../scan-delete-rtree-secondary-index.ast       |   2 +-
 .../results_parser_sqlpp/scan-delete.ast        |  14 +-
 .../scan-insert-secondary-index.ast             |  14 +-
 .../results_parser_sqlpp/scan-insert.ast        |  14 +-
 ...t-distance-let-to-edit-distance-check_01.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_02.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_03.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_04.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_05.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_06.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_07.ast |   2 +-
 ...t-distance-let-to-edit-distance-check_08.ast |   2 +-
 .../edit-distance-to-edit-distance-check_01.ast |   2 +-
 .../edit-distance-to-edit-distance-check_02.ast |   2 +-
 .../edit-distance-to-edit-distance-check_03.ast |   2 +-
 .../edit-distance-to-edit-distance-check_04.ast |   2 +-
 .../edit-distance-to-edit-distance-check_05.ast |   2 +-
 .../edit-distance-to-edit-distance-check_06.ast |   2 +-
 .../edit-distance-to-edit-distance-check_07.ast |   2 +-
 .../edit-distance-to-edit-distance-check_08.ast |   2 +-
 .../fuzzyeq-to-edit-distance-check.ast          |   2 +-
 .../similarity/fuzzyeq-to-jaccard-check.ast     |   2 +-
 .../jaccard-let-to-jaccard-check_01.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_02.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_03.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_04.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_05.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_06.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_07.ast         |   2 +-
 .../jaccard-let-to-jaccard-check_08.ast         |   2 +-
 .../similarity/jaccard-to-jaccard-check_01.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_02.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_03.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_04.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_05.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_06.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_07.ast  |   2 +-
 .../similarity/jaccard-to-jaccard-check_08.ast  |   2 +-
 ...dont-skip-primary-index-search-in-delete.ast |   8 +-
 .../skip-ngram-index-search-in-delete.ast       |   2 +-
 .../skip-index/skip-ngram-index.ast             |   2 +-
 .../skip-rtree-index-search-in-delete.ast       |   2 +-
 .../skip-index/skip-rtree-secondary-index.ast   |   2 +-
 .../skip-index/skip-secondary-btree-index-2.ast |   2 +-
 ...p-secondary-btree-index-search-in-delete.ast |   8 +-
 .../skip-index/skip-secondary-btree-index.ast   |   2 +-
 .../skip-word-index-search-in-delete.ast        |   2 +-
 .../skip-index/skip-word-index.ast              |   2 +-
 .../results_parser_sqlpp/sort-cust.ast          |   8 +-
 .../split-materialization-above-join.ast        |   2 +-
 .../split-materialization.ast                   |   4 +-
 .../unnest_list_in_subplan.ast                  |   6 +-
 .../parserts/queries_sqlpp/del-dataset.sqlpp    |   8 +-
 .../queries_sqlpp/load-del-dataset.sqlpp        |   8 +-
 .../results_parser_sqlpp/del-dataset.ast        |   8 +-
 .../results_parser_sqlpp/load-del-dataset.ast   |   8 +-
 .../parserts/results_parser_sqlpp/utf-8.ast     |   4 +-
 .../runtimets/queries/api/APIQueries.xml        |  61 ++
 .../cluster_state_cc_1.1.cstate.aql             |  25 +
 .../cluster_state_cc_stats_1.1.cstate.aql       |  25 +
 .../cluster_state_nc_threaddump_1.1.cstate.aql  |  25 +
 .../api/version_1/version_1.1.version.aql       |  24 +
 .../queries/comparison/ComparisonQueries.xml    | 438 ++++-----
 .../comparison/deep_equal/DeepEqualQueries.xml  |  22 +-
 .../drop-dataverse/drop-dataverse.3.ddl.aql     |  27 +
 .../drop-type-used-elsewhere.3.ddl.aql          |  29 +
 .../query-dataset-with-foreign-type.4.ddl.aql   |  27 +
 .../load-with-index-open_02.4.ddl.aql           |  20 +
 .../dml/query-issue382/query-issue382.4.ddl.aql |  19 +
 .../feeds/upsert-feed/upsert-feed.1.ddl.aql     |  46 +
 .../feeds/upsert-feed/upsert-feed.2.update.aql  |  29 +
 .../feeds/upsert-feed/upsert-feed.3.server.aql  |  26 +
 .../feeds/upsert-feed/upsert-feed.4.sleep.aql   |  26 +
 .../feeds/upsert-feed/upsert-feed.5.update.aql  |  28 +
 .../feeds/upsert-feed/upsert-feed.6.query.aql   |  31 +
 .../feeds/upsert-feed/upsert-feed.7.server.aql  |  27 +
 .../feeds/upsert-feed/upsert-feed.8.ddl.aql     |  27 +
 .../dblp-csx-aqlplus_5.1.ddl.aql                |  45 +
 .../dblp-csx-aqlplus_5.2.update.aql             |  28 +
 .../dblp-csx-aqlplus_5.3.query.aql              |  29 +
 .../load/escapes-err-1/escapes-err-1.3.ddl.aql  |  19 +
 .../queries/load/escapes01/escapes01.4.ddl.aql  |  19 +
 .../queries/load/escapes02/escapes02.4.ddl.aql  |  19 +
 .../load_non-empty_index.3.ddl.aql              |  24 +
 .../type_promotion_0/type_promotion_0.4.ddl.aql |  19 +
 .../queries/misc/flushtest/flushtest.5.ddl.aql  |  19 +
 .../query-issue208/query-issue208.4.ddl.aql     |  26 +
 .../query-issue236/query-issue236.4.ddl.aql     |  26 +
 .../enforced-type-delete.1.ddl.aql              |  33 +
 .../enforced-type-delete.2.update.aql           |  29 +
 .../enforced-type-delete.3.ddl.aql              |  27 +
 .../enforced-type-delete.4.update.aql           |  32 +
 .../enforced-type-delete.5.query.aql            |  29 +
 .../enforced-type-upsert.1.ddl.aql              |  33 +
 .../enforced-type-upsert.2.update.aql           |  29 +
 .../enforced-type-upsert.3.ddl.aql              |  27 +
 .../enforced-type-upsert.4.update.aql           |  29 +
 .../enforced-type-upsert.5.query.aql            |  29 +
 .../queries/records/RecordsQueries.xml          | 323 +++----
 .../closed-nullable-fileds_issue1616.1.ddl.aql  | 862 +++++++++++++++++
 ...losed-nullable-fileds_issue1616.2.update.aql |  28 +
 ...closed-nullable-fileds_issue1616.3.query.aql |  29 +
 .../q07_volume_shipping.3.query.aql             |  46 +-
 .../q08_national_market_share.3.query.aql       |  34 +-
 .../types/any-object/any-object.1.ddl.aql       |  25 +
 .../types/any-object/any-object.2.query.aql     |  21 +
 .../issue1587-foreignDataType.4.ddl.aql         |  25 +
 .../agg_null/agg_null.3.query.sqlpp             |   2 +-
 .../agg_null_rec/agg_null_rec.1.ddl.sqlpp       |   2 +-
 .../agg_null_rec/agg_null_rec.3.query.sqlpp     |  10 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp   |   2 +-
 .../agg_null_rec_1/agg_null_rec_1.3.query.sqlpp |  10 +-
 .../agg_number/agg_number.3.query.sqlpp         |   2 +-
 .../agg_number_rec/agg_number_rec.1.ddl.sqlpp   |   2 +-
 .../agg_number_rec/agg_number_rec.3.query.sqlpp |  10 +-
 .../avg_double/avg_double.3.query.sqlpp         |   2 +-
 .../avg_double_null/avg_double_null.1.ddl.sqlpp |  10 +-
 .../avg_double_null.3.query.sqlpp               |   2 +-
 .../avg_empty_01/avg_empty_01.1.ddl.sqlpp       |   2 +-
 .../avg_empty_01/avg_empty_01.2.update.sqlpp    |   2 +-
 .../avg_empty_01/avg_empty_01.3.query.sqlpp     |   4 +-
 .../avg_empty_02/avg_empty_02.1.ddl.sqlpp       |   4 +-
 .../avg_empty_02/avg_empty_02.2.update.sqlpp    |   2 +-
 .../avg_empty_02/avg_empty_02.3.query.sqlpp     |   4 +-
 .../avg_float/avg_float.3.query.sqlpp           |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp     |  10 +-
 .../avg_float_null/avg_float_nu.3.query.sqlpp   |   2 +-
 .../avg_int16/avg_int16.3.query.sqlpp           |   4 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp   |  10 +-
 .../avg_int16_null/avg_int16_null.3.query.sqlpp |   2 +-
 .../avg_int32/avg_int32.3.query.sqlpp           |   4 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp   |  10 +-
 .../avg_int32_null/avg_int32_null.3.query.sqlpp |   2 +-
 .../avg_int64/avg_int64.3.query.sqlpp           |   4 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp   |  10 +-
 .../avg_int64_null/avg_int64_null.3.query.sqlpp |   2 +-
 .../avg_int8/avg_int8.3.query.sqlpp             |   4 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp     |  10 +-
 .../avg_int8_null/avg_int8_null.3.query.sqlpp   |   2 +-
 .../avg_mixed/avg_mixed.1.ddl.sqlpp             |   2 +-
 .../avg_mixed/avg_mixed.3.query.sqlpp           |   4 +-
 .../count_01/count_01.3.query.sqlpp             |   2 +-
 .../count_empty_01/count_empty_01.1.ddl.sqlpp   |   2 +-
 .../count_empty_01.2.update.sqlpp               |   2 +-
 .../count_empty_01/count_empty_01.3.query.sqlpp |   4 +-
 .../count_empty_02/count_empty_02.1.ddl.sqlpp   |   4 +-
 .../count_empty_02.2.update.sqlpp               |   2 +-
 .../count_empty_02/count_empty_02.3.query.sqlpp |   4 +-
 .../count_null/count_null.1.ddl.sqlpp           |  10 +-
 .../count_null/count_null.3.query.sqlpp         |   2 +-
 .../aggregate-sql/issue395/issue395.1.ddl.sqlpp |   2 +-
 .../issue395/issue395.3.query.sqlpp             |   2 +-
 .../issue412_0/issue412_0.3.query.sqlpp         |   2 +-
 .../issue412_1/issue412_1.3.query.sqlpp         |   2 +-
 .../issue425_min_hetero_list.3.query.sqlpp      |   2 +-
 .../issue425_min_hetero_list_1.3.query.sqlpp    |   2 +-
 .../issue425_sum_hetero_list.3.query.sqlpp      |   2 +-
 .../issue425_sum_hetero_list_1.3.query.sqlpp    |   2 +-
 .../issue531_string_min_max.1.ddl.sqlpp         |   6 +-
 .../issue531_string_min_max.2.update.sqlpp      |   4 +-
 .../issue531_string_min_max.3.query.sqlpp       |   8 +-
 .../max_empty_01/max_empty_01.1.ddl.sqlpp       |   2 +-
 .../max_empty_01/max_empty_01.2.update.sqlpp    |   2 +-
 .../max_empty_01/max_empty_01.3.query.sqlpp     |   4 +-
 .../max_empty_02/max_empty_02.1.ddl.sqlpp       |   4 +-
 .../max_empty_02/max_empty_02.2.update.sqlpp    |   2 +-
 .../max_empty_02/max_empty_02.3.query.sqlpp     |   4 +-
 .../min_empty_01/min_empty_01.1.ddl.sqlpp       |   2 +-
 .../min_empty_01/min_empty_01.2.update.sqlpp    |   2 +-
 .../min_empty_01/min_empty_01.3.query.sqlpp     |   4 +-
 .../min_empty_02/min_empty_02.1.ddl.sqlpp       |   4 +-
 .../min_empty_02/min_empty_02.2.update.sqlpp    |   2 +-
 .../min_empty_02/min_empty_02.3.query.sqlpp     |   4 +-
 .../min_mixed/min_mixed.1.ddl.sqlpp             |   2 +-
 .../min_mixed/min_mixed.3.query.sqlpp           |   4 +-
 .../query-issue400/query-issue400.3.query.sqlpp |   2 +-
 .../scalar_avg/scalar_avg.1.ddl.sqlpp           |   2 +-
 .../scalar_avg/scalar_avg.2.update.sqlpp        |   2 +-
 .../scalar_avg/scalar_avg.3.query.sqlpp         |  14 +-
 .../scalar_avg_empty.1.ddl.sqlpp                |   2 +-
 .../scalar_avg_empty.2.update.sqlpp             |   2 +-
 .../scalar_avg_empty.3.query.sqlpp              |   4 +-
 .../scalar_avg_null/scalar_avg_null.1.ddl.sqlpp |   2 +-
 .../scalar_avg_null.2.update.sqlpp              |   2 +-
 .../scalar_avg_null.3.query.sqlpp               |  14 +-
 .../scalar_count/scalar_count.1.ddl.sqlpp       |   2 +-
 .../scalar_count/scalar_count.2.update.sqlpp    |   2 +-
 .../scalar_count/scalar_count.3.query.sqlpp     |  16 +-
 .../scalar_count_empty.1.ddl.sqlpp              |   2 +-
 .../scalar_count_empty.2.update.sqlpp           |   2 +-
 .../scalar_count_empty.3.query.sqlpp            |   4 +-
 .../scalar_count_null.1.ddl.sqlpp               |   2 +-
 .../scalar_count_null.2.update.sqlpp            |   2 +-
 .../scalar_count_null.3.query.sqlpp             |  16 +-
 .../scalar_max/scalar_max.1.ddl.sqlpp           |   2 +-
 .../scalar_max/scalar_max.2.update.sqlpp        |   2 +-
 .../scalar_max/scalar_max.3.query.sqlpp         |  18 +-
 .../scalar_max_empty.1.ddl.sqlpp                |   2 +-
 .../scalar_max_empty.2.update.sqlpp             |   2 +-
 .../scalar_max_empty.3.query.sqlpp              |   4 +-
 .../scalar_max_null/scalar_max_null.1.ddl.sqlpp |   2 +-
 .../scalar_max_null.2.update.sqlpp              |   2 +-
 .../scalar_max_null.3.query.sqlpp               |  18 +-
 .../scalar_min/scalar_min.1.ddl.sqlpp           |   2 +-
 .../scalar_min/scalar_min.2.update.sqlpp        |   2 +-
 .../scalar_min/scalar_min.3.query.sqlpp         |  18 +-
 .../scalar_min_empty.1.ddl.sqlpp                |   2 +-
 .../scalar_min_empty.2.update.sqlpp             |   2 +-
 .../scalar_min_empty.3.query.sqlpp              |   4 +-
 .../scalar_min_null/scalar_min_null.1.ddl.sqlpp |   2 +-
 .../scalar_min_null.2.update.sqlpp              |   2 +-
 .../scalar_min_null.3.query.sqlpp               |  18 +-
 .../scalar_sum/scalar_sum.1.ddl.sqlpp           |   2 +-
 .../scalar_sum/scalar_sum.2.update.sqlpp        |   2 +-
 .../scalar_sum/scalar_sum.3.query.sqlpp         |  14 +-
 .../scalar_sum_empty.1.ddl.sqlpp                |   2 +-
 .../scalar_sum_empty.2.update.sqlpp             |   2 +-
 .../scalar_sum_empty.3.query.sqlpp              |   4 +-
 .../scalar_sum_null/scalar_sum_null.1.ddl.sqlpp |   2 +-
 .../scalar_sum_null.2.update.sqlpp              |   2 +-
 .../scalar_sum_null.3.query.sqlpp               |  14 +-
 .../sum_double/sum_double.3.query.sqlpp         |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp |  10 +-
 .../sum_double_null.3.query.sqlpp               |   2 +-
 .../sum_empty_01/sum_empty_01.1.ddl.sqlpp       |   2 +-
 .../sum_empty_01/sum_empty_01.2.update.sqlpp    |   2 +-
 .../sum_empty_01/sum_empty_01.3.query.sqlpp     |   4 +-
 .../sum_empty_02/sum_empty_02.1.ddl.sqlpp       |   4 +-
 .../sum_empty_02/sum_empty_02.2.update.sqlpp    |   2 +-
 .../sum_empty_02/sum_empty_02.3.query.sqlpp     |   4 +-
 .../sum_float/sum_float.3.query.sqlpp           |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp   |  10 +-
 .../sum_float_null/sum_float_null.3.query.sqlpp |   2 +-
 .../sum_int16/sum_int16.3.query.sqlpp           |   4 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp   |  10 +-
 .../sum_int16_null/sum_int16_null.3.query.sqlpp |   2 +-
 .../sum_int32/sum_int32.3.query.sqlpp           |   4 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp   |  10 +-
 .../sum_int32_null/sum_int32_null.3.query.sqlpp |   2 +-
 .../sum_int64/sum_int64.3.query.sqlpp           |   4 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp   |  10 +-
 .../sum_int64_null/sum_int64_null.3.query.sqlpp |   2 +-
 .../sum_int8/sum_int8.3.query.sqlpp             |   4 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp     |  10 +-
 .../sum_int8_null/sum_int8_null.3.query.sqlpp   |   2 +-
 .../sum_mixed/sum_mixed.1.ddl.sqlpp             |   2 +-
 .../sum_mixed/sum_mixed.3.query.sqlpp           |   4 +-
 .../sum_null-with-pred.1.ddl.sqlpp              |   8 +-
 .../sum_null-with-pred.2.update.sqlpp           |   4 +-
 .../sum_null-with-pred.3.query.sqlpp            |   6 +-
 .../sum_numeric_null.1.ddl.sqlpp                |   6 +-
 .../sum_numeric_null.2.update.sqlpp             |   2 +-
 .../sum_numeric_null.3.query.sqlpp              |   4 +-
 .../aggregate/agg_null/agg_null.3.query.sqlpp   |   2 +-
 .../agg_null_rec/agg_null_rec.1.ddl.sqlpp       |   2 +-
 .../agg_null_rec/agg_null_rec.3.query.sqlpp     |  10 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ddl.sqlpp   |   2 +-
 .../agg_null_rec_1/agg_null_rec_1.3.query.sqlpp |  10 +-
 .../agg_number/agg_number.3.query.sqlpp         |   2 +-
 .../agg_number_rec/agg_number_rec.1.ddl.sqlpp   |   2 +-
 .../agg_number_rec/agg_number_rec.3.query.sqlpp |  10 +-
 .../avg_double/avg_double.3.query.sqlpp         |   2 +-
 .../avg_double_null/avg_double_null.1.ddl.sqlpp |  10 +-
 .../avg_double_null.3.query.sqlpp               |   2 +-
 .../avg_empty_01/avg_empty_01.3.query.sqlpp     |   2 +-
 .../avg_empty_02/avg_empty_02.1.ddl.sqlpp       |   2 +-
 .../avg_empty_02/avg_empty_02.3.query.sqlpp     |   2 +-
 .../aggregate/avg_float/avg_float.3.query.sqlpp |   2 +-
 .../avg_float_null/avg_float_nu.1.ddl.sqlpp     |  10 +-
 .../avg_float_null/avg_float_nu.3.query.sqlpp   |   2 +-
 .../aggregate/avg_int16/avg_int16.3.query.sqlpp |   4 +-
 .../avg_int16_null/avg_int16_null.1.ddl.sqlpp   |  10 +-
 .../avg_int16_null/avg_int16_null.3.query.sqlpp |   2 +-
 .../aggregate/avg_int32/avg_int32.3.query.sqlpp |   2 +-
 .../avg_int32_null/avg_int32_null.1.ddl.sqlpp   |  10 +-
 .../avg_int32_null/avg_int32_null.3.query.sqlpp |   2 +-
 .../aggregate/avg_int64/avg_int64.3.query.sqlpp |   4 +-
 .../avg_int64_null/avg_int64_null.1.ddl.sqlpp   |  10 +-
 .../avg_int64_null/avg_int64_null.3.query.sqlpp |   2 +-
 .../aggregate/avg_int8/avg_int8.3.query.sqlpp   |   4 +-
 .../avg_int8_null/avg_int8_null.1.ddl.sqlpp     |  10 +-
 .../avg_int8_null/avg_int8_null.3.query.sqlpp   |   2 +-
 .../aggregate/avg_mixed/avg_mixed.3.query.sqlpp |   2 +-
 .../aggregate/count_01/count_01.3.query.sqlpp   |   2 +-
 .../count_empty_01/count_empty_01.3.query.sqlpp |   2 +-
 .../count_empty_02/count_empty_02.1.ddl.sqlpp   |   2 +-
 .../count_empty_02/count_empty_02.3.query.sqlpp |   2 +-
 .../aggregate/count_null/count_null.1.ddl.sqlpp |  10 +-
 .../count_null/count_null.3.query.sqlpp         |   2 +-
 .../aggregate/droptype/droptype.1.ddl.sqlpp     |   4 +-
 .../global-avg_null/global-avg_null.1.ddl.sqlpp |  10 +-
 .../aggregate/issue395/issue395.1.ddl.sqlpp     |   2 +-
 .../aggregate/issue395/issue395.3.query.sqlpp   |   2 +-
 .../issue412_0/issue412_0.3.query.sqlpp         |   2 +-
 .../issue412_1/issue412_1.3.query.sqlpp         |   2 +-
 .../issue425_min_hetero_list.3.query.sqlpp      |   2 +-
 .../issue425_min_hetero_list_1.3.query.sqlpp    |   2 +-
 .../issue425_sum_hetero_list.3.query.sqlpp      |   2 +-
 .../issue425_sum_hetero_list_1.3.query.sqlpp    |   2 +-
 .../issue531_string_min_max.1.ddl.sqlpp         |   2 +-
 .../issue531_string_min_max.3.query.sqlpp       |   4 +-
 .../local-avg_double_null.1.ddl.sqlpp           |  10 +-
 .../local-avg_float_null.1.ddl.sqlpp            |  10 +-
 .../local-avg_int16/local-avg_int16.1.ddl.sqlpp |   2 +-
 .../local-avg_int16.3.query.sqlpp               |   2 +-
 .../local-avg_int16_null.1.ddl.sqlpp            |  10 +-
 .../local-avg_int32_null.1.ddl.sqlpp            |  10 +-
 .../local-avg_int64.3.query.sqlpp               |   2 +-
 .../local-avg_int64_null.1.ddl.sqlpp            |  10 +-
 .../local-avg_int8/local-avg_int8.3.query.sqlpp |   2 +-
 .../local-avg_int8_null.1.ddl.sqlpp             |  10 +-
 .../max_empty_01/max_empty_01.3.query.sqlpp     |   2 +-
 .../max_empty_02/max_empty_02.1.ddl.sqlpp       |   2 +-
 .../max_empty_02/max_empty_02.3.query.sqlpp     |   2 +-
 .../min_empty_01/min_empty_01.3.query.sqlpp     |   2 +-
 .../min_empty_02/min_empty_02.1.ddl.sqlpp       |   2 +-
 .../min_empty_02/min_empty_02.3.query.sqlpp     |   2 +-
 .../aggregate/min_mixed/min_mixed.3.query.sqlpp |   2 +-
 .../query-issue400/query-issue400.3.query.sqlpp |   2 +-
 .../scalar_avg/scalar_avg.3.query.sqlpp         |  12 +-
 .../scalar_avg_empty.3.query.sqlpp              |   2 +-
 .../scalar_avg_null.3.query.sqlpp               |  12 +-
 .../scalar_count/scalar_count.3.query.sqlpp     |  14 +-
 .../scalar_count_empty.3.query.sqlpp            |   2 +-
 .../scalar_count_null.3.query.sqlpp             |  14 +-
 .../scalar_max/scalar_max.3.query.sqlpp         |  16 +-
 .../scalar_max_empty.3.query.sqlpp              |   2 +-
 .../scalar_max_null.3.query.sqlpp               |  16 +-
 .../scalar_min/scalar_min.3.query.sqlpp         |  16 +-
 .../scalar_min_empty.3.query.sqlpp              |   2 +-
 .../scalar_min_null.3.query.sqlpp               |  16 +-
 .../scalar_sum/scalar_sum.3.query.sqlpp         |  12 +-
 .../scalar_sum_empty.3.query.sqlpp              |   2 +-
 .../scalar_sum_null.3.query.sqlpp               |  12 +-
 .../sum_double/sum_double.3.query.sqlpp         |   2 +-
 .../sum_double_null/sum_double_null.1.ddl.sqlpp |  10 +-
 .../sum_double_null.3.query.sqlpp               |   2 +-
 .../sum_empty_01/sum_empty_01.3.query.sqlpp     |   2 +-
 .../sum_empty_02/sum_empty_02.1.ddl.sqlpp       |   2 +-
 .../sum_empty_02/sum_empty_02.3.query.sqlpp     |   2 +-
 .../aggregate/sum_float/sum_float.3.query.sqlpp |   2 +-
 .../sum_float_null/sum_float_null.1.ddl.sqlpp   |  10 +-
 .../sum_float_null/sum_float_null.3.query.sqlpp |   2 +-
 .../aggregate/sum_int16/sum_int16.3.query.sqlpp |   4 +-
 .../sum_int16_null/sum_int16_null.1.ddl.sqlpp   |  10 +-
 .../sum_int16_null/sum_int16_null.3.query.sqlpp |   2 +-
 .../aggregate/sum_int32/sum_int32.3.query.sqlpp |   4 +-
 .../sum_int32_null/sum_int32_null.1.ddl.sqlpp   |  10 +-
 .../sum_int32_null/sum_int32_null.3.query.sqlpp |   2 +-
 .../aggregate/sum_int64/sum_int64.3.query.sqlpp |   4 +-
 .../sum_int64_null/sum_int64_null.1.ddl.sqlpp   |  10 +-
 .../sum_int64_null/sum_int64_null.3.query.sqlpp |   2 +-
 .../aggregate/sum_int8/sum_int8.3.query.sqlpp   |   4 +-
 .../sum_int8_null/sum_int8_null.1.ddl.sqlpp     |  10 +-
 .../sum_int8_null/sum_int8_null.3.query.sqlpp   |   2 +-
 .../aggregate/sum_mixed/sum_mixed.3.query.sqlpp |   2 +-
 .../sum_null-with-pred.1.ddl.sqlpp              |   6 +-
 .../sum_null-with-pred.2.update.sqlpp           |   2 +-
 .../sum_null-with-pred.3.query.sqlpp            |   4 +-
 .../sum_numeric_null.1.ddl.sqlpp                |   6 +-
 .../sum_numeric_null.2.update.sqlpp             |   2 +-
 .../sum_numeric_null.3.query.sqlpp              |   4 +-
 .../big_object_groupby.1.ddl.sqlpp              |  18 +-
 .../big_object_groupby.1.ddl.sqlpp              |  18 +-
 .../big_object_join/big_object_join.1.ddl.sqlpp |  18 +-
 .../big_object_load/big_object_load.1.ddl.sqlpp |  18 +-
 .../big_object_sort/big_object_sort.1.ddl.sqlpp |  18 +-
 .../binary/equal_join/equal_join.1.ddl.sqlpp    |   2 +-
 .../binary/index_join/index_join.1.ddl.sqlpp    |   2 +-
 .../binary/insert/insert.1.ddl.sqlpp            |   4 +-
 .../binary_null/binary_null.1.query.sqlpp       |   2 +-
 .../datetime_range/datetime_range.1.ddl.sqlpp   |   4 +-
 .../datetime_range_between.1.ddl.sqlpp          |   4 +-
 .../day_time_duration_order.1.ddl.sqlpp         |   2 +-
 .../day_time_duration_order.2.update.sqlpp      |   2 +-
 .../day_time_duration_order.3.query.sqlpp       |  10 +-
 .../comparison/double/double.3.query.sqlpp      |   2 +-
 .../comparison/float/float.3.query.sqlpp        |   2 +-
 .../comparison/int16/int16.3.query.sqlpp        |   2 +-
 .../int16_missing/int16_missing.1.query.sqlpp   |   2 +-
 .../int16_null/int16_null.1.query.sqlpp         |   2 +-
 .../comparison/int32/int32.3.query.sqlpp        |   2 +-
 .../int32_missing/int32_missing.1.query.sqlpp   |   2 +-
 .../int32_null/int32_null.1.query.sqlpp         |   2 +-
 .../comparison/int64/int64.3.query.sqlpp        |   2 +-
 .../int64_missing/int64_missing.1.query.sqlpp   |   3 +-
 .../int64_null/int64_null.1.query.sqlpp         |   3 +-
 .../comparison/int8/int8.3.query.sqlpp          |   2 +-
 .../int8_missing/int8_missing.1.query.sqlpp     |   2 +-
 .../int8_null/int8_null.1.query.sqlpp           |   2 +-
 .../issue363_equality.3.query.sqlpp             |   8 +-
 .../comparison/neq_02/neq_02.3.query.sqlpp      |  23 +
 .../year_month_duration_order.1.ddl.sqlpp       |   2 +-
 .../year_month_duration_order.2.update.sqlpp    |   2 +-
 .../year_month_duration_order.3.query.sqlpp     |  10 +-
 .../duration_02/duration_02.1.ddl.sqlpp         |   2 +-
 .../duration_02/duration_02.2.update.sqlpp      |   2 +-
 .../duration_02/duration_02.3.query.sqlpp       |   4 +-
 .../constructor/int_01/int_01.3.query.sqlpp     |   2 +-
 .../primitive-01/primitive-01.3.query.sqlpp     |   4 +-
 .../primitive-02/primitive-02.3.query.sqlpp     |   4 +-
 .../primitive-03/primitive-03.3.query.sqlpp     |   4 +-
 .../primitive-04/primitive-04.3.query.sqlpp     |   4 +-
 .../cross-dv01/cross-dv01.1.ddl.sqlpp           |   8 +-
 .../cross-dv02/cross-dv02.1.ddl.sqlpp           |   8 +-
 .../cross-dv03/cross-dv03.1.ddl.sqlpp           |   8 +-
 .../cross-dv03/cross-dv03.3.query.sqlpp         |   2 +-
 .../cross-dv04/cross-dv04.1.ddl.sqlpp           |   8 +-
 .../cross-dv07/cross-dv07.1.ddl.sqlpp           |   4 +-
 .../cross-dv17/cross-dv17.1.ddl.sqlpp           |   4 +-
 .../cross-dv18/cross-dv18.1.ddl.sqlpp           |   4 +-
 .../cross-dv19/cross-dv19.1.ddl.sqlpp           |   8 +-
 .../cross-dv20/cross-dv20.1.ddl.sqlpp           |   8 +-
 .../drop_dataset/drop_dataset.1.ddl.sqlpp       |  10 +-
 .../insert_across_dataverses.1.ddl.sqlpp        |  20 +-
 .../insert_from_source_dataset.1.ddl.sqlpp      |   2 +-
 .../join_across_dataverses.1.ddl.sqlpp          |  16 +-
 .../csv/basic-types/basic-types.1.ddl.sqlpp     |  10 +-
 .../csv/basic-types/basic-types.2.query.sqlpp   |   2 +-
 .../queries_sqlpp/custord/co/co.1.ddl.sqlpp     |  14 +-
 .../customer_q_01/customer_q_01.1.ddl.sqlpp     |  10 +-
 .../customer_q_02/customer_q_02.1.ddl.sqlpp     |  10 +-
 .../customer_q_03/customer_q_03.1.ddl.sqlpp     |  10 +-
 .../customer_q_03/customer_q_03.3.query.sqlpp   |   2 +-
 .../customer_q_04/customer_q_04.1.ddl.sqlpp     |  10 +-
 .../customer_q_04/customer_q_04.3.query.sqlpp   |   2 +-
 .../customer_q_05/customer_q_05.1.ddl.sqlpp     |  10 +-
 .../customer_q_05/customer_q_05.3.query.sqlpp   |   2 +-
 .../customer_q_06/customer_q_06.1.ddl.sqlpp     |  10 +-
 .../customer_q_07/customer_q_07.1.ddl.sqlpp     |  10 +-
 .../customer_q_08/customer_q_08.1.ddl.sqlpp     |  10 +-
 .../denorm-cust-order_01.1.ddl.sqlpp            |  14 +-
 .../denorm-cust-order_02.1.ddl.sqlpp            |  14 +-
 .../denorm-cust-order_03.1.ddl.sqlpp            |  14 +-
 .../custord/freq-clerk/freq-clerk.1.ddl.sqlpp   |  10 +-
 .../custord/join_q_01/join_q_01.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_02/join_q_02.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_03/join_q_03.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_04/join_q_04.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_05/join_q_05.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_06/join_q_06.1.ddl.sqlpp     |  10 +-
 .../custord/join_q_06/join_q_06.3.query.sqlpp   |   2 +-
 .../custord/join_q_07/join_q_07.1.ddl.sqlpp     |  10 +-
 .../custord/join_q_07/join_q_07.3.query.sqlpp   |   2 +-
 .../custord/join_q_08/join_q_08.1.ddl.sqlpp     |  16 +-
 .../custord/join_q_09/join_q_09.1.ddl.sqlpp     |  16 +-
 .../custord/load-test/load-test.1.ddl.sqlpp     |   8 +-
 .../custord/order_q_01/order_q_01.1.ddl.sqlpp   |   6 +-
 .../custord/order_q_02/order_q_02.1.ddl.sqlpp   |   6 +-
 .../custord/order_q_03/order_q_03.1.ddl.sqlpp   |   6 +-
 .../custord/order_q_04/order_q_04.1.ddl.sqlpp   |   6 +-
 .../custord/order_q_05/order_q_05.1.ddl.sqlpp   |   6 +-
 .../custord/order_q_06/order_q_06.1.ddl.sqlpp   |   6 +-
 .../queries_sqlpp/dapd/q1/q1.1.ddl.sqlpp        |   2 +-
 .../queries_sqlpp/dapd/q2-10/q2-10.1.ddl.sqlpp  |   4 +-
 .../queries_sqlpp/dapd/q2-11/q2-11.1.ddl.sqlpp  |   4 +-
 .../queries_sqlpp/dapd/q2-12/q2-12.1.ddl.sqlpp  |   4 +-
 .../q2-2-negative/q2-2-negative.1.ddl.sqlpp     |   4 +-
 .../queries_sqlpp/dapd/q2-2/q2-2.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-3/q2-3.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-4/q2-4.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-5/q2-5.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-6/q2-6.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-7/q2-7.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-8/q2-8.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2-9/q2-9.1.ddl.sqlpp    |   4 +-
 .../queries_sqlpp/dapd/q2/q2.1.ddl.sqlpp        |   4 +-
 .../queries_sqlpp/dapd/q3/q3.1.ddl.sqlpp        |   2 +-
 .../compact-dataset-and-its-indexes.1.ddl.sqlpp |  10 +-
 .../create-drop-cltype.1.ddl.sqlpp              |   4 +-
 .../create-drop-opntype.1.ddl.sqlpp             |   4 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |  10 +-
 .../delete-from-loaded-dataset.1.ddl.sqlpp      |  10 +-
 .../delete-multi-statement.1.ddl.sqlpp          |  40 +-
 .../dml/delete-syntax-change.sqlpp              |  10 +-
 .../delete-syntax-change.1.ddl.sqlpp            |  10 +-
 .../drop-empty-secondary-indexes.1.ddl.sqlpp    |   2 +-
 .../dml/drop-index/drop-index.1.ddl.sqlpp       |  26 +-
 .../empty-load-with-index.1.ddl.sqlpp           |   8 +-
 ...dataset-with-index-on-open-field.1.ddl.sqlpp |   8 +-
 ...sert-and-scan-dataset-with-index.1.ddl.sqlpp |   4 +-
 .../insert-and-scan-dataset.1.ddl.sqlpp         |   2 +-
 .../insert-and-scan-joined-datasets.1.ddl.sqlpp |   2 +-
 .../insert-duplicated-keys.1.ddl.sqlpp          |   2 +-
 ...rt-into-empty-dataset-with-index.1.ddl.sqlpp |   6 +-
 .../insert-into-empty-dataset.1.ddl.sqlpp       |   6 +-
 ...nto-loaded-dataset-with-index_01.1.ddl.sqlpp |   6 +-
 ...nto-loaded-dataset-with-index_02.1.ddl.sqlpp |  14 +-
 .../insert-into-loaded-dataset_01.1.ddl.sqlpp   |   6 +-
 .../insert-into-loaded-dataset_02.1.ddl.sqlpp   |  26 +-
 .../insert-record-function.1.ddl.sqlpp          |   6 +-
 .../queries_sqlpp/dml/insert-syntax.sqlpp       |   2 +-
 .../dml/insert-syntax/insert-syntax.1.ddl.sqlpp |   2 +-
 .../queries_sqlpp/dml/insert/insert.1.ddl.sqlpp |  14 +-
 .../insert_less_nc/insert_less_nc.1.ddl.sqlpp   |  14 +-
 .../load-from-hdfs/load-from-hdfs.1.ddl.sqlpp   |   8 +-
 .../load-with-index-open.1.ddl.sqlpp            |  16 +-
 .../load-with-index/load-with-index.1.ddl.sqlpp |   8 +-
 .../load-with-ngram-index-open.1.ddl.sqlpp      |   4 +-
 .../load-with-ngram-index.1.ddl.sqlpp           |   2 +-
 .../load-with-rtree-index-open.1.ddl.sqlpp      |   4 +-
 .../load-with-rtree-index.1.ddl.sqlpp           |   2 +-
 .../load-with-word-index-open.1.ddl.sqlpp       |   4 +-
 .../load-with-word-index.1.ddl.sqlpp            |   2 +-
 .../opentype-c2o-recursive.1.ddl.sqlpp          |   2 +-
 .../opentype-insert2.1.ddl.sqlpp                |   2 +-
 .../opentype-o2c-recursive.1.ddl.sqlpp          |   2 +-
 .../query-issue205/query-issue205.1.ddl.sqlpp   |   6 +-
 .../query-issue288/query-issue288.1.ddl.sqlpp   |   6 +-
 .../query-issue382/query-issue382.1.ddl.sqlpp   |   6 +-
 .../query-issue382/query-issue382.3.query.sqlpp |   2 +-
 .../query-issue433/query-issue433.1.ddl.sqlpp   |   4 +-
 ...e-btree-secondary-index-nullable.1.ddl.sqlpp |   8 +-
 ...elete-btree-secondary-index-open.1.ddl.sqlpp |  12 +-
 ...elete-btree-secondary-index-open.3.ddl.sqlpp |   2 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...index-ngram-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |   2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...-index-word-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |   2 +-
 ...e-rtree-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...elete-rtree-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |   2 +-
 ...t-btree-secondary-index-nullable.1.ddl.sqlpp |   8 +-
 ...nsert-btree-secondary-index-open.1.ddl.sqlpp |  12 +-
 ...nsert-btree-secondary-index-open.3.ddl.sqlpp |   2 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...index-ngram-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |   2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...-index-word-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |   2 +-
 ...t-rtree-secondary-index-nullable.1.ddl.sqlpp |   4 +-
 ...nsert-rtree-secondary-index-open.1.ddl.sqlpp |   4 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |   4 +-
 .../using-constant-merge-policy.1.ddl.sqlpp     |  10 +-
 ...g-correlated-prefix-merge-policy.1.ddl.sqlpp |  10 +-
 .../using-no-merge-policy.1.ddl.sqlpp           |  10 +-
 .../using-prefix-merge-policy.1.ddl.sqlpp       |  10 +-
 .../employee/q_01/q_01.1.ddl.sqlpp              |   6 +-
 .../employee/q_02/q_02.1.ddl.sqlpp              |   6 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  12 +-
 .../leftouterjoin-rtree.3.query.sqlpp           |   2 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  12 +-
 .../leftouterjoin/leftouterjoin.3.query.sqlpp   |   2 +-
 .../rc-format/rc-format.1.ddl.sqlpp             |   4 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |   2 +-
 .../sequence-format/sequence-format.1.ddl.sqlpp |   4 +-
 .../text-format/text-format.1.ddl.sqlpp         |   4 +-
 ...1_pricing_summary_report_failure.1.ddl.sqlpp |   8 +-
 ...pricing_summary_report_failure.3.query.sqlpp |  16 +-
 .../feeds/feeds_07/feeds_07.1.ddl.sqlpp         |   8 +-
 .../feeds/feeds_07/feeds_07.3.query.sqlpp       |   2 +-
 .../feeds/feeds_08/feeds_08.1.ddl.sqlpp         |   8 +-
 .../feeds/feeds_08/feeds_08.3.query.sqlpp       |   2 +-
 .../feeds/feeds_09/feeds_09.1.ddl.sqlpp         |   8 +-
 .../feeds/feeds_09/feeds_09.3.query.sqlpp       |   2 +-
 .../feeds/feeds_10/feeds_10.3.query.sqlpp       |   2 +-
 .../equality-predicate.1.ddl.sqlpp              |   6 +-
 .../insert-with-secondary-btree.1.ddl.sqlpp     |   6 +-
 ...rt-with-secondary-inverted-ngram.1.ddl.sqlpp |   6 +-
 ...ert-with-secondary-inverted-word.1.ddl.sqlpp |   6 +-
 .../insert-with-secondary-rtree.1.ddl.sqlpp     |   6 +-
 .../filters/insert/insert.1.ddl.sqlpp           |   6 +-
 .../load-with-secondary-btree.1.ddl.sqlpp       |   6 +-
 ...ad-with-secondary-inverted-ngram.1.ddl.sqlpp |   6 +-
 ...oad-with-secondary-inverted-word.1.ddl.sqlpp |   6 +-
 .../load-with-secondary-rtree.1.ddl.sqlpp       |   6 +-
 .../queries_sqlpp/filters/load/load.1.ddl.sqlpp |   6 +-
 .../equality-predicate.1.ddl.sqlpp              |   6 +-
 .../queries_sqlpp/flwor/at00/at00.1.ddl.sqlpp   |   8 +-
 .../queries_sqlpp/flwor/at01/at01.1.ddl.sqlpp   |   4 +-
 .../queries_sqlpp/flwor/at02/at02.1.ddl.sqlpp   |  10 +-
 .../queries_sqlpp/flwor/at03/at03.1.ddl.sqlpp   |   4 +-
 .../queries_sqlpp/flwor/at04/at04.1.ddl.sqlpp   |   6 +-
 .../queries_sqlpp/flwor/at05/at05.1.ddl.sqlpp   |   6 +-
 .../queries_sqlpp/flwor/at06/at06.1.ddl.sqlpp   |   8 +-
 .../flwor/grpby01/grpby01.3.query.sqlpp         |   2 +-
 .../flwor/grpby02/grpby02.3.query.sqlpp         |   2 +-
 .../flwor/let01/let01.3.query.sqlpp             |   2 +-
 .../flwor/let03/let03.3.query.sqlpp             |   2 +-
 .../flwor/let14/let14.3.query.sqlpp             |   2 +-
 .../flwor/let15/let15.3.query.sqlpp             |   2 +-
 .../flwor/let16/let16.3.query.sqlpp             |   2 +-
 .../queries_sqlpp/flwor/let33/let33.1.ddl.sqlpp |   2 +-
 .../query-ASTERIXDB-1576-2.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1576-3.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1576.1.ddl.sqlpp            |   2 +-
 .../query-ASTERIXDB-883.1.ddl.sqlpp             |   8 +-
 .../query-ASTERIXDB-883.3.query.sqlpp           |   6 +-
 .../fuzzyjoin/dblp-1_1/dblp-1_1.1.ddl.sqlpp     |   2 +-
 .../dblp-1_2.1.1/dblp-1_2.1.1.1.ddl.sqlpp       |   2 +-
 .../fuzzyjoin/dblp-1_2.1/dblp-1_2.1.1.ddl.sqlpp |   2 +-
 .../fuzzyjoin/dblp-1_2/dblp-1_2.1.ddl.sqlpp     |   2 +-
 .../dblp-2.1_5.3.1/dblp-2.1_5.3.1.1.ddl.sqlpp   |   2 +-
 .../fuzzyjoin/dblp-2.2/dblp-2.2.1.ddl.sqlpp     |   6 +-
 .../fuzzyjoin/dblp-2_1/dblp-2_1.1.ddl.sqlpp     |   2 +-
 .../fuzzyjoin/dblp-2_2/dblp-2_2.1.ddl.sqlpp     |   2 +-
 .../fuzzyjoin/dblp-2_3/dblp-2_3.1.ddl.sqlpp     |   2 +-
 .../fuzzyjoin/dblp-2_4/dblp-2_4.1.ddl.sqlpp     |   2 +-
 .../fuzzyjoin/dblp-2_5.1/dblp-2_5.1.1.ddl.sqlpp |   2 +-
 .../fuzzyjoin/dblp-2_5.2/dblp-2_5.2.1.ddl.sqlpp |   2 +-
 .../dblp-2_5.3.1/dblp-2_5.3.1.1.ddl.sqlpp       |   2 +-
 .../fuzzyjoin/dblp-2_5.3/dblp-2_5.3.1.ddl.sqlpp |   2 +-
 .../fuzzyjoin/dblp-2_5/dblp-2_5.1.ddl.sqlpp     |   2 +-
 .../fuzzyjoin/dblp-3_1.1/dblp-3_1.1.1.ddl.sqlpp |   2 +-
 .../fuzzyjoin/dblp-3_1.2/dblp-3_1.2.1.ddl.sqlpp |   2 +-
 .../fuzzyjoin/dblp-3_1/dblp-3_1.1.ddl.sqlpp     |   2 +-
 .../dblp-aqlplus_1/dblp-aqlplus_1.1.ddl.sqlpp   |   2 +-
 .../dblp-aqlplus_2/dblp-aqlplus_2.1.ddl.sqlpp   |   2 +-
 .../dblp-csx-2_1/dblp-csx-2_1.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-2_2/dblp-csx-2_2.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-2_3/dblp-csx-2_3.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-2_4/dblp-csx-2_4.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-2_5.1/dblp-csx-2_5.1.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-2_5.2/dblp-csx-2_5.2.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-2_5.3.1.1.ddl.sqlpp                |   4 +-
 .../dblp-csx-2_5.3/dblp-csx-2_5.3.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-2_5/dblp-csx-2_5.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-3_1/dblp-csx-3_1.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-3_2/dblp-csx-3_2.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-3_3/dblp-csx-3_3.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-3_4/dblp-csx-3_4.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-3_5.1/dblp-csx-3_5.1.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-3_5.2/dblp-csx-3_5.2.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-3_5.3.1.1.ddl.sqlpp                |   4 +-
 .../dblp-csx-3_5.3/dblp-csx-3_5.3.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-3_5.4.1.1.ddl.sqlpp                |   4 +-
 .../dblp-csx-3_5.4/dblp-csx-3_5.4.1.ddl.sqlpp   |   4 +-
 .../dblp-csx-3_5/dblp-csx-3_5.1.ddl.sqlpp       |   4 +-
 .../dblp-csx-aqlplus_1.1.ddl.sqlpp              |   4 +-
 .../dblp-csx-aqlplus_2.1.ddl.sqlpp              |   4 +-
 .../dblp-csx-aqlplus_3.1.ddl.sqlpp              |   4 +-
 .../dblp-csx-dblp-aqlplus_1.1.ddl.sqlpp         |   4 +-
 .../dblp-lookup_1/dblp-lookup_1.1.ddl.sqlpp     |   2 +-
 .../dblp-splits-3_1/dblp-splits-3_1.1.ddl.sqlpp |   2 +-
 .../events-users-aqlplus_1.1.ddl.sqlpp          |   2 +-
 .../user-int-aqlplus_1.1.ddl.sqlpp              |   4 +-
 .../user-int-aqlplus_2.1.ddl.sqlpp              |   4 +-
 .../user-int-aqlplus_3.1.ddl.sqlpp              |   4 +-
 .../user-lot-aqlplus_1.1.1.ddl.sqlpp            |   4 +-
 .../user-lot-aqlplus_1.1.ddl.sqlpp              |   4 +-
 .../user-lot-aqlplus_2.1.ddl.sqlpp              |   4 +-
 .../user-lot-aqlplus_3.1.ddl.sqlpp              |   4 +-
 .../user-vis-int-3_1.1.ddl.sqlpp                |   8 +-
 .../user-vis-int-aqlplus_1.1.ddl.sqlpp          |   8 +-
 .../user-vis-int-aqlplus_2.1.ddl.sqlpp          |   8 +-
 .../user-vis-int-aqlplus_3.1.ddl.sqlpp          |   8 +-
 ...r-vis-int-vis-user-lot-aqlplus_1.1.ddl.sqlpp |   8 +-
 .../user-vis-lot-3_1.1.ddl.sqlpp                |   8 +-
 .../user-vis-lot-aqlplus_1.1.ddl.sqlpp          |   8 +-
 .../user-vis-lot-aqlplus_2.1.ddl.sqlpp          |   8 +-
 .../user-vis-lot-aqlplus_3.1.ddl.sqlpp          |   8 +-
 .../user-vis-lot-aqlplus_4.1.ddl.sqlpp          |   8 +-
 .../user-vis-lot-aqlplus_5.1.ddl.sqlpp          |   8 +-
 .../user-vis-lot-int-aqlplus_1.1.ddl.sqlpp      |   8 +-
 .../user-vis-lot-int-aqlplus_2.1.ddl.sqlpp      |   8 +-
 .../global-aggregate/q01/q01.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q02/q02.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q03/q03.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q04/q04.1.ddl.sqlpp        |   6 +-
 .../q05_error/q05_error.1.ddl.sqlpp             |   6 +-
 .../q06_error/q06_error.1.ddl.sqlpp             |   6 +-
 .../q06_error/q06_error.3.query.sqlpp           |   2 +-
 .../q07_error/q07_error.1.ddl.sqlpp             |   6 +-
 .../global-aggregate/q08/q08.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q08/q08.3.query.sqlpp      |   2 +-
 .../global-aggregate/q09/q09.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q10/q10.1.ddl.sqlpp        |   6 +-
 .../global-aggregate/q10/q10.3.query.sqlpp      |   7 +-
 .../global-aggregate/q11/q11.1.ddl.sqlpp        |   2 +-
 .../q12_error/q12_error.1.ddl.sqlpp             |   2 +-
 .../query-ASTERIXDB-159.1.ddl.sqlpp             |   2 +-
 .../query-ASTERIXDB-159.3.query.sqlpp           |   2 +-
 .../query-ASTERIXDB-1626-2.1.ddl.sqlpp          |  31 +
 .../query-ASTERIXDB-1626-2.2.update.sqlpp       |  23 +
 .../query-ASTERIXDB-1626-2.3.query.sqlpp        |  24 +
 .../query-ASTERIXDB-1626-2.4.ddl.sqlpp          |  20 +
 .../query-ASTERIXDB-1626.1.ddl.sqlpp            |  31 +
 .../query-ASTERIXDB-1626.2.update.sqlpp         |  23 +
 .../query-ASTERIXDB-1626.3.query.sqlpp          |  23 +
 .../query-ASTERIXDB-1626.4.ddl.sqlpp            |  20 +
 .../graph/pregel-q01/pregel-q01.1.ddl.sqlpp     |  16 +-
 .../graph/pregel-q02/pregel-q02.1.ddl.sqlpp     |   6 +-
 .../graph/pregel-q03/pregel-q03.1.ddl.sqlpp     |   4 +-
 .../group-by/core-01/core-01.3.query.sqlpp      |   2 +-
 .../group-by/core-02/core-02.3.query.sqlpp      |   2 +-
 .../group-by/core-03/core-02.3.query.sqlpp      |   2 +-
 .../group-by/core-05/core-05.3.query.sqlpp      |   2 +-
 .../group-by/having-2/having-2.3.query.sqlpp    |   2 +-
 .../sugar-01-negative.3.query.sqlpp             |   4 +-
 .../hdfs/hdfs_02/hdfs_02.3.query.sqlpp          |   2 +-
 .../hdfs/hdfs_03/hdfs_03.3.query.sqlpp          |   2 +-
 .../hdfs_shortcircuit.3.query.sqlpp             |   2 +-
 .../issue_251_dataset_hint_5.1.ddl.sqlpp        |   2 +-
 .../issue_251_dataset_hint_6.3.query.sqlpp      |   2 +-
 .../btree-index-nested-loop-join.1.ddl.sqlpp    |  14 +-
 .../btree-primary-equi-join.1.ddl.sqlpp         |  16 +-
 .../btree-secondary-equi-join_01.1.ddl.sqlpp    |   4 +-
 .../btree-secondary-equi-join_02.1.ddl.sqlpp    |   4 +-
 .../btree-secondary-equi-join_03.1.ddl.sqlpp    |   4 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |   2 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-btree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-btree-sidx2.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-invidx-sidx1.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-invidx-sidx2.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-rtree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-rtree-sidx2.3.query.sqlpp |   2 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |   4 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |   4 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |   6 +-
 .../cust-index-age-nullable.1.ddl.sqlpp         |   8 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |   2 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |   2 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |   2 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |   2 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |   2 +-
 ...-index-olist-edit-distance-panic.1.ddl.sqlpp |   8 +-
 ...verted-index-olist-edit-distance.1.ddl.sqlpp |   8 +-
 .../inverted-index-olist-jaccard.1.ddl.sqlpp    |   8 +-
 .../inverted-index-ulist-jaccard.1.ddl.sqlpp    |   8 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |   2 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |   2 +-
 ...s-index-custkey-conjunctive-open.1.ddl.sqlpp |   6 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |   6 +-
 .../orders-index-custkey-open.1.ddl.sqlpp       |   6 +-
 .../orders-index-custkey.1.ddl.sqlpp            |   6 +-
 .../range-search-open.1.ddl.sqlpp               |   8 +-
 .../range-search/range-search.1.ddl.sqlpp       |   8 +-
 ...e-secondary-index-circular-query.1.ddl.sqlpp |   2 +-
 .../rtree-secondary-index-nullable.1.ddl.sqlpp  |   2 +-
 .../rtree-secondary-index-open.1.ddl.sqlpp      |   2 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |   2 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |   8 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |   8 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |   4 +-
 .../olist-edit-distance-inline.1.ddl.sqlpp      |   8 +-
 .../olist-edit-distance.1.ddl.sqlpp             |   8 +-
 .../olist-jaccard-inline.1.ddl.sqlpp            |   8 +-
 .../olist-jaccard/olist-jaccard.1.ddl.sqlpp     |   8 +-
 .../ulist-jaccard-inline.1.ddl.sqlpp            |   8 +-
 .../ulist-jaccard/ulist-jaccard.1.ddl.sqlpp     |   8 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |   4 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |   4 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |   8 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |   8 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |   4 +-
 .../olist-edit-distance-inline.1.ddl.sqlpp      |   8 +-
 .../olist-edit-distance.1.ddl.sqlpp             |   8 +-
 .../olist-jaccard-inline.1.ddl.sqlpp            |   8 +-
 .../olist-jaccard/olist-jaccard.1.ddl.sqlpp     |   8 +-
 .../ulist-jaccard-inline.1.ddl.sqlpp            |   8 +-
 .../ulist-jaccard/ulist-jaccard.1.ddl.sqlpp     |   8 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |   4 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |   4 +-
 .../loj-01-core/loj-01.1.ddl.sqlpp              |   4 +-
 .../loj-01-sugar/loj-01.1.ddl.sqlpp             |   4 +-
 .../query_issue285-2.1.ddl.sqlpp                |   4 +-
 .../query_issue285/query_issue285.1.ddl.sqlpp   |   4 +-
 .../query_issue658/query_issue658.1.ddl.sqlpp   |   4 +-
 .../query_issue849-2.1.ddl.sqlpp                |   2 +-
 .../query_issue849/query_issue849.1.ddl.sqlpp   |   2 +-
 .../list/listify_03/listify_03.3.query.sqlpp    |   4 +-
 .../query-ASTERIXDB-159-2.1.ddl.sqlpp           |   2 +-
 .../query-ASTERIXDB-159-2.3.query.sqlpp         |   2 +-
 .../query-ASTERIXDB-159-3.1.ddl.sqlpp           |   2 +-
 .../query-ASTERIXDB-159-3.3.query.sqlpp         |   2 +-
 .../load/csv_01/csv_01.1.ddl.sqlpp              |   2 +-
 .../load/csv_02/csv_02.1.ddl.sqlpp              |   2 +-
 .../load/csv_03/csv_03.1.ddl.sqlpp              |   2 +-
 .../load/csv_04/csv_04.1.ddl.sqlpp              |   2 +-
 .../load/csv_05/csv_05.1.ddl.sqlpp              |   2 +-
 .../load/csv_06/csv_06.1.ddl.sqlpp              |   2 +-
 .../load/csv_07/csv_07.1.ddl.sqlpp              |   2 +-
 .../load/csv_08_header_cr/csv_08.1.ddl.sqlpp    |   2 +-
 .../load/csv_08_header_crlf/csv_08.1.ddl.sqlpp  |   2 +-
 .../load/csv_08_header_lf/csv_08.1.ddl.sqlpp    |   2 +-
 .../duplicate-key-error.1.ddl.sqlpp             |   2 +-
 .../issue14_query/issue14_query.1.ddl.sqlpp     |   4 +-
 .../issue289_query/issue289_query.1.ddl.sqlpp   |   8 +-
 .../issue289_query/issue289_query.3.query.sqlpp |   2 +-
 .../issue315_query/issue315_query.1.ddl.sqlpp   |   4 +-
 ...ssue610_adm_token_end_collection.1.ddl.sqlpp |   4 +-
 .../issue650_query/issue650_query.1.ddl.sqlpp   |   4 +-
 .../type_promotion_0.1.ddl.sqlpp                |  26 +-
 .../assign-reuse/assign-reuse.1.ddl.sqlpp       |   4 +-
 .../assign-reuse/assign-reuse.3.query.sqlpp     |   4 +-
 .../misc/flushtest/flushtest.1.ddl.sqlpp        |   6 +-
 .../misc/flushtest/flushtest.5.ddl.sqlpp        |  20 +
 .../groupby-orderby-count.1.ddl.sqlpp           |   4 +-
 .../groupby-orderby-count.3.query.sqlpp         |   4 +-
 .../nested-loop-join_01.1.ddl.sqlpp             |   8 +-
 .../prefix-search/prefix-search.1.ddl.sqlpp     |   8 +-
 .../query-ASTERIXDB-1577.1.ddl.sqlpp            |   2 +-
 .../query-ASTERIXDB-971.1.ddl.sqlpp             |   2 +-
 .../misc/stable_sort/stable_sort.1.ddl.sqlpp    |   8 +-
 .../misc/string_eq_01/string_eq_01.1.ddl.sqlpp  |   4 +-
 .../compact-dataset-and-its-indexes.1.ddl.sqlpp |  10 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |   6 +-
 .../nested-index-dml/delete-syntax-change.sqlpp |  10 +-
 .../drop-index/drop-index.1.ddl.sqlpp           |  26 +-
 ...rt-into-empty-dataset-with-index.1.ddl.sqlpp |   6 +-
 ...nto-loaded-dataset-with-index_01.1.ddl.sqlpp |   6 +-
 ...nto-loaded-dataset-with-index_02.1.ddl.sqlpp |   6 +-
 .../nested-index-dml/insert-syntax.sqlpp        |   2 +-
 .../load-with-index/load-with-index.1.ddl.sqlpp |   8 +-
 .../load-with-ngram-index.1.ddl.sqlpp           |   8 +-
 .../load-with-rtree-index.1.ddl.sqlpp           |   8 +-
 .../load-with-word-index.1.ddl.sqlpp            |   8 +-
 .../nested-uuid-load.1.ddl.sqlpp                |   8 +-
 ...e-btree-secondary-index-nullable.1.ddl.sqlpp |   8 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |   2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |   2 +-
 ...e-rtree-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |   2 +-
 ...t-btree-secondary-index-nullable.1.ddl.sqlpp |   8 +-
 ...x-ngram-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...rted-index-ngram-secondary-index.1.ddl.sqlpp |   2 +-
 ...ex-word-secondary-index-nullable.1.ddl.sqlpp |   2 +-
 ...erted-index-word-secondary-index.1.ddl.sqlpp |   2 +-
 ...t-rtree-secondary-index-nullable.1.ddl.sqlpp |   4 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |   4 +-
 .../adm-format/adm-format.1.ddl.sqlpp           |   2 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  12 +-
 .../leftouterjoin-rtree.3.query.sqlpp           |   2 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  12 +-
 .../leftouterjoin/leftouterjoin.3.query.sqlpp   |   2 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |   2 +-
 .../btree-primary-equi-join.1.ddl.sqlpp         |  16 +-
 .../btree-secondary-equi-join.1.ddl.sqlpp       |   4 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |   8 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |   8 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |   4 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |   2 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |   4 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |   4 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-btree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-btree-sidx2.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-invidx-sidx1.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-invidx-sidx2.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-rtree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  12 +-
 ...obe-pidx-with-join-rtree-sidx2.3.query.sqlpp |   2 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |   8 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |   8 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  12 +-
 .../cust-index-age-nullable.1.ddl.sqlpp         |   8 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |   2 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |   2 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |   2 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |   2 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |   2 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |   2 +-
 ...-index-olist-edit-distance-panic.1.ddl.sqlpp |   8 +-
 ...verted-index-olist-edit-distance.1.ddl.sqlpp |   8 +-
 .../inverted-index-olist-jaccard.1.ddl.sqlpp    |   8 +-
 .../inverted-index-ulist-jaccard.1.ddl.sqlpp    |   8 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |   2 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |   2 +-
 ...s-index-custkey-conjunctive-open.1.ddl.sqlpp |   6 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |   6 +-
 .../orders-index-custkey-open.1.ddl.sqlpp       |   6 +-
 .../orders-index-custkey.1.ddl.sqlpp            |   6 +-
 .../range-search-open.1.ddl.sqlpp               |   8 +-
 .../range-search/range-search.1.ddl.sqlpp       |   8 +-
 .../rtree-secondary-index-nullable.1.ddl.sqlpp  |   2 +-
 .../rtree-secondary-index-open.1.ddl.sqlpp      |   2 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |   2 +-
 .../adm-format/adm-format.1.ddl.sqlpp           |   2 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  12 +-
 .../leftouterjoin-rtree.3.query.sqlpp           |   2 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  12 +-
 .../leftouterjoin/leftouterjoin.3.query.sqlpp   |   2 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |   2 +-
 .../bottom-closed-top-closed.1.ddl.sqlpp        |  18 +-
 .../bottom-closed-top-open.1.ddl.sqlpp          |  18 +-
 .../bottom-open-top-closed.1.ddl.sqlpp          |  18 +-
 .../bottom-open-top-open.1.ddl.sqlpp            |  18 +-
 .../btree-secondary-equi-join.1.ddl.sqlpp       |   6 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  14 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  14 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |   6 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |   6 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |   4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |   6 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |   6 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-btree-sidx1.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-btree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-btree-sidx2.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-btree-sidx2.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  12 +-
 ...e-pidx-with-join-invidx-sidx2.2.update.sqlpp |   4 +-
 ...be-pidx-with-join-invidx-sidx2.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-rtree-sidx1.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-rtree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-rtree-sidx2.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-rtree-sidx2.3.query.sqlpp |   2 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |   8 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |   8 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  10 +-
 .../btree-index-rewrite-multiple.3.ddl.sqlpp    |   2 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |   4 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |   4 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |   4 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |   4 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |   4 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |   4 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |   4 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |   4 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  10 +-
 ...orders-index-custkey-conjunctive.3.ddl.sqlpp |   2 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  10 +-
 .../orders-index-custkey.3.ddl.sqlpp            |   2 +-
 .../range-search/range-search.1.ddl.sqlpp       |  14 +-
 .../range-search/range-search.3.ddl.sqlpp       |   2 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |   2 +-
 .../group-by-from-dataset.1.ddl.sqlpp           |   2 +-
 .../order-by-from-dataset.1.ddl.sqlpp           |   2 +-
 .../numeric/abs0/abs0.3.query.sqlpp             |   2 +-
 .../numeric/abs1/abs1.3.query.sqlpp             |   2 +-
 .../numeric/abs4/abs4.3.query.sqlpp             |   2 +-
 .../numeric/acos/acos.1.query.sqlpp             |   6 +-
 .../numeric/add_double/add_double.1.query.sqlpp |   2 +-
 .../numeric/add_float/add_float.1.query.sqlpp   |   2 +-
 .../numeric/add_int16/add_int16.1.query.sqlpp   |   2 +-
 .../numeric/add_int32/add_int32.1.query.sqlpp   |   2 +-
 .../numeric/add_int64/add_int64.1.query.sqlpp   |   2 +-
 .../numeric/add_int8/add_int8.3.query.sqlpp     |   2 +-
 .../numeric/asin/asin.1.query.sqlpp             |   6 +-
 .../numeric/atan/atan.1.query.sqlpp             |   6 +-
 .../numeric/atan2/atan2.1.query.sqlpp           |  10 +-
 .../numeric/ceiling0/ceiling0.3.query.sqlpp     |   2 +-
 .../numeric/ceiling1/ceiling1.3.query.sqlpp     |   2 +-
 .../numeric/ceiling4/ceiling4.3.query.sqlpp     |   2 +-
 .../queries_sqlpp/numeric/cos/cos.1.query.sqlpp |   6 +-
 .../divide_double/divide_double.1.query.sqlpp   |   2 +-
 .../divide_float/divide_float.1.query.sqlpp     |   2 +-
 .../divide_int16/divide_int16.1.query.sqlpp     |   2 +-
 .../divide_int32/divide_int32.1.query.sqlpp     |   2 +-
 .../divide_int64/divide_int64.1.query.sqlpp     |   2 +-
 .../divide_int8/divide_int8.1.query.sqlpp       |   2 +-
 .../queries_sqlpp/numeric/exp/exp.1.query.sqlpp |   6 +-
 .../numeric/floor0/floor0.3.query.sqlpp         |   2 +-
 .../numeric/floor1/floor1.3.query.sqlpp         |   2 +-
 .../numeric/floor4/floor4.3.query.sqlpp         |   2 +-
 .../queries_sqlpp/numeric/ln/ln.1.query.sqlpp   |   6 +-
 .../queries_sqlpp/numeric/log/log.1.query.sqlpp |   6 +-
 .../multiply_double.1.query.sqlpp               |   2 +-
 .../multiply_float/multiply_float.1.query.sqlpp |   2 +-
 .../multiply_int16/multiply_int16.1.query.sqlpp |   2 +-
 .../multiply_int32/multiply_int32.1.query.sqlpp |   2 +-
 .../multiply_int64/multiply_int64.1.query.sqlpp |   2 +-
 .../multiply_int8/multiply_int8.1.query.sqlpp   |   2 +-
 .../numeric/non-finite/non-finite.1.query.sqlpp |   5 +
 .../numeric/power/power.1.query.sqlpp           |  10 +-
 .../round-half-to-even0.3.query.sqlpp           |   2 +-
 .../round-half-to-even1.3.query.sqlpp           |   2 +-
 .../round-half-to-even20.3.query.sqlpp          |   2 +-
 .../round-half-to-even21.3.query.sqlpp          |   2 +-
 .../round-half-to-even5.3.query.sqlpp           |   2 +-
 .../numeric/round0/round0.3.query.sqlpp         |   2 +-
 .../numeric/round1/round1.3.query.sqlpp         |   2 +-
 .../numeric/round4/round4.3.query.sqlpp         |   2 +-
 .../numeric/sign/sign.1.query.sqlpp             |   6 +-
 .../queries_sqlpp/numeric/sin/sin.1.query.sqlpp |   6 +-
 .../numeric/sqrt/sqrt.1.query.sqlpp             |   6 +-
 .../subtract_double.1.query.sqlpp               |   2 +-
 .../subtract_float/subtract_float.1.query.sqlpp |   2 +-
 .../subtract_int16/subtract_int16.1.query.sqlpp |   2 +-
 .../subtract_int32/subtract_int32.1.query.sqlpp |   2 +-
 .../subtract_int64/subtract_int64.1.query.sqlpp |   2 +-
 .../subtract_int8/subtract_int8.1.query.sqlpp   |   2 +-
 .../queries_sqlpp/numeric/tan/tan.1.query.sqlpp |   6 +-
 .../numeric/trunc/trunc.1.query.sqlpp           |  16 +-
 .../unary-minus_int_02.3.query.sqlpp            |   2 +-
 .../c2c-w-optional/c2c-w-option.1.ddl.sqlpp     |   2 +-
 .../c2c-wo-optional/c2c-wo-optional.1.ddl.sqlpp |   2 +-
 .../open-closed/c2c/c2c.1.ddl.sqlpp             |   2 +-
 .../heterog-list-ordered01.1.ddl.sqlpp          |   4 +-
 .../heterog-list01/heterog-list01.1.ddl.sqlpp   |   4 +-
 .../heterog-list02/heterog-list02.1.ddl.sqlpp   |   4 +-
 .../heterog-list03/heterog-list03.1.ddl.sqlpp   |   4 +-
 .../open-closed-01/open-closed-01.1.ddl.sqlpp   |   2 +-
 .../open-closed-15/open-closed-15.1.ddl.sqlpp   |   8 +-
 .../open-closed-16/open-closed-16.1.ddl.sqlpp   |   8 +-
 .../open-closed-17/open-closed-17.1.ddl.sqlpp   |   8 +-
 .../open-closed-20/open-closed-20.1.ddl.sqlpp   |   6 +-
 .../open-closed-21/open-closed-21.1.ddl.sqlpp   |   6 +-
 .../open-closed-22/open-closed-22.1.ddl.sqlpp   |   4 +-
 .../open-closed-24/open-closed-24.1.ddl.sqlpp   |   2 +-
 .../open-closed-25/open-closed-25.1.ddl.sqlpp   |   2 +-
 .../open-closed-26/open-closed-26.1.ddl.sqlpp   |   2 +-
 .../open-closed-32/open-closed-32.1.ddl.sqlpp   |   2 +-
 .../open-closed-33/open-closed-33.1.ddl.sqlpp   |   2 +-
 .../query-issue196/query-issue196.1.ddl.sqlpp   |   4 +-
 .../query-issue208/query-issue208.1.ddl.sqlpp   |   6 +-
 .../query-issue236/query-issue236.1.ddl.sqlpp   |   6 +-
 .../query-issue258/query-issue258.1.ddl.sqlpp   |   2 +-
 .../query-issue258.2.update.sqlpp               |   2 +-
 .../query-issue343-2.1.ddl.sqlpp                |   6 +-
 .../query-issue343/query-issue343.1.ddl.sqlpp   |   4 +-
 .../query-issue377/query-issue377.1.ddl.sqlpp   |   4 +-
 .../query-issue410/query-issue410.1.ddl.sqlpp   |   2 +-
 .../query-issue423-2.1.ddl.sqlpp                |   2 +-
 .../query-issue423/query-issue423.1.ddl.sqlpp   |   2 +-
 .../query-issue453-2.1.ddl.sqlpp                |   6 +-
 .../query-issue453/query-issue453.1.ddl.sqlpp   |   6 +-
 .../query-issue456/query-issue456.1.ddl.sqlpp   |   6 +-
 .../query-issue487/query-issue487.1.ddl.sqlpp   |   2 +-
 .../query-issue592/query-issue592.1.ddl.sqlpp   |   4 +-
 .../query-issue625/query-issue625.1.ddl.sqlpp   |   4 +-
 .../query-issue625.2.update.sqlpp               |   2 +-
 .../query-proposal/query-proposal.1.ddl.sqlpp   |   6 +-
 .../query-proposal02.1.ddl.sqlpp                |   6 +-
 .../enforced-field-name-collision.1.ddl.sqlpp   |   2 +-
 .../enforced-field-name-collision.1.ddl.sqlpp   |   4 +-
 .../index-on-closed-type.1.ddl.sqlpp            |   2 +-
 .../missing-enforce-statement.1.ddl.sqlpp       |   2 +-
 .../missing-optionality.1.ddl.sqlpp             |   2 +-
 .../adm-format/adm-format.1.ddl.sqlpp           |   2 +-
 .../leftouterjoin-rtree.1.ddl.sqlpp             |  12 +-
 .../leftouterjoin-rtree.3.query.sqlpp           |   2 +-
 .../leftouterjoin/leftouterjoin.1.ddl.sqlpp     |  12 +-
 .../leftouterjoin/leftouterjoin.3.query.sqlpp   |   2 +-
 .../rtree-index/rtree-index.1.ddl.sqlpp         |   2 +-
 .../btree-secondary-equi-join.1.ddl.sqlpp       |   6 +-
 .../ngram-edit-distance-inline.1.ddl.sqlpp      |  14 +-
 .../ngram-edit-distance.1.ddl.sqlpp             |  14 +-
 .../ngram-jaccard-inline.1.ddl.sqlpp            |   6 +-
 .../ngram-jaccard/ngram-jaccard.1.ddl.sqlpp     |   6 +-
 .../rtree-spatial-intersect-point.1.ddl.sqlpp   |   4 +-
 .../word-jaccard-inline.1.ddl.sqlpp             |   6 +-
 .../word-jaccard/word-jaccard.1.ddl.sqlpp       |   6 +-
 ...probe-pidx-with-join-btree-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-btree-sidx1.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-btree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-btree-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-btree-sidx2.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-btree-sidx2.3.query.sqlpp |   2 +-
 ...robe-pidx-with-join-invidx-sidx2.1.ddl.sqlpp |  12 +-
 ...e-pidx-with-join-invidx-sidx2.2.update.sqlpp |   4 +-
 ...be-pidx-with-join-invidx-sidx2.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx1.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-rtree-sidx1.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-rtree-sidx1.3.query.sqlpp |   2 +-
 ...probe-pidx-with-join-rtree-sidx2.1.ddl.sqlpp |  12 +-
 ...be-pidx-with-join-rtree-sidx2.2.update.sqlpp |   4 +-
 ...obe-pidx-with-join-rtree-sidx2.3.query.sqlpp |   2 +-
 ...ex-composite-key-mixed-intervals.1.ddl.sqlpp |   8 +-
 .../btree-index-composite-key.1.ddl.sqlpp       |   8 +-
 .../btree-index-rewrite-multiple.1.ddl.sqlpp    |  10 +-
 .../btree-index-rewrite-multiple.3.ddl.sqlpp    |   2 +-
 .../inverted-index-ngram-contains.1.ddl.sqlpp   |   4 +-
 ...dex-ngram-edit-distance-contains.1.ddl.sqlpp |   4 +-
 ...-index-ngram-edit-distance-panic.1.ddl.sqlpp |   4 +-
 ...-ngram-edit-distance-word-tokens.1.ddl.sqlpp |   4 +-
 ...verted-index-ngram-edit-distance.1.ddl.sqlpp |   4 +-
 .../inverted-index-ngram-jaccard.1.ddl.sqlpp    |   4 +-
 .../inverted-index-word-contains.1.ddl.sqlpp    |   4 +-
 .../inverted-index-word-jaccard.1.ddl.sqlpp     |   4 +-
 ...orders-index-custkey-conjunctive.1.ddl.sqlpp |  10 +-
 ...orders-index-custkey-conjunctive.3.ddl.sqlpp |   2 +-
 .../orders-index-custkey.1.ddl.sqlpp            |  10 +-
 .../orders-index-custkey.3.ddl.sqlpp            |   2 +-
 .../range-search/range-search.1.ddl.sqlpp       |  14 +-
 .../range-search/range-search.3.ddl.sqlpp       |   2 +-
 .../rtree-secondary-index.1.ddl.sqlpp           |   4 +-
 .../anysat_01/anysat_01.1.query.sqlpp           |  23 +
 .../everysat_03/everysat_03.3.query.sqlpp       |   4 +-
 .../query-ASTERIXDB-1005.1.ddl.sqlpp            |   2 +-
 .../somesat_02/somesat_02.1.ddl.sqlpp           |  12 +-
 .../somesat_03/somesat_03.3.query.sqlpp         |   2 +-
 .../somesat_04/somesat_04.3.query.sqlpp         |   2 +-
 .../somesat_05/somesat_05.3.query.sqlpp         |   2 +-
 .../order-by-exception_01.1.ddl.sqlpp           |   6 +-
 .../order-by-exception_02.1.ddl.sqlpp           |   6 +-
 .../order-by-exception_02.4.query.sqlpp         |   3 +-
 .../range-hints/order-by/order-by.1.ddl.sqlpp   |   6 +-
 .../access-nested-fields.1.ddl.sqlpp            |  18 +-
 .../field-access-by-index_01.3.query.sqlpp      |   2 +-
 .../field-access-on-open-field.1.ddl.sqlpp      |   2 +-
 .../highly-nested-open.1.ddl.sqlpp              |  18 +-
 .../highly-nested-mixed.1.ddl.sqlpp             |  18 +-
 .../highly-nested-open.1.ddl.sqlpp              |  18 +-
 .../tiny-social-example.1.ddl.sqlpp             |  16 +-
 ...-social-example-no-complex-types.1.ddl.sqlpp |  26 +-
 .../tiny-social-example-only-lists.1.ddl.sqlpp  |  28 +-
 ...tiny-social-example-only-records.1.ddl.sqlpp |  26 +-
 .../tiny-social-example.1.ddl.sqlpp             |  14 +-
 ...osed-fieldname-conflict_issue173.1.ddl.sqlpp |   2 +-
 .../queries_sqlpp/scan/10/10.1.ddl.sqlpp        |   2 +-
 .../queries_sqlpp/scan/20/20.1.ddl.sqlpp        |   2 +-
 .../queries_sqlpp/scan/30/30.1.ddl.sqlpp        |   2 +-
 .../scan/alltypes_01/alltypes_01.1.ddl.sqlpp    |  12 +-
 .../queries_sqlpp/scan/alltypes_02.sqlpp        |   4 +-
 .../scan/alltypes_02/alltypes_02.1.ddl.sqlpp    |  12 +-
 .../scan/invalid-scan-syntax.sqlpp              |   4 +-
 .../invalid-scan-syntax.1.ddl.sqlpp             |   4 +-
 .../issue238_query_1.1.ddl.sqlpp                |   2 +-
 .../issue238_query_2.1.ddl.sqlpp                |   2 +-
 .../numeric_types_01.1.ddl.sqlpp                |  10 +-
 .../spatial_types_01.1.ddl.sqlpp                |   2 +-
 .../spatial_types_02.1.ddl.sqlpp                |   2 +-
 .../temp_types_01/temp_types_01.1.ddl.sqlpp     |   2 +-
 .../temp_types_02/temp_types_02.1.ddl.sqlpp     |   2 +-
 .../select-star/from/from.1.ddl.sqlpp           |  20 +-
 .../select-star/group_by/group_by.1.ddl.sqlpp   |   2 +-
 .../select-star/join/join.1.ddl.sqlpp           |  20 +-
 .../select-star/mixed/mixed.1.ddl.sqlpp         |  20 +-
 .../select-star/no_star/no_star.1.ddl.sqlpp     |  20 +-
 .../count-nullable/count-nullable.1.ddl.sqlpp   |   8 +-
 .../count-nullable/count-nullable.3.query.sqlpp |   2 +-
 .../cust-filter/cust-filter.1.ddl.sqlpp         |   8 +-
 .../has-param1/has-param1.1.ddl.sqlpp           |   4 +-
 .../fuzzyeq-edit-distance.1.ddl.sqlpp           |   2 +-
 .../fuzzyeq-similarity-jaccard.1.ddl.sqlpp      |   2 +-
 .../similarity-jaccard-check_query.1.ddl.sqlpp  |   2 +-
 ...arity-jaccard-sorted-check_query.1.ddl.sqlpp |   2 +-
 .../similarity-jaccard-sorted_query.1.ddl.sqlpp |   2 +-
 .../similarity-jaccard_query.1.ddl.sqlpp        |   2 +-
 .../cell-aggregation-with-filtering.1.ddl.sqlpp |   4 +-
 ...ell-aggregation-with-filtering.3.query.sqlpp |   2 +-
 .../cell-aggregation.1.ddl.sqlpp                |   2 +-
 .../cell-aggregation.3.query.sqlpp              |   2 +-
 .../circle-intersect-circle.1.ddl.sqlpp         |   2 +-
 .../create-rtree-index.1.ddl.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 +-
 .../string/cpttostr01/cpttostr01.1.ddl.sqlpp    |   4 +-
 .../string/matches05/matches05.1.ddl.sqlpp      |   2 +-
 .../string/strconcat01/strconcat01.1.ddl.sqlpp  |   2 +-
 .../aggregate_join/aggregate_join.1.ddl.sqlpp   |   2 +-
 .../aggregate_join_external.1.ddl.sqlpp         |  10 +-
 .../decorrelate_with_unique_id.1.ddl.sqlpp      |  10 +-
 .../decorrelate_with_unique_id_2.1.ddl.sqlpp    |  12 +-
 .../decorrelate_with_unique_id_2.3.query.sqlpp  |   2 +-
 .../subquery/exists/exists.1.ddl.sqlpp          |  10 +-
 .../subquery/gby_inline/gby_inline.1.ddl.sqlpp  |  10 +-
 .../queries_sqlpp/subquery/in/in.1.ddl.sqlpp    |  10 +-
 .../in_correlated/in_correlated.1.ddl.sqlpp     |  10 +-
 .../subquery/not_exists/not_exists.1.ddl.sqlpp  |  10 +-
 .../subquery/not_in/not_in.1.ddl.sqlpp          |  10 +-
 .../query-ASTERIXDB-1168.1.ddl.sqlpp            |   2 +-
 .../query-ASTERIXDB-1571-2.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1571-3.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1571-4.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1571.1.ddl.sqlpp            |   2 +-
 .../query-ASTERIXDB-1572.1.ddl.sqlpp            |  31 +
 .../query-ASTERIXDB-1572.2.update.sqlpp         |  23 +
 .../query-ASTERIXDB-1572.3.query.sqlpp          |  29 +
 .../query-ASTERIXDB-1574-2.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1574-3.1.ddl.sqlpp          |   2 +-
 .../query-ASTERIXDB-1574.1.ddl.sqlpp            |   2 +-
 .../query-ASTERIXDB-1597.1.ddl.sqlpp            |   2 +-
 .../relational_division.1.ddl.sqlpp             |  10 +-
 .../relational_division2.1.ddl.sqlpp            |  10 +-
 .../relational_division2.3.query.sqlpp          |   2 +-
 .../relational_division3.1.ddl.sqlpp            |  10 +-
 ...e-from-loaded-dataset-with-index.1.ddl.sqlpp |  10 +-
 .../delete-from-loaded-dataset.1.ddl.sqlpp      |  10 +-
 .../drop-empty-secondary-indexes.1.ddl.sqlpp    |   2 +-
 .../drop-index/drop-index.1.ddl.sqlpp           |  26 +-
 .../empty-load-with-index.1.ddl.sqlpp           |   8 +-
 ...sert-and-scan-dataset-with-index.1.ddl.sqlpp |   4 +-
 .../insert-and-scan-dataset.1.ddl.sqlpp         |   2 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  16 +-
 ...can-delete-rtree-secondary-index.1.ddl.sqlpp |   2 +-
 .../scan-insert-persistent-to-temp.1.ddl.sqlpp  |   4 +-
 ...can-insert-rtree-secondary-index.1.ddl.sqlpp |   4 +-
 .../scan-insert-temp-to-persistent.1.ddl.sqlpp  |   4 +-
 .../temporal/accessors/accessors.3.query.sqlpp  |   2 +-
 .../temporal/agg_max/agg_max.1.ddl.sqlpp        |   6 +-
 .../temporal/agg_max/agg_max.2.update.sqlpp     |   6 +-
 .../temporal/agg_max/agg_max.3.query.sqlpp      |  10 +-
 .../temporal/agg_min/agg_min.1.ddl.sqlpp        |   6 +-
 .../temporal/agg_min/agg_min.2.update.sqlpp     |   6 +-
 .../temporal/agg_min/agg_min.3.query.sqlpp      |  10 +-
 .../duration_comps/duration_comps.3.query.sqlpp |   2 +-
 .../insert_from_ext_ds.1.ddl.sqlpp              |   4 +-
 .../insert_from_ext_ds_2.1.ddl.sqlpp            |   4 +-
 .../interval_bin/interval_bin.3.query.sqlpp     |   2 +-
 .../interval_bin_gby_0.1.ddl.sqlpp              |   2 +-
 .../interval_bin_gby_0.3.query.sqlpp            |   2 +-
 .../interval_bin_gby_1.1.ddl.sqlpp              |   2 +-
 .../interval_bin_gby_1.3.query.sqlpp            |   2 +-
 .../overlap_bins/overlap_bins.3.query.sqlpp     |   6 +-
 .../overlap_bins_gby_0.1.ddl.sqlpp              |   4 +-
 .../overlap_bins_gby_0.2.update.sqlpp           |  22 +-
 .../overlap_bins_gby_0.3.query.sqlpp            |   2 +-
 .../overlap_bins_gby_1.1.ddl.sqlpp              |   4 +-
 .../overlap_bins_gby_1.2.update.sqlpp           |  22 +-
 .../overlap_bins_gby_1.3.query.sqlpp            |  10 +-
 .../overlap_bins_gby_3.1.ddl.sqlpp              |   4 +-
 .../overlap_bins_gby_3.3.query.sqlpp            |   6 +-
 .../time_functions/time_functions.3.query.sqlpp |  16 +-
 .../query-ASTERIXDB-1331.25.query.sqlpp         |   2 +-
 .../tinysocial-suite.1.ddl.sqlpp                |   4 +-
 .../tinysocial-suite.14.query.sqlpp             |   2 +-
 .../tinysocial-suite.2.ddl.sqlpp                |   2 +-
 .../tinysocial-suite.22.query.sqlpp             |   2 +-
 .../tinysocial-suite.1.ddl.sqlpp                |  16 +-
 .../tinysocial-suite.14.query.sqlpp             |   2 +-
 .../tinysocial-suite.22.query.sqlpp             |   2 +-
 .../tinysocial-suite.25.query.sqlpp             |   2 +-
 .../query-ASTERIXDB-1580.1.ddl.sqlpp            |  86 +-
 .../query-ASTERIXDB-1580.3.query.sqlpp          |   2 +-
 .../query-ASTERIXDB-1581-2.1.ddl.sqlpp          |  34 +-
 .../query-ASTERIXDB-1581-3.1.ddl.sqlpp          |  34 +-
 .../query-ASTERIXDB-1581-4.1.ddl.sqlpp          |  34 +-
 .../query-ASTERIXDB-1581-5.1.ddl.sqlpp          |  34 +-
 .../query-ASTERIXDB-1581-6.1.ddl.sqlpp          |  34 +-
 ...uery-ASTERIXDB-1581-correlated-2.1.ddl.sqlpp |  34 +-
 .../query-ASTERIXDB-1581-correlated.1.ddl.sqlpp |  34 +-
 .../query-ASTERIXDB-1581.1.ddl.sqlpp            |  34 +-
 .../query-ASTERIXDB-1591.1.ddl.sqlpp            | 270 ++++++
 .../query-ASTERIXDB-1591.2.update.sqlpp         |  41 +
 .../query-ASTERIXDB-1591.3.query.sqlpp          |  52 ++
 .../query-ASTERIXDB-1596.1.ddl.sqlpp            |  86 +-
 .../query-ASTERIXDB-1602.1.ddl.sqlpp            |  85 ++
 .../query-ASTERIXDB-1602.2.update.sqlpp         |  26 +
 .../query-ASTERIXDB-1602.3.query.sqlpp          |  42 +
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  14 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       |  40 +-
 .../q02_minimum_cost_supplier.3.query.sqlpp     |   2 +-
 .../q03_shipping_priority_nt.1.ddl.sqlpp        |  40 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |   2 +-
 .../q04_order_priority.1.ddl.sqlpp              |  40 +-
 .../q04_order_priority.3.query.sqlpp            |   2 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       |  40 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |   2 +-
 .../q06_forecast_revenue_change.1.ddl.sqlpp     |  40 +-
 .../q07_volume_shipping.1.ddl.sqlpp             |  40 +-
 .../q07_volume_shipping.3.query.sqlpp           |   2 +-
 .../q08_national_market_share.1.ddl.sqlpp       |  40 +-
 .../q08_national_market_share.3.query.sqlpp     |   4 +-
 .../q09_product_type_profit_nt.1.ddl.sqlpp      |  40 +-
 .../q09_product_type_profit_nt.3.query.sqlpp    |   2 +-
 .../q10_returned_item.1.ddl.sqlpp               |  40 +-
 .../q10_returned_item.3.query.sqlpp             |   2 +-
 .../q10_returned_item_int64.1.ddl.sqlpp         |  40 +-
 .../q10_returned_item_int64.3.query.sqlpp       |   2 +-
 .../q11_important_stock.1.ddl.sqlpp             |  40 +-
 .../q11_important_stock.3.query.sqlpp           |   4 +-
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       |  40 +-
 .../q12_shipping/q12_shipping.3.query.sqlpp     |   4 +-
 .../q13_customer_distribution.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.3.query.sqlpp     |   4 +-
 .../q14_promotion_effect.1.ddl.sqlpp            |  40 +-
 .../q14_promotion_effect.3.query.sqlpp          |   4 +-
 .../q15_top_supplier.1.ddl.sqlpp                |  40 +-
 .../q15_top_supplier.3.query.sqlpp              |   4 +-
 .../q16_parts_supplier_relationship.1.ddl.sqlpp |  40 +-
 ...16_parts_supplier_relationship.3.query.sqlpp |   2 +-
 .../q17_large_gby_variant.1.ddl.sqlpp           |  40 +-
 .../q17_large_gby_variant.3.query.sqlpp         |  20 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp |  40 +-
 ...7_small_quantity_order_revenue.3.query.sqlpp |   4 +-
 .../q18_large_volume_customer.1.ddl.sqlpp       |  40 +-
 .../q18_large_volume_customer.3.query.sqlpp     |   4 +-
 .../q19_discounted_revenue.1.ddl.sqlpp          |  40 +-
 .../q19_discounted_revenue.3.query.sqlpp        |   2 +-
 .../q20_potential_part_promotion.1.ddl.sqlpp    |  40 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |   2 +-
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp |  40 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp |  10 +-
 .../q22_global_sales_opportunity.1.ddl.sqlpp    |  40 +-
 .../q22_global_sales_opportunity.3.query.sqlpp  |   4 +-
 .../query-issue601/query-issue601.1.ddl.sqlpp   |   8 +-
 .../query-issue601/query-issue601.3.query.sqlpp |   2 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   |  40 +-
 .../query-issue638/query-issue638.3.query.sqlpp |   2 +-
 .../query-issue785-2.1.ddl.sqlpp                |  20 +-
 .../query-issue785-2.3.query.sqlpp              |   2 +-
 .../query-issue785/query-issue785.1.ddl.sqlpp   |  20 +-
 .../query-issue785/query-issue785.3.query.sqlpp |   4 +-
 .../query-issue786/query-issue786.1.ddl.sqlpp   |  20 +-
 .../query-issue786/query-issue786.3.query.sqlpp |   2 +-
 .../distinct_by/distinct_by.1.ddl.sqlpp         |   8 +-
 .../group_no_agg/group_no_agg.1.ddl.sqlpp       |   2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   |  20 +-
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp |  20 +-
 .../q01_pricing_summary_report_2.1.ddl.sqlpp    |   8 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       |  40 +-
 .../q03_shipping_priority_nt.1.ddl.sqlpp        |  40 +-
 .../q04_order_priority.1.ddl.sqlpp              |  40 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       |  40 +-
 .../q06_forecast_revenue_change.1.ddl.sqlpp     |  40 +-
 .../q07_volume_shipping.1.ddl.sqlpp             |  40 +-
 .../q07_volume_shipping.3.query.sqlpp           |   2 +-
 .../q08_national_market_share.1.ddl.sqlpp       |  40 +-
 .../q08_national_market_share.3.query.sqlpp     |   2 +-
 .../q09_product_type_profit_nt.1.ddl.sqlpp      |  40 +-
 .../q09_product_type_profit_nt.3.query.sqlpp    |   2 +-
 .../q10_returned_item.1.ddl.sqlpp               |  40 +-
 .../q10_returned_item_int64.1.ddl.sqlpp         |  40 +-
 .../q11_important_stock.1.ddl.sqlpp             |  40 +-
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.3.query.sqlpp     |   2 +-
 .../q14_promotion_effect.1.ddl.sqlpp            |  40 +-
 .../q15_top_supplier.1.ddl.sqlpp                |  40 +-
 .../q16_parts_supplier_relationship.1.ddl.sqlpp |  40 +-
 .../q17_large_gby_variant.1.ddl.sqlpp           |  40 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp |  40 +-
 .../q18_large_volume_customer.1.ddl.sqlpp       |  40 +-
 .../q19_discounted_revenue.1.ddl.sqlpp          |  40 +-
 .../q20_potential_part_promotion.1.ddl.sqlpp    |  40 +-
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp |  40 +-
 .../q22_global_sales_opportunity.1.ddl.sqlpp    |  40 +-
 .../query-issue562/query-issue562.1.ddl.sqlpp   |  40 +-
 .../query-issue562/query-issue562.3.query.sqlpp |   2 +-
 .../query-issue601/query-issue601.1.ddl.sqlpp   |   8 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   |  40 +-
 .../query-issue638/query-issue638.3.query.sqlpp |   2 +-
 .../query-issue785-2.1.ddl.sqlpp                |  20 +-
 .../query-issue785/query-issue785.1.ddl.sqlpp   |  20 +-
 .../query-issue786/query-issue786.1.ddl.sqlpp   |  20 +-
 .../query-issue810-2.1.ddl.sqlpp                |   8 +-
 .../query-issue810-2.3.query.sqlpp              |   2 +-
 .../query-issue810-3.1.ddl.sqlpp                |   8 +-
 .../query-issue810-3.3.query.sqlpp              |   4 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |   8 +-
 .../query-issue810/query-issue810.3.query.sqlpp |   4 +-
 .../distinct_by/distinct_by.1.ddl.sqlpp         |   8 +-
 .../group_no_agg/group_no_agg.1.ddl.sqlpp       |   2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   |  20 +-
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp |  20 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       |  40 +-
 .../q03_shipping_priority_nt.1.ddl.sqlpp        |  40 +-
 .../q04_order_priority.1.ddl.sqlpp              |  40 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       |  40 +-
 .../q06_forecast_revenue_change.1.ddl.sqlpp     |  40 +-
 .../q07_volume_shipping.1.ddl.sqlpp             |  40 +-
 .../q08_national_market_share.1.ddl.sqlpp       |  40 +-
 .../q09_product_type_profit_nt.1.ddl.sqlpp      |  40 +-
 .../q10_returned_item.1.ddl.sqlpp               |  40 +-
 .../q10_returned_item_int64.1.ddl.sqlpp         |  40 +-
 .../q11_important_stock.1.ddl.sqlpp             |  40 +-
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.3.query.sqlpp     |   2 +-
 .../q14_promotion_effect.1.ddl.sqlpp            |  40 +-
 .../q15_top_supplier.1.ddl.sqlpp                |  40 +-
 .../q16_parts_supplier_relationship.1.ddl.sqlpp |  40 +-
 .../q17_large_gby_variant.1.ddl.sqlpp           |  40 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp |  40 +-
 .../q18_large_volume_customer.1.ddl.sqlpp       |  40 +-
 .../q19_discounted_revenue.1.ddl.sqlpp          |  40 +-
 .../q20_potential_part_promotion.1.ddl.sqlpp    |  40 +-
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp |  40 +-
 .../q22_global_sales_opportunity.1.ddl.sqlpp    |  40 +-
 .../query-issue562/query-issue562.1.ddl.sqlpp   |  40 +-
 .../query-issue562/query-issue562.3.query.sqlpp |   2 +-
 .../query-issue601/query-issue601.1.ddl.sqlpp   |   8 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   |  40 +-
 .../query-issue785-2.1.ddl.sqlpp                |  20 +-
 .../query-issue785/query-issue785.1.ddl.sqlpp   |  20 +-
 .../query-issue786/query-issue786.1.ddl.sqlpp   |  20 +-
 .../query-issue810-2.1.ddl.sqlpp                |   8 +-
 .../query-issue810-2.3.query.sqlpp              |   2 +-
 .../query-issue810-3.1.ddl.sqlpp                |   8 +-
 .../query-issue810-3.3.query.sqlpp              |   4 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |   8 +-
 .../query-issue810/query-issue810.3.query.sqlpp |   4 +-
 .../distinct_by/distinct_by.1.ddl.sqlpp         |   8 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   |  20 +-
 .../nest_aggregate/nest_aggregate.3.query.sqlpp |   2 +-
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp |  20 +-
 .../nest_aggregate2.3.query.sqlpp               |   2 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  14 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       |  40 +-
 .../q02_minimum_cost_supplier.3.query.sqlpp     |   2 +-
 .../q03_shipping_priority_nt.1.ddl.sqlpp        |  40 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |   2 +-
 .../q04_order_priority.1.ddl.sqlpp              |  40 +-
 ...04_order_priority_with_nodegroup.1.ddl.sqlpp |  40 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       |  40 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |   2 +-
 .../q06_forecast_revenue_change.1.ddl.sqlpp     |  40 +-
 .../q06_forecast_revenue_change.3.query.sqlpp   |   2 +-
 .../q07_volume_shipping.1.ddl.sqlpp             |  40 +-
 .../q07_volume_shipping.3.query.sqlpp           |   2 +-
 .../q08_national_market_share.1.ddl.sqlpp       |  40 +-
 .../q08_national_market_share.3.query.sqlpp     |   4 +-
 .../q09_product_type_profit_nt.1.ddl.sqlpp      |  40 +-
 .../q09_product_type_profit_nt.3.query.sqlpp    |   2 +-
 .../q10_returned_item.1.ddl.sqlpp               |  40 +-
 .../q10_returned_item.3.query.sqlpp             |   2 +-
 .../q10_returned_item_int64.1.ddl.sqlpp         |  40 +-
 .../q10_returned_item_int64.3.query.sqlpp       |   2 +-
 .../q11_important_stock.1.ddl.sqlpp             |  40 +-
 .../q11_important_stock.3.query.sqlpp           |   4 +-
 .../q12_shipping/q12_shipping.1.ddl.sqlpp       |  40 +-
 .../q12_shipping/q12_shipping.3.query.sqlpp     |   4 +-
 .../q13_customer_distribution.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.3.query.sqlpp     |   4 +-
 .../q14_promotion_effect.1.ddl.sqlpp            |  40 +-
 .../q14_promotion_effect.3.query.sqlpp          |   4 +-
 .../q15_top_supplier.1.ddl.sqlpp                |  40 +-
 .../q15_top_supplier.3.query.sqlpp              |   4 +-
 .../q16_parts_supplier_relationship.1.ddl.sqlpp |  40 +-
 ...16_parts_supplier_relationship.3.query.sqlpp |   2 +-
 .../q17_large_gby_variant.1.ddl.sqlpp           |  40 +-
 .../q17_large_gby_variant.3.query.sqlpp         |  20 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp |  40 +-
 ...7_small_quantity_order_revenue.3.query.sqlpp |   4 +-
 .../q18_large_volume_customer.1.ddl.sqlpp       |  40 +-
 .../q18_large_volume_customer.3.query.sqlpp     |   4 +-
 .../q19_discounted_revenue.1.ddl.sqlpp          |  40 +-
 .../q19_discounted_revenue.3.query.sqlpp        |   2 +-
 .../q20_potential_part_promotion.1.ddl.sqlpp    |  40 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |   2 +-
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp |  40 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp |   8 +-
 .../q22_global_sales_opportunity.1.ddl.sqlpp    |  40 +-
 .../q22_global_sales_opportunity.3.query.sqlpp  |   4 +-
 .../query-issue562/query-issue562.1.ddl.sqlpp   |  40 +-
 .../query-issue562/query-issue562.3.query.sqlpp |   6 +-
 .../query-issue601/query-issue601.1.ddl.sqlpp   |   8 +-
 .../query-issue785-2.1.ddl.sqlpp                |  20 +-
 .../query-issue785-2.3.query.sqlpp              |   2 +-
 .../query-issue785/query-issue785.1.ddl.sqlpp   |  20 +-
 .../query-issue785/query-issue785.3.query.sqlpp |   4 +-
 .../query-issue786/query-issue786.1.ddl.sqlpp   |  20 +-
 .../query-issue786/query-issue786.3.query.sqlpp |   2 +-
 .../query-issue810-2.1.ddl.sqlpp                |   8 +-
 .../query-issue810-2.3.query.sqlpp              |   2 +-
 .../query-issue810-3.1.ddl.sqlpp                |   8 +-
 .../query-issue810-3.3.query.sqlpp              |   2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |   8 +-
 .../query-issue810/query-issue810.3.query.sqlpp |   2 +-
 .../query-issue827-2.1.ddl.sqlpp                |   8 +-
 .../query-issue827-2.3.query.sqlpp              |  16 +-
 .../query-issue827/query-issue827.1.ddl.sqlpp   |   8 +-
 .../query-issue827/query-issue827.3.query.sqlpp |   4 +-
 .../tpch/distinct_by/distinct_by.1.ddl.sqlpp    |   8 +-
 .../tpch/group_no_agg/group_no_agg.1.ddl.sqlpp  |   2 +-
 .../nest_aggregate/nest_aggregate.1.ddl.sqlpp   |  20 +-
 .../nest_aggregate/nest_aggregate.3.query.sqlpp |   2 +-
 .../nest_aggregate2/nest_aggregate2.1.ddl.sqlpp |  20 +-
 .../nest_aggregate2.3.query.sqlpp               |   2 +-
 .../q01_pricing_summary_report_nt.1.ddl.sqlpp   |   8 +-
 .../q01_pricing_summary_report_nt.3.query.sqlpp |  16 +-
 .../q02_minimum_cost_supplier.1.ddl.sqlpp       |  40 +-
 .../q02_minimum_cost_supplier.3.query.sqlpp     |   2 +-
 .../q03_shipping_priority_nt.1.ddl.sqlpp        |  40 +-
 .../q03_shipping_priority_nt.3.query.sqlpp      |   2 +-
 .../q04_order_priority.1.ddl.sqlpp              |  40 +-
 .../q05_local_supplier_volume.1.ddl.sqlpp       |  40 +-
 .../q05_local_supplier_volume.3.query.sqlpp     |   2 +-
 .../q06_forecast_revenue_change.1.ddl.sqlpp     |  40 +-
 .../q06_forecast_revenue_change.3.query.sqlpp   |   2 +-
 .../q07_volume_shipping.1.ddl.sqlpp             |  40 +-
 .../q07_volume_shipping.3.query.sqlpp           |   2 +-
 .../q08_national_market_share.1.ddl.sqlpp       |  40 +-
 .../q08_national_market_share.3.query.sqlpp     |   4 +-
 .../q09_product_type_profit_nt.1.ddl.sqlpp      |  40 +-
 .../q09_product_type_profit_nt.3.query.sqlpp    |   2 +-
 .../q10_returned_item.1.ddl.sqlpp               |  40 +-
 .../q10_returned_item.3.query.sqlpp             |   2 +-
 .../q10_returned_item_int64.1.ddl.sqlpp         |  40 +-
 .../q10_returned_item_int64.3.query.sqlpp       |   2 +-
 .../q11_important_stock.1.ddl.sqlpp             |  40 +-
 .../q11_important_stock.3.query.sqlpp           |   4 +-
 .../tpch/q12_shipping/q12_shipping.1.ddl.sqlpp  |  40 +-
 .../q12_shipping/q12_shipping.3.query.sqlpp     |   4 +-
 .../q13_customer_distribution.1.ddl.sqlpp       |  40 +-
 .../q13_customer_distribution.3.query.sqlpp     |   4 +-
 .../q14_promotion_effect.1.ddl.sqlpp            |  40 +-
 .../q14_promotion_effect.3.query.sqlpp          |   4 +-
 .../q15_top_supplier.1.ddl.sqlpp                |  40 +-
 .../q15_top_supplier.3.query.sqlpp              |   4 +-
 .../q16_parts_supplier_relationship.1.ddl.sqlpp |  40 +-
 ...16_parts_supplier_relationship.3.query.sqlpp |   2 +-
 .../q17_large_gby_variant.1.ddl.sqlpp           |  40 +-
 .../q17_large_gby_variant.3.query.sqlpp         |  20 +-
 ...q17_small_quantity_order_revenue.1.ddl.sqlpp |  40 +-
 ...7_small_quantity_order_revenue.3.query.sqlpp |   4 +-
 .../q18_large_volume_customer.1.ddl.sqlpp       |  40 +-
 .../q18_large_volume_customer.3.query.sqlpp     |   4 +-
 .../q19_discounted_revenue.1.ddl.sqlpp          |  40 +-
 .../q19_discounted_revenue.3.query.sqlpp        |   2 +-
 .../q20_potential_part_promotion.1.ddl.sqlpp    |  40 +-
 .../q20_potential_part_promotion.3.query.sqlpp  |   2 +-
 ...uppliers_who_kept_orders_waiting.1.ddl.sqlpp |  40 +-
 ...pliers_who_kept_orders_waiting.3.query.sqlpp |   8 +-
 .../q22_global_sales_opportunity.1.ddl.sqlpp    |  40 +-
 .../q22_global_sales_opportunity.3.query.sqlpp  |   4 +-
 .../query-issue562/query-issue562.1.ddl.sqlpp   |  40 +-
 .../query-issue562/query-issue562.3.query.sqlpp |   6 +-
 .../query-issue601/query-issue601.1.ddl.sqlpp   |   8 +-
 .../query-issue638/query-issue638.1.ddl.sqlpp   |  40 +-
 .../query-issue638/query-issue638.3.query.sqlpp |   2 +-
 .../query-issue785-2.1.ddl.sqlpp                |  20 +-
 .../query-issue785-2.3.query.sqlpp              |   2 +-
 .../query-issue785/query-issue785.1.ddl.sqlpp   |  20 +-
 .../query-issue785/query-issue785.3.query.sqlpp |   4 +-
 .../query-issue786/query-issue786.1.ddl.sqlpp   |  20 +-
 .../query-issue786/query-issue786.3.query.sqlpp |   2 +-
 .../query-issue810-2.1.ddl.sqlpp                |   8 +-
 .../query-issue810-2.3.query.sqlpp              |   2 +-
 .../query-issue810-3.1.ddl.sqlpp                |   8 +-
 .../query-issue810-3.3.query.sqlpp              |   2 +-
 .../query-issue810/query-issue810.1.ddl.sqlpp   |   8 +-
 .../query-issue810/query-issue810.3.query.sqlpp |   2 +-
 .../query-issue827-2.1.ddl.sqlpp                |   8 +-
 .../query-issue827-2.3.query.sqlpp              |  16 +-
 .../query-issue827/query-issue827.1.ddl.sqlpp   |   8 +-
 .../query-issue827/query-issue827.3.query.sqlpp |   4 +-
 .../types/any-object/any-object.1.ddl.sqlpp     |  25 +
 .../types/any-object/any-object.2.query.sqlpp   |  20 +
 .../opentype_orderby_01.1.ddl.sqlpp             |  18 +-
 ...ype_field_vs_closedtype_field_01.1.ddl.sqlpp |  18 +-
 ...ype_field_vs_closedtype_field_02.1.ddl.sqlpp |  18 +-
 ...ype_field_vs_closedtype_field_03.1.ddl.sqlpp |  18 +-
 ...ype_field_vs_closedtype_field_04.1.ddl.sqlpp |  18 +-
 ...ype_field_vs_closedtype_field_05.1.ddl.sqlpp |   8 +-
 ..._closedtype_field_vs_constant_01.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_01.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_02.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_02.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_03.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_03.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_04.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_04.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_05.1.ddl.sqlpp |  18 +-
 ..._closedtype_field_vs_constant_06.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_06.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_07.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_07.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_08.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_08.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_09.1.ddl.sqlpp |  18 +-
 ...losedtype_field_vs_constant_09.3.query.sqlpp |   2 +-
 ..._closedtype_field_vs_constant_10.1.ddl.sqlpp |  18 +-
 ..._closedtype_field_vs_constant_11.1.ddl.sqlpp |  18 +-
 ...dtype_field_vs_opentype_field_01.1.ddl.sqlpp |  18 +-
 ...dtype_field_vs_opentype_field_02.1.ddl.sqlpp |  18 +-
 ...dtype_field_vs_opentype_field_03.1.ddl.sqlpp |  18 +-
 ...dtype_field_vs_opentype_field_04.1.ddl.sqlpp |  18 +-
 ...on_opentype_field_vs_constant_01.1.ddl.sqlpp |  18 +-
 ..._opentype_field_vs_constant_01.3.query.sqlpp |   2 +-
 ...on_opentype_field_vs_constant_02.1.ddl.sqlpp |  18 +-
 ..._opentype_field_vs_constant_02.3.query.sqlpp |   2 +-
 ...on_opentype_field_vs_constant_03.1.ddl.sqlpp |  18 +-
 ..._opentype_field_vs_constant_03.3.query.sqlpp |   2 +-
 ...on_opentype_field_vs_constant_04.1.ddl.sqlpp |  18 +-
 ..._opentype_field_vs_constant_04.3.query.sqlpp |   2 +-
 ...on_opentype_field_vs_constant_05.1.ddl.sqlpp |  18 +-
 ...on_opentype_field_vs_constant_06.1.ddl.sqlpp |  18 +-
 ...on_opentype_field_vs_constant_07.1.ddl.sqlpp |  18 +-
 ...on_opentype_field_vs_constant_08.1.ddl.sqlpp |  18 +-
 ...ntype_field_vs_opentype_field_01.1.ddl.sqlpp |  18 +-
 ...ntype_field_vs_opentype_field_02.1.ddl.sqlpp |  18 +-
 .../types/record01/record01.1.ddl.sqlpp         |   2 +-
 .../type_promotion_0.1.ddl.sqlpp                |  12 +-
 .../type_promotion_0.2.update.sqlpp             |   6 +-
 .../type_promotion_1.1.ddl.sqlpp                |  18 +-
 .../type_promotion_1.2.update.sqlpp             |   2 +-
 ...pe_promotion_open_index_enforced.1.ddl.sqlpp |   4 +-
 ...promotion_open_index_enforced.2.update.sqlpp |   2 +-
 .../query-ASTERIXDB-1354-2.1.ddl.sqlpp          |  16 +-
 .../query-ASTERIXDB-1629.1.ddl.sqlpp            |  43 +
 .../query-ASTERIXDB-1629.2.update.sqlpp         |  24 +
 .../query-ASTERIXDB-1629.3.query.sqlpp          |  24 +
 .../queries_sqlpp/union/union/union.1.ddl.sqlpp |   4 +-
 .../union_heterogeneous_scalar.1.ddl.sqlpp      |   4 +-
 .../union_negative/union_negative.1.ddl.sqlpp   |   2 +-
 .../union_negative_2.1.ddl.sqlpp                |   4 +-
 .../union_negative_3.1.query.sqlpp              |  20 +
 .../union_orderby/union_orderby.1.ddl.sqlpp     |   4 +-
 .../union_orderby_2/union_orderby_2.1.ddl.sqlpp |   4 +-
 .../union_orderby_3/union_orderby_3.1.ddl.sqlpp |   4 +-
 .../union_orderby_4/union_orderby_4.1.ddl.sqlpp |   4 +-
 .../f01/f01.3.query.sqlpp                       |   2 +-
 .../query-ASTERIXDB-1652-2.1.ddl.sqlpp          |  28 +
 .../query-ASTERIXDB-1652-2.2.query.sqlpp        |  22 +
 .../query-ASTERIXDB-1652.1.query.sqlpp          |  20 +
 .../query-issue244/query-issue244.1.ddl.sqlpp   |   2 +-
 .../query-issue489/query-issue489.2.query.sqlpp |   2 +-
 .../query-issue489/query-issue489.4.query.sqlpp |   2 +-
 .../udf09/udf09.1.ddl.sqlpp                     |   2 +-
 .../api/cluster_state_1/cluster_state_1.1.adm   |  40 +-
 .../api/cluster_state_3/cluster_state_3.1.adm   |  28 +-
 .../api/cluster_state_4/cluster_state_4.1.adm   |  14 +-
 .../cluster_state_cc_1/cluster_state_cc_1.1.adm |   5 +
 .../cluster_state_cc_stats_1.1.regexadm         |  27 +
 .../cluster_state_cc_threaddump_1.1.regex       |  10 +
 .../results/api/version_1/version_1.1.regex     |   1 +
 .../results/feeds/upsert-feed/upsert-feed.1.adm |   6 +
 .../dblp-csx-aqlplus_5/dblp-csx-aqlplus_5.1.adm |   1 +
 .../query-ASTERIXDB-1626-2.1.adm                |   1 +
 .../query-ASTERIXDB-1626.1.adm                  |   1 +
 .../numeric/non-finite/non-finite.1.json        |   2 +
 .../enforced-type-delete.5.adm                  |   1 +
 .../enforced-type-upsert.5.adm                  |   1 +
 .../closed-nullable-fields_issue1616.1.adm      |   2 +
 .../query-ASTERIXDB-1572.1.adm                  |   0
 .../query-ASTERIXDB-1591.1.adm                  |   1 +
 .../query-ASTERIXDB-1596.1.adm                  |   8 +-
 .../query-ASTERIXDB-1602.1.adm                  |   1 +
 .../results/types/any-object/any-object.2.adm   |  68 ++
 .../query-ASTERIXDB-1629.1.adm                  |   2 +
 .../query-ASTERIXDB-1652-2.1.adm                |   1 +
 .../agg_null_rec/agg_null_rec.1.ast             |   2 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ast         |   2 +-
 .../agg_number_rec/agg_number_rec.1.ast         |   2 +-
 .../avg_double_null/avg_double_null.1.ast       |  10 +-
 .../avg_empty_02/avg_empty_02.1.ast             |   2 +-
 .../avg_float_null/avg_float_nu.1.ast           |  10 +-
 .../avg_int16_null/avg_int16_null.1.ast         |  10 +-
 .../avg_int32_null/avg_int32_null.1.ast         |  10 +-
 .../avg_int64_null/avg_int64_null.1.ast         |  10 +-
 .../avg_int8_null/avg_int8_null.1.ast           |  10 +-
 .../count_empty_02/count_empty_02.1.ast         |   2 +-
 .../aggregate-sql/count_null/count_null.1.ast   |  10 +-
 .../aggregate-sql/issue395/issue395.1.ast       |   2 +-
 .../issue531_string_min_max.1.ast               |   2 +-
 .../max_empty_02/max_empty_02.1.ast             |   2 +-
 .../min_empty_02/min_empty_02.1.ast             |   2 +-
 .../sum_double_null/sum_double_null.1.ast       |  10 +-
 .../sum_empty_02/sum_empty_02.1.ast             |   2 +-
 .../sum_float_null/sum_float_null.1.ast         |  10 +-
 .../sum_int16_null/sum_int16_null.1.ast         |  10 +-
 .../sum_int32_null/sum_int32_null.1.ast         |  10 +-
 .../sum_int64_null/sum_int64_null.1.ast         |  10 +-
 .../sum_int8_null/sum_int8_null.1.ast           |  10 +-
 .../sum_null-with-pred/sum_null-with-pred.1.ast |   4 +-
 .../sum_numeric_null/sum_numeric_null.1.ast     |   4 +-
 .../aggregate/agg_null_rec/agg_null_rec.1.ast   |   2 +-
 .../agg_null_rec_1/agg_null_rec_1.1.ast         |   2 +-
 .../agg_number_rec/agg_number_rec.1.ast         |   2 +-
 .../avg_double_null/avg_double_null.1.ast       |  10 +-
 .../aggregate/avg_empty_02/avg_empty_02.1.ast   |   2 +-
 .../aggregate/avg_float_null/avg_float_nu.1.ast |  10 +-
 .../avg_int16_null/avg_int16_null.1.ast         |  10 +-
 .../avg_int32_null/avg_int32_null.1.ast         |  10 +-
 .../avg_int64_null/avg_int64_null.1.ast         |  10 +-
 .../aggregate/avg_int8_null/avg_int8_null.1.ast |  10 +-
 .../count_empty_02/count_empty_02.1.ast         |   2 +-
 .../aggregate/count_null/count_null.1.ast       |  10 +-
 .../aggregate/issue395/issue395.1.ast           |   2 +-
 .../issue531_string_min_max.1.ast               |   2 +-
 .../aggregate/max_empty_02/max_empty_02.1.ast   |   2 +-
 .../aggregate/min_empty_02/min_empty_02.1.ast   |   2 +-
 .../sum_double_null/sum_double_null.1.ast       |  10 +-
 .../aggregate/sum_empty_02/sum_empty_02.1.ast   |   2 +-
 .../sum_float_null/sum_float_null.1.ast         |  10 +-
 .../sum_int16_null/sum_int16_null.1.ast         |  10 +-
 .../sum_int32_null/sum_int32_null.1.ast         |  10 +-
 .../sum_int64_null/sum_int64_null.1.ast         |  10 +-
 .../aggregate/sum_int8_null/sum_int8_null.1.ast |  10 +-
 .../sum_null-with-pred/sum_null-with-pred.1.ast |   4 +-
 .../sum_numeric_null/sum_numeric_null.1.ast     |   4 +-
 .../big_object_groupby.1.ast                    |  18 +-
 .../big_object_groupby/big_object_groupby.1.ast |  18 +-
 .../big_object_join/big_object_join.1.ast       |  18 +-
 .../big_object_sort/big_object_sort.1.ast       |  18 +-
 .../binary/equal_join/equal_join.1.ast          |   2 +-
 .../binary/index_join/index_join.1.ast          |   2 +-
 .../binary/insert/insert.1.ast                  |   4 +-
 .../comparison/binary_null/binary_null.1.ast    |  12 +-
 .../comparison/binary_null/binary_null.2.ast    |   0
 .../comparison/binary_null/binary_null.3.ast    | 100 --
 .../datetime_range/datetime_range.1.ast         |   4 +-
 .../comparison/int16_null/int16_null.2.ast      |   0
 .../comparison/int16_null/int16_null.3.ast      | 100 --
 .../comparison/int64_null/int64_null.1.ast      |  12 +-
 .../cross-dataverse/cross-dv01/cross-dv01.1.ast |   8 +-
 .../cross-dataverse/cross-dv02/cross-dv02.1.ast |   8 +-
 .../cross-dataverse/cross-dv03/cross-dv03.1.ast |   8 +-
 .../cross-dataverse/cross-dv04/cross-dv04.1.ast |   8 +-
 .../cross-dataverse/cross-dv07/cross-dv07.1.ast |   4 +-
 .../cross-dataverse/cross-dv19/cross-dv19.1.ast |   8 +-
 .../cross-dataverse/cross-dv20/cross-dv20.1.ast |   8 +-
 .../insert_across_dataverses.1.ast              |  20 +-
 .../join_across_dataverses.1.ast                |  16 +-
 .../csv/basic-types/basic-types.1.ast           |  10 +-
 .../custord/customer_q_01/customer_q_01.1.ast   |  10 +-
 .../custord/customer_q_02/customer_q_02.1.ast   |  10 +-
 .../custord/customer_q_03/customer_q_03.1.ast   |  10 +-
 .../custord/customer_q_04/customer_q_04.1.ast   |  10 +-
 .../custord/customer_q_05/customer_q_05.1.ast   |  10 +-
 .../custord/customer_q_06/customer_q_06.1.ast   |  10 +-
 .../custord/customer_q_07/customer_q_07.1.ast   |  10 +-
 .../custord/customer_q_08/customer_q_08.1.ast   |  10 +-
 .../denorm-cust-order_02.1.ast                  |  14 +-
 .../custord/join_q_01/join_q_01.1.ast           |  16 +-
 .../custord/join_q_02/join_q_02.1.ast           |  16 +-
 .../custord/join_q_03/join_q_03.1.ast           |  16 +-
 .../custord/join_q_04/join_q_04.1.ast           |  16 +-
 .../custord/load-test/load-test.1.ast           |   8 +-
 .../custord/order_q_01/order_q_01.1.ast         |   6 +-
 .../custord/order_q_02/order_q_02.1.ast         |   6 +-
 .../custord/order_q_03/order_q_03.1.ast         |   6 +-
 .../custord/order_q_04/order_q_04.1.ast         |   6 +-
 .../custord/order_q_05/order_q_05.1.ast         |   6 +-
 .../custord/order_q_06/order_q_06.1.ast         |   6 +-
 .../results_parser_sqlpp/dapd/q1/q1.1.ast       |   2 +-
 .../results_parser_sqlpp/dapd/q2/q2.1.ast       |   4 +-
 .../compact-dataset-and-its-indexes.1.ast       |  10 +-
 .../create-drop-cltype/create-drop-cltype.1.ast |   4 +-
 .../create-drop-opntype.1.ast                   |   4 +-
 .../delete-from-loaded-dataset-with-index.1.ast |  10 +-
 .../delete-from-loaded-dataset.1.ast            |  10 +-
 .../delete-multi-statement.1.ast                |  40 +-
 .../delete-syntax-change.1.ast                  |  10 +-
 .../drop-empty-secondary-indexes.1.ast          |   2 +-
 .../dml/drop-index/drop-index.1.ast             |  26 +-
 .../empty-load-with-index.1.ast                 |   8 +-
 .../insert-and-scan-dataset-with-index.1.ast    |   4 +-
 .../insert-and-scan-dataset.1.ast               |   2 +-
 .../insert-and-scan-joined-datasets.1.ast       |   2 +-
 .../insert-duplicated-keys.1.ast                |   2 +-
 .../insert-into-empty-dataset-with-index.1.ast  |   6 +-
 .../insert-into-empty-dataset.1.ast             |   6 +-
 ...sert-into-loaded-dataset-with-index_01.1.ast |   6 +-
 ...sert-into-loaded-dataset-with-index_02.1.ast |  14 +-
 .../insert-into-loaded-dataset_01.1.ast         |   6 +-
 .../insert-into-loaded-dataset_02.1.ast         |  26 +-
 .../dml/insert-syntax/insert-syntax.1.ast       |   2 +-
 .../dml/insert/insert.1.ast                     |  14 +-
 .../dml/insert_less_nc/insert_less_nc.1.ast     |  14 +-
 .../load-with-index-open.1.ast                  |  14 +-
 .../dml/load-with-index/load-with-index.1.ast   |   8 +-
 .../load-with-ngram-index-open.1.ast            |   4 +-
 .../load-with-ngram-index.1.ast                 |   2 +-
 .../load-with-rtree-index-open.1.ast            |   4 +-
 .../load-with-rtree-index.1.ast                 |   2 +-
 .../load-with-word-index-open.1.ast             |   4 +-
 .../load-with-word-index.1.ast                  |   2 +-
 .../opentype-c2o-recursive.1.ast                |   2 +-
 .../dml/opentype-insert2/opentype-insert2.1.ast |   2 +-
 .../opentype-o2c-recursive.1.ast                |   2 +-
 .../dml/query-issue205/query-issue205.1.ast     |   6 +-
 .../dml/query-issue288/query-issue288.1.ast     |   6 +-
 .../dml/query-issue382/query-issue382.1.ast     |   6 +-
 .../dml/query-issue433/query-issue433.1.ast     |   4 +-
 ...-delete-btree-secondary-index-nullable.1.ast |   8 +-
 ...scan-delete-btree-secondary-index-open.1.ast |  12 +-
 ...d-index-ngram-secondary-index-nullable.1.ast |   2 +-
 ...erted-index-ngram-secondary-index-open.1.ast |   4 +-
 ...e-inverted-index-ngram-secondary-index.1.ast |   2 +-
 ...ed-index-word-secondary-index-nullable.1.ast |   2 +-
 ...verted-index-word-secondary-index-open.1.ast |   4 +-
 ...te-inverted-index-word-secondary-index.1.ast |   2 +-
 ...-delete-rtree-secondary-index-nullable.1.ast |   2 +-
 ...scan-delete-rtree-secondary-index-open.1.ast |   4 +-
 .../scan-delete-rtree-secondary-index.1.ast     |   2 +-
 ...-insert-btree-secondary-index-nullable.1.ast |   8 +-
 ...scan-insert-btree-secondary-index-open.1.ast |  12 +-
 ...d-index-ngram-secondary-index-nullable.1.ast |   2 +-
 ...erted-index-ngram-secondary-index-open.1.ast |   4 +-
 ...t-inverted-index-ngram-secondary-index.1.ast |   2 +-
 ...ed-index-word-secondary-index-nullable.1.ast |   2 +-
 ...verted-index-word-secondary-index-open.1.ast |   4 +-
 ...rt-inverted-index-word-secondary-index.1.ast |   2 +-
 ...-insert-rtree-secondary-index-nullable.1.ast |   4 +-
 ...scan-insert-rtree-secondary-index-open.1.ast |   4 +-
 .../scan-insert-rtree-secondary-index.1.ast     |   4 +-
 .../using-constant-merge-policy.1.ast           |  10 +-
 .../using-correlated-prefix-merge-policy.1.ast  |  10 +-
 .../using-no-merge-policy.1.ast                 |  10 +-
 .../using-prefix-merge-policy.1.ast             |  10 +-
 .../employee/q_01/q_01.1.ast                    |   6 +-
 .../employee/q_02/q_02.1.ast                    |   6 +-
 .../leftouterjoin-rtree.1.ast                   |  12 +-
 .../leftouterjoin/leftouterjoin.1.ast           |  12 +-
 .../external-indexing/rc-format/rc-format.1.ast |   4 +-
 .../rtree-index/rtree-index.1.ast               |   2 +-
 .../sequence-format/sequence-format.1.ast       |   4 +-
 .../text-format/text-format.1.ast               |   4 +-
 .../equality-predicate/equality-predicate.1.ast |   6 +-
 .../insert-with-secondary-btree.1.ast           |   6 +-
 .../insert-with-secondary-inverted-ngram.1.ast  |   6 +-
 .../insert-with-secondary-inverted-word.1.ast   |   6 +-
 .../insert-with-secondary-rtree.1.ast           |   6 +-
 .../filters/insert/insert.1.ast                 |   6 +-
 .../load-with-secondary-btree.1.ast             |   6 +-
 .../load-with-secondary-inverted-ngram.1.ast    |   6 +-
 .../load-with-secondary-inverted-word.1.ast     |   6 +-
 .../load-with-secondary-rtree.1.ast             |   6 +-
 .../filters/load/load.1.ast                     |   6 +-
 .../results_parser_sqlpp/flwor/at00/at00.1.ast  |   8 +-
 .../results_parser_sqlpp/flwor/at01/at01.1.ast  |   4 +-
 .../results_parser_sqlpp/flwor/at02/at02.1.ast  |  10 +-
 .../results_parser_sqlpp/flwor/at03/at03.1.ast  |   4 +-
 .../results_parser_sqlpp/flwor/at04/at04.1.ast  |   6 +-
 .../results_parser_sqlpp/flwor/at05/at05.1.ast  |   6 +-
 .../results_parser_sqlpp/flwor/at06/at06.1.ast  |   8 +-
 .../fuzzyjoin/dblp-1_1/dblp-1_1.1.ast           |   2 +-
 .../fuzzyjoin/dblp-1_2.1.1/dblp-1_2.1.ast       |   2 +-
 .../fuzzyjoin/dblp-1_2.1/dblp-1_2.1.ast         |   2 +-
 .../fuzzyjoin/dblp-1_2/dblp-1_2.1.ast           |   2 +-
 .../fuzzyjoin/dblp-2.1_5.3.1/dblp-2.1.ast       |   2 +-
 .../fuzzyjoin/dblp-2.2/dblp-2.1.ast             |   6 +-
 .../fuzzyjoin/dblp-2_1/dblp-2_1.1.ast           |   2 +-
 .../fuzzyjoin/dblp-2_2/dblp-2_2.1.ast           |   2 +-
 .../fuzzyjoin/dblp-2_3/dblp-2_3.1.ast           |   2 +-
 .../fuzzyjoin/dblp-2_4/dblp-2_4.1.ast           |   2 +-
 .../fuzzyjoin/dblp-2_5.1/dblp-2_5.1.ast         |   2 +-
 .../fuzzyjoin/dblp-2_5.2/dblp-2_5.1.ast         |   2 +-
 .../fuzzyjoin/dblp-2_5.3.1/dblp-2_5.1.ast       |   2 +-
 .../fuzzyjoin/dblp-2_5.3/dblp-2_5.1.ast         |   2 +-
 .../fuzzyjoin/dblp-2_5/dblp-2_5.1.ast           |   2 +-
 .../fuzzyjoin/dblp-3_1.1/dblp-3_1.1.ast         |   2 +-
 .../fuzzyjoin/dblp-3_1.2/dblp-3_1.1.ast         |   2 +-
 .../fuzzyjoin/dblp-3_1/dblp-3_1.1.ast           |   2 +-
 .../dblp-aqlplus_1/dblp-aqlplus_1.1.ast         |   2 +-
 .../dblp-aqlplus_2/dblp-aqlplus_2.1.ast         |   2 +-
 .../fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.1.ast |   4 +-
 .../fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.1.ast |   4 +-
 .../dblp-csx-2_5.3.1/dblp-csx-2_5.1.ast         |   4 +-
 .../fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.1.ast |   4 +-
 .../fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.1.ast   |   4 +-
 .../fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.1.ast |   4 +-
 .../fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.1.ast |   4 +-
 .../dblp-csx-3_5.3.1/dblp-csx-3_5.1.ast         |   4 +-
 .../fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.1.ast |   4 +-
 .../dblp-csx-3_5.4.1/dblp-csx-3_5.1.ast         |   4 +-
 .../fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.1.ast |   4 +-
 .../fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.1.ast   |   4 +-
 .../dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.1.ast |   4 +-
 .../dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.1.ast |   4 +-
 .../dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.1.ast |   4 +-
 .../dblp-csx-dblp-aqlplus_1.1.ast               |   4 +-
 .../fuzzyjoin/dblp-lookup_1/dblp-lookup_1.1.ast |   2 +-
 .../issue_251_dataset_hint_5.1.ast              |   2 +-
 .../btree-index-nested-loop-join.1.ast          |  14 +-
 .../btree-primary-equi-join.1.ast               |  16 +-
 .../btree-secondary-equi-join_01.1.ast          |   4 +-
 .../btree-secondary-equi-join_02.1.ast          |   4 +-
 .../btree-secondary-equi-join_03.1.ast          |   4 +-
 .../rtree-spatial-intersect-point.1.ast         |   2 +-
 .../probe-pidx-with-join-btree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-btree-sidx2.1.ast      |  12 +-
 .../probe-pidx-with-join-invidx-sidx1.1.ast     |  12 +-
 .../probe-pidx-with-join-invidx-sidx2.1.ast     |  12 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-rtree-sidx2.1.ast      |  12 +-
 ...ee-index-composite-key-mixed-intervals.1.ast |   4 +-
 .../btree-index-composite-key.1.ast             |   4 +-
 .../btree-index-rewrite-multiple.1.ast          |   6 +-
 .../cust-index-age-nullable.1.ast               |   8 +-
 .../inverted-index-ngram-contains.1.ast         |   2 +-
 ...ted-index-ngram-edit-distance-contains.1.ast |   2 +-
 ...verted-index-ngram-edit-distance-panic.1.ast |   2 +-
 ...-index-ngram-edit-distance-word-tokens.1.ast |   2 +-
 .../inverted-index-ngram-edit-distance.1.ast    |   2 +-
 .../inverted-index-ngram-jaccard.1.ast          |   2 +-
 ...verted-index-olist-edit-distance-panic.1.ast |   8 +-
 .../inverted-index-olist-edit-distance.1.ast    |   8 +-
 .../inverted-index-olist-jaccard.1.ast          |   8 +-
 .../inverted-index-ulist-jaccard.1.ast          |   8 +-
 .../inverted-index-word-contains.1.ast          |   2 +-
 .../inverted-index-word-jaccard.1.ast           |   2 +-
 .../orders-index-custkey-conjunctive-open.1.ast |   6 +-
 .../orders-index-custkey-conjunctive.1.ast      |   6 +-
 .../orders-index-custkey-open.1.ast             |   6 +-
 .../orders-index-custkey.1.ast                  |   6 +-
 .../range-search-open/range-search-open.1.ast   |   8 +-
 .../range-search/range-search.1.ast             |   8 +-
 .../rtree-secondary-index-circular-query.1.ast  |   2 +-
 .../rtree-secondary-index-nullable.1.ast        |   2 +-
 .../rtree-secondary-index-open.1.ast            |   2 +-
 .../rtree-secondary-index.1.ast                 |   2 +-
 .../ngram-edit-distance-inline.1.ast            |   8 +-
 .../ngram-edit-distance.1.ast                   |   8 +-
 .../ngram-jaccard-inline.1.ast                  |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ast           |   4 +-
 .../olist-edit-distance-inline.1.ast            |   8 +-
 .../olist-edit-distance.1.ast                   |   8 +-
 .../olist-jaccard-inline.1.ast                  |   8 +-
 .../olist-jaccard/olist-jaccard.1.ast           |   8 +-
 .../ulist-jaccard-inline.1.ast                  |   8 +-
 .../ulist-jaccard/ulist-jaccard.1.ast           |   8 +-
 .../word-jaccard-inline.1.ast                   |   4 +-
 .../word-jaccard/word-jaccard.1.ast             |   4 +-
 .../ngram-edit-distance-inline.1.ast            |   8 +-
 .../ngram-edit-distance.1.ast                   |   8 +-
 .../ngram-jaccard-inline.1.ast                  |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ast           |   4 +-
 .../olist-edit-distance-inline.1.ast            |   8 +-
 .../olist-edit-distance.1.ast                   |   8 +-
 .../olist-jaccard-inline.1.ast                  |   8 +-
 .../olist-jaccard/olist-jaccard.1.ast           |   8 +-
 .../ulist-jaccard-inline.1.ast                  |   8 +-
 .../ulist-jaccard/ulist-jaccard.1.ast           |   8 +-
 .../word-jaccard-inline.1.ast                   |   4 +-
 .../word-jaccard/word-jaccard.1.ast             |   4 +-
 .../query_issue285-2/query_issue285-2.1.ast     |   4 +-
 .../query_issue285/query_issue285.1.ast         |   4 +-
 .../query_issue658/query_issue658.1.ast         |   4 +-
 .../query_issue849-2/query_issue849-2.1.ast     |   2 +-
 .../query_issue849/query_issue849.1.ast         |   2 +-
 .../load/adm_binary/adm_bianry.2.ast            |   1 +
 .../load/adm_binary/adm_bianry.3.ast            |  10 +
 .../load/adm_binary/adm_binary.2.ast            |   1 -
 .../load/adm_binary/adm_binary.3.ast            |  10 -
 .../load/csv_01/csv_01.1.ast                    |   2 +-
 .../load/csv_02/csv_02.1.ast                    |   2 +-
 .../load/csv_03/csv_03.1.ast                    |   2 +-
 .../load/csv_04/csv_04.1.ast                    |   2 +-
 .../load/csv_05/csv_05.1.ast                    |   2 +-
 .../load/csv_06/csv_06.1.ast                    |   2 +-
 .../load/csv_07/csv_07.1.ast                    |   2 +-
 .../load/csv_08_header_cr/csv_08.1.ast          |   2 +-
 .../load/csv_08_header_crlf/csv_08.1.ast        |   2 +-
 .../load/csv_08_header_lf/csv_08.1.ast          |   2 +-
 .../duplicate-key-error.1.ast                   |   7 -
 .../duplicate-key-error.2.ast                   |   1 -
 .../load/escapes-err-1/escapes-err-1.1.ast      |   7 -
 .../load/escapes-err-1/escapes-err-1.2.ast      |   1 -
 .../load/issue14_query/issue14_query.1.ast      |   9 -
 .../load/issue14_query/issue14_query.2.ast      |   1 -
 .../load/issue14_query/issue14_query.3.ast      |  10 -
 .../load/issue289_query/issue289_query.1.ast    |   8 +-
 .../load/issue315_query/issue315_query.1.ast    |   9 -
 .../load/issue315_query/issue315_query.2.ast    |   1 -
 .../issue610_adm_token_end_collection.1.ast     |   4 +-
 .../load/issue650_query/issue650_query.1.ast    |  12 -
 .../load/issue650_query/issue650_query.2.ast    |   1 -
 .../type_promotion_0/type_promotion_0.1.ast     |  26 +-
 .../assign-reuse/assign-reuse.1.ast             |   4 +-
 .../misc/flushtest/flushtest.1.ast              |   6 +-
 .../misc/flushtest/flushtest.5.ast              |   0
 .../groupby-orderby-count.1.ast                 |   4 +-
 .../nested-loop-join_01.1.ast                   |   8 +-
 .../misc/prefix-search/prefix-search.1.ast      |   8 +-
 .../misc/stable_sort/stable_sort.1.ast          |   8 +-
 .../misc/string_eq_01/string_eq_01.1.ast        |   4 +-
 .../compact-dataset-and-its-indexes.1.ast       |  10 +-
 .../delete-from-loaded-dataset-with-index.1.ast |   6 +-
 .../drop-index/drop-index.1.ast                 |  26 +-
 .../insert-into-empty-dataset-with-index.1.ast  |   6 +-
 ...sert-into-loaded-dataset-with-index_01.1.ast |   6 +-
 ...sert-into-loaded-dataset-with-index_02.1.ast |   6 +-
 .../load-with-index/load-with-index.1.ast       |   8 +-
 .../load-with-ngram-index.1.ast                 |   8 +-
 .../load-with-rtree-index.1.ast                 |   8 +-
 .../load-with-word-index.1.ast                  |   8 +-
 .../nested-uuid-load/nested-uuid-load.1.ast     |   8 +-
 ...-delete-btree-secondary-index-nullable.1.ast |   8 +-
 ...d-index-ngram-secondary-index-nullable.1.ast |   2 +-
 ...e-inverted-index-ngram-secondary-index.1.ast |   2 +-
 ...ed-index-word-secondary-index-nullable.1.ast |   2 +-
 ...te-inverted-index-word-secondary-index.1.ast |   2 +-
 ...-delete-rtree-secondary-index-nullable.1.ast |   2 +-
 .../scan-delete-rtree-secondary-index.1.ast     |   2 +-
 ...-insert-btree-secondary-index-nullable.1.ast |   8 +-
 ...d-index-ngram-secondary-index-nullable.1.ast |   2 +-
 ...t-inverted-index-ngram-secondary-index.1.ast |   2 +-
 ...ed-index-word-secondary-index-nullable.1.ast |   2 +-
 ...rt-inverted-index-word-secondary-index.1.ast |   2 +-
 ...-insert-rtree-secondary-index-nullable.1.ast |   4 +-
 .../scan-insert-rtree-secondary-index.1.ast     |   4 +-
 .../adm-format/adm-format.1.ast                 |   2 +-
 .../leftouterjoin-rtree.1.ast                   |  12 +-
 .../leftouterjoin/leftouterjoin.1.ast           |  12 +-
 .../rtree-index/rtree-index.1.ast               |   2 +-
 .../btree-primary-equi-join.1.ast               |  16 +-
 .../btree-secondary-equi-join.1.ast             |   4 +-
 .../ngram-edit-distance-inline.1.ast            |   8 +-
 .../ngram-edit-distance.1.ast                   |   8 +-
 .../ngram-jaccard-inline.1.ast                  |   4 +-
 .../ngram-jaccard/ngram-jaccard.1.ast           |   4 +-
 .../rtree-spatial-intersect-point.1.ast         |   2 +-
 .../word-jaccard-inline.1.ast                   |   4 +-
 .../index-join/word-jaccard/word-jaccard.1.ast  |   4 +-
 .../probe-pidx-with-join-btree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-btree-sidx2.1.ast      |  12 +-
 .../probe-pidx-with-join-invidx-sidx1.1.ast     |  12 +-
 .../probe-pidx-with-join-invidx-sidx2.1.ast     |  12 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-rtree-sidx2.1.ast      |  12 +-
 ...ee-index-composite-key-mixed-intervals.1.ast |   8 +-
 .../btree-index-composite-key.1.ast             |   8 +-
 .../btree-index-rewrite-multiple.1.ast          |  12 +-
 .../cust-index-age-nullable.1.ast               |   8 +-
 .../inverted-index-ngram-contains.1.ast         |   2 +-
 ...ted-index-ngram-edit-distance-contains.1.ast |   2 +-
 ...verted-index-ngram-edit-distance-panic.1.ast |   2 +-
 ...-index-ngram-edit-distance-word-tokens.1.ast |   2 +-
 .../inverted-index-ngram-edit-distance.1.ast    |   2 +-
 .../inverted-index-ngram-jaccard.1.ast          |   2 +-
 ...verted-index-olist-edit-distance-panic.1.ast |   8 +-
 .../inverted-index-olist-edit-distance.1.ast    |   8 +-
 .../inverted-index-olist-jaccard.1.ast          |   8 +-
 .../inverted-index-ulist-jaccard.1.ast          |   8 +-
 .../inverted-index-word-contains.1.ast          |   2 +-
 .../inverted-index-word-jaccard.1.ast           |   2 +-
 .../orders-index-custkey-conjunctive-open.1.ast |   6 +-
 .../orders-index-custkey-conjunctive.1.ast      |   6 +-
 .../orders-index-custkey-open.1.ast             |   6 +-
 .../orders-index-custkey.1.ast                  |   6 +-
 .../range-search-open/range-search-open.1.ast   |   8 +-
 .../range-search/range-search.1.ast             |   8 +-
 .../rtree-secondary-index-nullable.1.ast        |   2 +-
 .../rtree-secondary-index-open.1.ast            |   2 +-
 .../rtree-secondary-index.1.ast                 |   2 +-
 .../leftouterjoin-rtree.1.ast                   |   6 +-
 .../leftouterjoin/leftouterjoin.1.ast           |   6 +-
 .../rtree-index/rtree-index.1.ast               |   2 +-
 .../bottom-closed-top-closed.1.ast              |  18 +-
 .../bottom-closed-top-open.1.ast                |  18 +-
 .../bottom-open-top-closed.1.ast                |  18 +-
 .../bottom-open-top-open.1.ast                  |  18 +-
 .../btree-secondary-equi-join.1.ast             |   6 +-
 .../ngram-edit-distance-inline.1.ast            |  14 +-
 .../ngram-edit-distance.1.ast                   |  14 +-
 .../ngram-jaccard-inline.1.ast                  |   6 +-
 .../ngram-jaccard/ngram-jaccard.1.ast           |   6 +-
 .../rtree-spatial-intersect-point.1.ast         |   4 +-
 .../word-jaccard-inline.1.ast                   |   6 +-
 .../index-join/word-jaccard/word-jaccard.1.ast  |   6 +-
 .../probe-pidx-with-join-btree-sidx1.1.ast      |  10 +-
 .../probe-pidx-with-join-btree-sidx2.1.ast      |  10 +-
 .../probe-pidx-with-join-invidx-sidx2.1.ast     |  12 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-rtree-sidx2.1.ast      |  12 +-
 ...ee-index-composite-key-mixed-intervals.1.ast |   8 +-
 .../btree-index-composite-key.1.ast             |   8 +-
 .../btree-index-rewrite-multiple.1.ast          |  10 +-
 .../inverted-index-ngram-contains.1.ast         |   4 +-
 ...ted-index-ngram-edit-distance-contains.1.ast |   4 +-
 ...verted-index-ngram-edit-distance-panic.1.ast |   4 +-
 .../inverted-index-ngram-edit-distance.1.ast    |   4 +-
 .../inverted-index-ngram-jaccard.1.ast          |   4 +-
 .../inverted-index-word-contains.1.ast          |   4 +-
 .../inverted-index-word-jaccard.1.ast           |   4 +-
 .../orders-index-custkey-conjunctive.1.ast      |  10 +-
 .../orders-index-custkey.1.ast                  |  10 +-
 .../range-search/range-search.1.ast             |  14 +-
 .../rtree-secondary-index.1.ast                 |   2 +-
 .../numeric/add_double/add_double.2.ast         |   0
 .../numeric/add_double/add_double.3.ast         |  98 --
 .../numeric/add_float/add_float.2.ast           |   0
 .../numeric/add_float/add_float.3.ast           |  98 --
 .../numeric/add_int16/add_int16.2.ast           |   0
 .../numeric/add_int16/add_int16.3.ast           |  98 --
 .../numeric/add_int32/add_int32.2.ast           |   0
 .../numeric/add_int32/add_int32.3.ast           |  98 --
 .../numeric/add_int64/add_int64.2.ast           |   0
 .../numeric/add_int64/add_int64.3.ast           |  98 --
 .../numeric/add_int8/add_int8.2.ast             |   0
 .../numeric/add_int8/add_int8.3.ast             |  98 --
 .../numeric/divide_double/divide_double.2.ast   |   0
 .../numeric/divide_double/divide_double.3.ast   |  98 --
 .../numeric/divide_float/divide_float.2.ast     |   0
 .../numeric/divide_float/divide_float.3.ast     |  98 --
 .../numeric/divide_int16/divide_int16.2.ast     |   0
 .../numeric/divide_int16/divide_int16.3.ast     |  98 --
 .../numeric/divide_int32/divide_int32.2.ast     |   0
 .../numeric/divide_int32/divide_int32.3.ast     |  98 --
 .../numeric/divide_int64/divide_int64.2.ast     |   0
 .../numeric/divide_int64/divide_int64.3.ast     |  98 --
 .../numeric/divide_int8/divide_int8.2.ast       |   0
 .../numeric/divide_int8/divide_int8.3.ast       |  98 --
 .../numeric/multiply_double.ast                 | 103 ---
 .../multiply_double/multiply_double.2.ast       |   0
 .../multiply_double/multiply_double.3.ast       |  98 --
 .../numeric/multiply_float.ast                  | 104 ---
 .../numeric/multiply_float/multiply_float.2.ast |   0
 .../numeric/multiply_float/multiply_float.3.ast |  98 --
 .../numeric/multiply_int16.ast                  | 103 ---
 .../numeric/multiply_int16/multiply_int16.2.ast |   0
 .../numeric/multiply_int16/multiply_int16.3.ast |  98 --
 .../numeric/multiply_int32.ast                  | 103 ---
 .../numeric/multiply_int32/multiply_int32.2.ast |   0
 .../numeric/multiply_int32/multiply_int32.3.ast |  98 --
 .../numeric/multiply_int64.ast                  | 104 ---
 .../numeric/multiply_int64/multiply_int64.2.ast |   0
 .../numeric/multiply_int64/multiply_int64.3.ast |  98 --
 .../numeric/multiply_int8.ast                   | 103 ---
 .../numeric/multiply_int8/multiply_int8.2.ast   |   0
 .../numeric/multiply_int8/multiply_int8.3.ast   |  98 --
 .../subtract_double/subtract_double.2.ast       |   0
 .../subtract_double/subtract_double.3.ast       |  98 --
 .../numeric/subtract_float/subtract_float.2.ast |   0
 .../numeric/subtract_float/subtract_float.3.ast |  98 --
 .../numeric/subtract_int16/subtract_int16.2.ast |   0
 .../numeric/subtract_int16/subtract_int16.3.ast |  98 --
 .../numeric/subtract_int32/subtract_int32.2.ast |   0
 .../numeric/subtract_int32/subtract_int32.3.ast |  98 --
 .../numeric/subtract_int64/subtract_int64.2.ast |   0
 .../numeric/subtract_int64/subtract_int64.3.ast |  98 --
 .../numeric/subtract_int8/subtract_int8.2.ast   |   0
 .../numeric/subtract_int8/subtract_int8.3.ast   |  98 --
 .../unary-minus_null/unary-minus_null.2.ast     |   0
 .../unary-minus_null/unary-minus_null.3.ast     |  14 -
 .../heterog-list-ordered01.1.ast                |   4 +-
 .../heterog-list01/heterog-list01.1.ast         |   4 +-
 .../open-closed-01/open-closed-01.1.ast         |   2 +-
 .../open-closed-24/open-closed-24.1.ast         |   2 +-
 .../open-closed-25/open-closed-25.1.ast         |   2 +-
 .../open-closed-26/open-closed-26.1.ast         |   2 +-
 .../open-closed-32/open-closed-32.1.ast         |   2 +-
 .../open-closed-33/open-closed-33.1.ast         |   2 +-
 .../query-issue196/query-issue196.1.ast         |   4 +-
 .../query-issue208/query-issue208.1.ast         |   6 +-
 .../query-issue236/query-issue236.1.ast         |   6 +-
 .../query-issue258/query-issue258.1.ast         |   2 +-
 .../query-issue343-2/query-issue343-2.1.ast     |   6 +-
 .../query-issue343/query-issue343.1.ast         |   4 +-
 .../query-issue377/query-issue377.1.ast         |   4 +-
 .../query-issue410/query-issue410.1.ast         |   2 +-
 .../query-issue423-2/query-issue423-2.1.ast     |   2 +-
 .../query-issue423/query-issue423.1.ast         |   2 +-
 .../query-issue453-2/query-issue453-2.1.ast     |   6 +-
 .../query-issue453/query-issue453.1.ast         |   6 +-
 .../query-issue456/query-issue456.1.ast         |   6 +-
 .../query-issue487/query-issue487.1.ast         |   2 +-
 .../query-issue592/query-issue592.1.ast         |   4 +-
 .../query-issue625/query-issue625.1.ast         |   4 +-
 .../query-proposal/query-proposal.1.ast         |   6 +-
 .../query-proposal02/query-proposal02.1.ast     |   6 +-
 .../enforced-field-name-collision.1.ast         |   2 +-
 .../enforced-field-name-collision.1.ast         |   2 +-
 .../index-on-closed-type.1.ast                  |   2 +-
 .../missing-enforce-statement.1.ast             |   2 +-
 .../leftouterjoin-rtree.1.ast                   |   6 +-
 .../leftouterjoin/leftouterjoin.1.ast           |   6 +-
 .../rtree-index/rtree-index.1.ast               |   2 +-
 .../btree-secondary-equi-join.1.ast             |   6 +-
 .../ngram-edit-distance-inline.1.ast            |  14 +-
 .../ngram-edit-distance.1.ast                   |  14 +-
 .../ngram-jaccard-inline.1.ast                  |   6 +-
 .../ngram-jaccard/ngram-jaccard.1.ast           |   6 +-
 .../rtree-spatial-intersect-point.1.ast         |   4 +-
 .../word-jaccard-inline.1.ast                   |   6 +-
 .../index-join/word-jaccard/word-jaccard.1.ast  |   6 +-
 .../probe-pidx-with-join-btree-sidx1.1.ast      |  10 +-
 .../probe-pidx-with-join-btree-sidx2.1.ast      |  10 +-
 .../probe-pidx-with-join-invidx-sidx2.1.ast     |  12 +-
 .../probe-pidx-with-join-rtree-sidx1.1.ast      |  12 +-
 .../probe-pidx-with-join-rtree-sidx2.1.ast      |  12 +-
 ...ee-index-composite-key-mixed-intervals.1.ast |   8 +-
 .../btree-index-composite-key.1.ast             |   8 +-
 .../btree-index-rewrite-multiple.1.ast          |  10 +-
 .../inverted-index-ngram-contains.1.ast         |   4 +-
 ...ted-index-ngram-edit-distance-contains.1.ast |   4 +-
 ...verted-index-ngram-edit-distance-panic.1.ast |   4 +-
 ...-index-ngram-edit-distance-word-tokens.1.ast |   4 +-
 .../inverted-index-ngram-edit-distance.1.ast    |   4 +-
 .../inverted-index-ngram-jaccard.1.ast          |   4 +-
 .../inverted-index-word-contains.1.ast          |   4 +-
 .../inverted-index-word-jaccard.1.ast           |   4 +-
 .../orders-index-custkey-conjunctive.1.ast      |  10 +-
 .../orders-index-custkey.1.ast                  |  10 +-
 .../range-search/range-search.1.ast             |  14 +-
 .../rtree-secondary-index.1.ast                 |   4 +-
 .../quantifiers/somesat_02/somesat_02.1.ast     |  12 +-
 .../order-by-exception_01.1.ast                 |  11 -
 .../order-by-exception_01.2.ast                 |   2 -
 .../order-by-exception_01.3.ast                 |   1 -
 .../order-by-exception_01.4.ast                 |  17 -
 .../order-by-exception_02.1.ast                 |  11 -
 .../order-by-exception_02.2.ast                 |   2 -
 .../order-by-exception_02.3.ast                 |   1 -
 .../order-by-exception_02.4.ast                 |  17 -
 .../range-hints/order-by/order-by.1.ast         |   6 +-
 .../access-nested-fields.1.ast                  |  18 +-
 .../field-access-on-open-field.1.ast            |   2 +-
 .../highly-nested-open.1.ast                    |  18 +-
 .../highly-nested-mixed.1.ast                   |  18 +-
 .../highly-nested-open/highly-nested-open.1.ast |  18 +-
 .../tiny-social-example.1.ast                   |  16 +-
 .../tiny-social-example-no-complex-types.1.ast  |  26 +-
 .../tiny-social-example-only-lists.1.ast        |  28 +-
 .../tiny-social-example-only-records.1.ast      |  26 +-
 ...pen-closed-fieldname-conflict_issue173.1.ast |   2 +-
 .../results_parser_sqlpp/scan/10/10.1.ast       |   2 +-
 .../results_parser_sqlpp/scan/20/20.1.ast       |   2 +-
 .../results_parser_sqlpp/scan/30/30.1.ast       |   2 +-
 .../scan/alltypes_01/alltypes_01.1.ast          |  12 +-
 .../scan/alltypes_02/alltypes_02.1.ast          |  12 +-
 .../invalid-scan-syntax.1.ast                   |   4 +-
 .../issue238_query_1/issue238_query_1.1.ast     |   2 +-
 .../issue238_query_2/issue238_query_2.1.ast     |   2 +-
 .../numeric_types_01/numeric_types_01.1.ast     |  10 +-
 .../spatial_types_01/spatial_types_01.1.ast     |   2 +-
 .../scan/temp_types_01/temp_types_01.1.ast      |   2 +-
 .../count-nullable/count-nullable.1.ast         |   8 +-
 .../cust-filter/cust-filter.1.ast               |   8 +-
 .../semistructured/has-param1/has-param1.1.ast  |   4 +-
 .../fuzzyeq-edit-distance.1.ast                 |   2 +-
 .../fuzzyeq-similarity-jaccard.1.ast            |   2 +-
 .../similarity-jaccard-check_query.1.ast        |   2 +-
 .../similarity-jaccard-sorted-check_query.1.ast |   2 +-
 .../similarity-jaccard-sorted_query.1.ast       |   2 +-
 .../similarity-jaccard_query.1.ast              |   2 +-
 .../cell-aggregation-with-filtering.1.ast       |   4 +-
 .../cell-aggregation/cell-aggregation.1.ast     |   2 +-
 .../circle-intersect-circle.1.ast               |   2 +-
 .../create-rtree-index/create-rtree-index.1.ast |   2 +-
 .../distance-between-points.1.ast               |   2 +-
 .../line-intersect-circle.1.ast                 |   2 +-
 .../line-intersect-line.1.ast                   |   2 +-
 .../line-intersect-polygon.1.ast                |   2 +-
 .../line-intersect-rectangle.1.ast              |   2 +-
 .../point-equals-point/point-equals-point.1.ast |   2 +-
 .../point-in-circle/point-in-circle.1.ast       |   2 +-
 .../point-in-polygon/point-in-polygon.1.ast     |   2 +-
 .../point-in-rectangle/point-in-rectangle.1.ast |   2 +-
 .../spatial/point-on-line/point-on-line.1.ast   |   2 +-
 .../polygon-intersect-circle.1.ast              |   2 +-
 .../polygon-intersect-polygon.1.ast             |   2 +-
 .../polygon-intersect-rectangle.1.ast           |   2 +-
 .../rectangle-intersect-circle.1.ast            |   2 +-
 .../rectangle-intersect-rectangle.1.ast         |   2 +-
 .../spatial/spatial-area/spatial-area.1.ast     |   2 +-
 .../string/cpttostr01/cpttostr01.1.ast          |   4 +-
 .../string/end-with1/end-with1.1.ast            |   0
 .../string/end-with1/end-with1.2.ast            |   0
 .../string/end-with1/end-with1.3.ast            |  12 -
 .../string/end-with2/end-with2.1.ast            |   0
 .../string/end-with2/end-with2.2.ast            |   0
 .../string/end-with2/end-with2.3.ast            |  12 -
 .../string/end-with3/end-with3.1.ast            |   0
 .../string/end-with3/end-with3.2.ast            |   0
 .../string/end-with3/end-with3.3.ast            |  12 -
 .../string/end-with4/end-with4.1.ast            |   0
 .../string/end-with4/end-with4.2.ast            |   0
 .../string/end-with4/end-with4.3.ast            |  12 -
 .../string/end-with5/end-with5.1.ast            |   0
 .../string/end-with5/end-with5.2.ast            |   0
 .../string/end-with5/end-with5.3.ast            |  52 --
 .../string/ends-with_01/ends-with_01.1.ast      |   0
 .../string/ends-with_01/ends-with_01.2.ast      |   0
 .../string/ends-with_01/ends-with_01.3.ast      |  26 -
 .../string/endwith02/endwith02.1.ast            |   0
 .../string/endwith02/endwith02.2.ast            |   0
 .../string/endwith02/endwith02.3.ast            |  43 -
 .../string/endwith03/endwith03.1.ast            |   7 -
 .../string/endwith03/endwith03.2.ast            |   1 -
 .../string/endwith03/endwith03.3.ast            |  26 -
 .../string/matches05/matches05.1.ast            |   2 +-
 .../string/start-with1/start-with1.1.ast        |   0
 .../string/start-with1/start-with1.2.ast        |   0
 .../string/start-with1/start-with1.3.ast        |  12 -
 .../string/start-with2/start-with2.1.ast        |   0
 .../string/start-with2/start-with2.2.ast        |   0
 .../string/start-with2/start-with2.3.ast        |  12 -
 .../string/start-with3/start-with3.1.ast        |   0
 .../string/start-with3/start-with3.2.ast        |   0
 .../string/start-with3/start-with3.3.ast        |  12 -
 .../string/start-with4/start-with4.1.ast        |   0
 .../string/start-with4/start-with4.2.ast        |   0
 .../string/start-with4/start-with4.3.ast        |  52 --
 .../string/start-with5/start-with5.1.ast        |   0
 .../string/start-with5/start-with5.2.ast        |   0
 .../string/start-with5/start-with5.3.ast        |  12 -
 .../string/starts-with_01/starts-with_01.1.ast  |   0
 .../string/starts-with_01/starts-with_01.2.ast  |   0
 .../string/starts-with_01/starts-with_01.3.ast  |  26 -
 .../string/startwith02/startwith02.1.ast        |   0
 .../string/startwith02/startwith02.2.ast        |   0
 .../string/startwith02/startwith02.3.ast        |  77 --
 .../string/strconcat01/strconcat01.1.ast        |   2 +-
 .../delete-from-loaded-dataset-with-index.1.ast |  10 +-
 .../delete-from-loaded-dataset.1.ast            |  10 +-
 .../drop-empty-secondary-indexes.1.ast          |   2 +-
 .../temp-dataset/drop-index/drop-index.1.ast    |  26 +-
 .../empty-load-with-index.1.ast                 |   8 +-
 .../insert-and-scan-dataset-with-index.1.ast    |   4 +-
 .../insert-and-scan-dataset.1.ast               |   2 +-
 .../q01_pricing_summary_report_nt.1.ast         |   8 +-
 .../scan-delete-rtree-secondary-index.1.ast     |   2 +-
 .../scan-insert-persistent-to-temp.1.ast        |   4 +-
 .../scan-insert-rtree-secondary-index.1.ast     |   4 +-
 .../scan-insert-temp-to-persistent.1.ast        |   4 +-
 .../insert_from_ext_ds/insert_from_ext_ds.1.ast |   4 +-
 .../insert_from_ext_ds_2.1.ast                  |   4 +-
 .../interval_bin_gby_0/interval_bin_gby_0.1.ast |   2 +-
 .../interval_bin_gby_1/interval_bin_gby_1.1.ast |   2 +-
 .../overlap_bins_gby_0/overlap_bins_gby_0.1.ast |   4 +-
 .../overlap_bins_gby_1/overlap_bins_gby_1.1.ast |   4 +-
 .../overlap_bins_gby_3/overlap_bins_gby_3.1.ast |   4 +-
 .../tinysocial-suite-open/aggregate.27.ast      | 105 ---
 .../tinysocial-suite-open/group-by.26.ast       | 119 ---
 .../query-ASTERIXDB-1263.23.ast                 |  81 --
 .../query-ASTERIXDB-1329.24.ast                 |  84 --
 .../query-ASTERIXDB-1331.25.ast                 |  41 -
 .../tinysocial-suite.1.ast                      |   4 +-
 .../tinysocial-suite.23.ast                     |  81 ++
 .../tinysocial-suite.24.ast                     |  84 ++
 .../tinysocial-suite.25.ast                     |  41 +
 .../tinysocial-suite.26.ast                     | 119 +++
 .../tinysocial-suite.27.ast                     | 105 +++
 .../query-ASTERIXDB-1263.23.ast                 |  81 --
 .../tinysocial-suite/tinysocial-suite.1.ast     |  16 +-
 .../tinysocial-suite/tinysocial-suite.23.ast    |  81 ++
 .../q01_pricing_summary_report_nt.1.ast         |   8 +-
 .../q02_minimum_cost_supplier.1.ast             |  40 +-
 .../q03_shipping_priority_nt.1.ast              |  40 +-
 .../q04_order_priority/q04_order_priority.1.ast |  40 +-
 .../q05_local_supplier_volume.1.ast             |  40 +-
 .../q06_forecast_revenue_change.1.ast           |  40 +-
 .../q07_volume_shipping.1.ast                   |  40 +-
 .../q08_national_market_share.1.ast             |  40 +-
 .../q09_product_type_profit_nt.1.ast            |  40 +-
 .../q10_returned_item/q10_returned_item.1.ast   |  40 +-
 .../q10_returned_item_int64.1.ast               |  40 +-
 .../q11_important_stock.1.ast                   |  40 +-
 .../q12_shipping/q12_shipping.1.ast             |  40 +-
 .../q13_customer_distribution.1.ast             |  40 +-
 .../q14_promotion_effect.1.ast                  |  40 +-
 .../q15_top_supplier/q15_top_supplier.1.ast     |  40 +-
 .../q16_parts_supplier_relationship.1.ast       |  40 +-
 .../q17_large_gby_variant.1.ast                 |  40 +-
 .../q17_small_quantity_order_revenue.1.ast      |  40 +-
 .../q18_large_volume_customer.1.ast             |  40 +-
 .../q19_discounted_revenue.1.ast                |  40 +-
 .../q20_potential_part_promotion.1.ast          |  40 +-
 .../q21_suppliers_who_kept_orders_waiting.1.ast |  40 +-
 .../q22_global_sales_opportunity.1.ast          |  40 +-
 .../query-issue601/query-issue601.1.ast         |   8 +-
 .../query-issue638/query-issue638.1.ast         |  40 +-
 .../query-issue785-2/query-issue785-2.1.ast     |  20 +-
 .../query-issue785/query-issue785.1.ast         |  20 +-
 .../query-issue786/query-issue786.1.ast         |  20 +-
 .../tpch/distinct_by/distinct_by.1.ast          |   8 +-
 .../tpch/group_no_agg/group_no_agg.1.ast        |   2 +-
 .../tpch/nest_aggregate/nest_aggregate.1.ast    |  20 +-
 .../q01_pricing_summary_report_nt.1.ast         |   8 +-
 .../q02_minimum_cost_supplier.1.ast             |  40 +-
 .../q03_shipping_priority_nt.1.ast              |  40 +-
 .../q04_order_priority/q04_order_priority.1.ast |  40 +-
 .../q05_local_supplier_volume.1.ast             |  40 +-
 .../q06_forecast_revenue_change.1.ast           |  40 +-
 .../q07_volume_shipping.1.ast                   |  40 +-
 .../q08_national_market_share.1.ast             |  40 +-
 .../q09_product_type_profit_nt.1.ast            |  40 +-
 .../q10_returned_item/q10_returned_item.1.ast   |  40 +-
 .../q10_returned_item_int64.1.ast               |  40 +-
 .../q11_important_stock.1.ast                   |  40 +-
 .../tpch/q12_shipping/q12_shipping.1.ast        |  40 +-
 .../q13_customer_distribution.1.ast             |  40 +-
 .../q14_promotion_effect.1.ast                  |  40 +-
 .../q15_top_supplier/q15_top_supplier.1.ast     |  40 +-
 .../q16_parts_supplier_relationship.1.ast       |  40 +-
 .../q17_large_gby_variant.1.ast                 |  40 +-
 .../q18_large_volume_customer.1.ast             |  40 +-
 .../q19_discounted_revenue.1.ast                |  40 +-
 .../q20_potential_part_promotion.1.ast          |  40 +-
 .../q21_suppliers_who_kept_orders_waiting.1.ast |  40 +-
 .../q22_global_sales_opportunity.1.ast          |  40 +-
 .../tpch/query-issue562/query-issue562.1.ast    |  40 +-
 .../tpch/query-issue601/query-issue601.1.ast    |   8 +-
 .../tpch/query-issue638/query-issue638.1.ast    |  40 +-
 .../query-issue785-2/query-issue785-2.1.ast     |  20 +-
 .../tpch/query-issue785/query-issue785.1.ast    |  20 +-
 .../tpch/query-issue786/query-issue786.1.ast    |  20 +-
 .../query-issue810-2/query-issue810-2.1.ast     |   8 +-
 .../query-issue810-3/query-issue810-3.1.ast     |   8 +-
 .../tpch/query-issue810/query-issue810.1.ast    |   8 +-
 .../query-issue827-2/query-issue827-2.1.ast     |   8 +-
 .../tpch/query-issue827/query-issue827.1.ast    |   8 +-
 .../opentype_orderby_01.1.ast                   |  18 +-
 ...losedtype_field_vs_closedtype_field_01.1.ast |  18 +-
 ...losedtype_field_vs_closedtype_field_02.1.ast |  18 +-
 ...losedtype_field_vs_closedtype_field_03.1.ast |  18 +-
 ...losedtype_field_vs_closedtype_field_04.1.ast |  18 +-
 ...losedtype_field_vs_closedtype_field_05.1.ast |   8 +-
 ...motion_closedtype_field_vs_constant_01.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_02.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_03.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_04.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_05.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_06.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_07.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_08.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_09.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_10.1.ast |  18 +-
 ...motion_closedtype_field_vs_constant_11.1.ast |  18 +-
 ..._closedtype_field_vs_opentype_field_01.1.ast |  18 +-
 ..._closedtype_field_vs_opentype_field_02.1.ast |  18 +-
 ..._closedtype_field_vs_opentype_field_03.1.ast |  18 +-
 ..._closedtype_field_vs_opentype_field_04.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_01.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_02.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_03.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_04.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_05.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_06.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_07.1.ast |  18 +-
 ...romotion_opentype_field_vs_constant_08.1.ast |  18 +-
 ...on_opentype_field_vs_opentype_field_01.1.ast |  18 +-
 ...on_opentype_field_vs_opentype_field_02.1.ast |  18 +-
 .../types/record01/record01.1.ast               |   2 +-
 .../type_promotion_0/type_promotion_0.1.ast     |  12 +-
 .../type_promotion_1/type_promotion_1.1.ast     |  18 +-
 .../union/union/union.1.ast                     |  13 -
 .../union/union/union.2.ast                     |   1 -
 .../union/union/union.3.ast                     |   0
 .../user-defined-functions/f01/f01.3.ast        |   2 +-
 .../query-issue244/query-issue244.1.ast         |   2 +-
 .../user-defined-functions/udf09/udf09.1.ast    |   2 +-
 .../src/test/resources/runtimets/testsuite.xml  |  68 +-
 .../resources/runtimets/testsuite_sqlpp.xml     |  77 +-
 .../runtimets/testsuite_sqlpp_parser.xml        |   6 +
 asterixdb/asterix-client-helper/pom.xml         |  10 +
 .../clienthelper/AsterixHelperExecution.java    |   3 +
 .../clienthelper/commands/ClientCommand.java    |   7 +-
 .../commands/GetClusterStateCommand.java        |  43 +-
 .../clienthelper/commands/RemoteCommand.java    |  17 +-
 .../commands/ShutdownAllCommand.java            |  28 +
 .../clienthelper/commands/ShutdownCommand.java  |   8 +-
 .../commands/WaitForClusterCommand.java         |  45 +-
 .../common/api/AsterixThreadFactory.java        |  17 +-
 .../common/api/IAsterixAppRuntimeContext.java   |   2 -
 .../common/api/IDatasetLifecycleManager.java    |  18 +-
 .../asterix/common/app/SessionConfig.java       | 264 ------
 .../config/AsterixReplicationProperties.java    |  16 +-
 .../common/config/ClusterProperties.java        |  75 ++
 .../common/context/BaseOperationTracker.java    |   1 -
 .../context/CorrelatedPrefixMergePolicy.java    |   4 +-
 .../CorrelatedPrefixMergePolicyFactory.java     |   4 +-
 .../asterix/common/context/DatasetInfo.java     | 187 ++++
 .../common/context/DatasetLifecycleManager.java | 532 ++++-------
 .../asterix/common/context/DatasetResource.java | 142 +++
 .../context/DatasetVirtualBufferCaches.java     |  83 ++
 .../asterix/common/context/IndexInfo.java       |  45 +
 .../org/apache/asterix/common/context/Info.java |  53 ++
 .../context/PrimaryIndexOperationTracker.java   |   1 -
 .../messaging/AbstractApplicationMessage.java   |  36 -
 .../messaging/api/IApplicationMessage.java      |  24 +-
 .../api/IApplicationMessageCallback.java        |  30 -
 .../common/messaging/api/ICCMessageBroker.java  |   1 -
 .../common/messaging/api/INCMessageBroker.java  |   4 +-
 .../IAsterixAppRuntimeContextProvider.java      |   3 -
 .../asterix/common/utils/ServletUtil.java       |   3 +-
 .../apache/asterix/test/aql/TestExecutor.java   | 290 ++++--
 .../asterix/test/base/AsterixTestHelper.java    |  34 -
 .../asterix/test/base/ComparisonException.java  |  27 +
 .../asterix/test/base/RetainLogsRule.java       |  57 ++
 .../asterix/test/base/TestMethodTracer.java     |  62 ++
 .../src/main/markdown/sqlpp/0_toc.md            | 119 ++-
 .../src/main/markdown/sqlpp/1_intro.md          |   2 +-
 .../src/main/markdown/sqlpp/3_query.md          |  32 +-
 .../src/site/markdown/aql/datamodel.md          | 245 ++---
 .../asterix-doc/src/site/markdown/index.md      |   2 +-
 .../src/site/markdown/sqlpp/primer-sqlpp.md     | 925 +++++++++++++++++++
 .../asterix-doc/src/site/resources/data/chm.adm |  12 +
 .../asterix-doc/src/site/resources/data/chu.adm |   4 +
 .../asterix-doc/src/site/resources/data/gbm.adm |  15 +
 .../asterix-doc/src/site/resources/data/gbu.adm |  10 +
 asterixdb/asterix-doc/src/site/site.xml         |  57 +-
 .../management/AsterixEventServiceClient.java   |   2 +-
 .../builder/AbstractExperiment7Builder.java     |  34 +-
 .../builder/AbstractExperiment8Builder.java     |  30 +-
 .../builder/AbstractExperiment9Builder.java     |  40 +-
 .../experiment/builder/Experiment8ABuilder.java |   4 +-
 .../experiment/builder/Experiment8BBuilder.java |   8 +-
 .../experiment/builder/Experiment8CBuilder.java |   8 +-
 .../experiment/builder/Experiment8DBuilder.java |   8 +-
 .../aql/agg.sqlpp                               |   2 +-
 .../aql/agg_bench/agg-3-months.sqlpp            |   2 +-
 .../aql/agg_bench/agg-6-months.sqlpp            |   2 +-
 .../aql/agg_bench/agg-day.sqlpp                 |   2 +-
 .../aql/agg_bench/agg-hour.sqlpp                |   2 +-
 .../aql/agg_bench/agg-minute.sqlpp              |   2 +-
 .../aql/agg_bench/agg-month.sqlpp               |   2 +-
 .../aql/agg_bench/agg-week.sqlpp                |   2 +-
 .../aql/agg_bench/countjoin-3-months.sqlpp      |   2 +-
 .../aql/agg_bench/countjoin-6-months.sqlpp      |   2 +-
 .../aql/agg_bench/countjoin-day.sqlpp           |   2 +-
 .../aql/agg_bench/countjoin-hour.sqlpp          |   2 +-
 .../aql/agg_bench/countjoin-minute.sqlpp        |   2 +-
 .../aql/agg_bench/countjoin-month.sqlpp         |   2 +-
 .../aql/agg_bench/countjoin-week.sqlpp          |   2 +-
 .../agg_bench/countjoin_index-3-months.sqlpp    |   2 +-
 .../agg_bench/countjoin_index-6-months.sqlpp    |   2 +-
 .../aql/agg_bench/countjoin_index-day.sqlpp     |   2 +-
 .../aql/agg_bench/countjoin_index-hour.sqlpp    |   2 +-
 .../aql/agg_bench/countjoin_index-minute.sqlpp  |   2 +-
 .../aql/agg_bench/countjoin_index-month.sqlpp   |   2 +-
 .../aql/agg_bench/countjoin_index-week.sqlpp    |   2 +-
 .../aql/agg_bench/joingby-3-months.sqlpp        |   4 +-
 .../aql/agg_bench/joingby-6-months.sqlpp        |   4 +-
 .../aql/agg_bench/joingby-day.sqlpp             |   4 +-
 .../aql/agg_bench/joingby-hour.sqlpp            |   4 +-
 .../aql/agg_bench/joingby-minute.sqlpp          |   4 +-
 .../aql/agg_bench/joingby-month.sqlpp           |   4 +-
 .../aql/agg_bench/joingby-week.sqlpp            |   4 +-
 .../aql/agg_bench/joingby_index-3-months.sqlpp  |   4 +-
 .../aql/agg_bench/joingby_index-6-months.sqlpp  |   4 +-
 .../aql/agg_bench/joingby_index-day.sqlpp       |   4 +-
 .../aql/agg_bench/joingby_index-hour.sqlpp      |   4 +-
 .../aql/agg_bench/joingby_index-minute.sqlpp    |   4 +-
 .../aql/agg_bench/joingby_index-month.sqlpp     |   4 +-
 .../aql/agg_bench/joingby_index-week.sqlpp      |   4 +-
 .../aql/agg_bench/select-all.sqlpp              |  21 +
 .../api/IExternalDataSourceFactory.java         |   4 +-
 .../feed/runtime/AdapterRuntimeManager.java     |  38 +-
 .../indexing/FilesIndexDescription.java         |   8 +-
 .../factory/TwitterFirehoseStreamFactory.java   |   4 +-
 .../FeedIntakeOperatorNodePushable.java         |   2 +-
 .../external/util/ExternalDataConstants.java    |   2 +
 .../external/util/ExternalDataUtils.java        |   4 +
 .../apache/asterix/external/util/FeedUtils.java |   7 +-
 .../apache/asterix/external/util/HDFSUtils.java |   4 +-
 .../record/reader/kv/KVTestReaderFactory.java   |   4 +-
 .../installer/test/AbstractExecutionIT.java     |  23 +-
 .../test/AsterixClusterLifeCycleIT.java         |   2 +-
 .../test/AsterixExternalLibraryIT.java          |   6 +-
 .../installer/test/AsterixLifecycleIT.java      |   2 +-
 .../asterix/installer/test/ReplicationIT.java   |   2 +-
 .../installer/transaction/DmlRecoveryIT.java    |   9 +-
 .../installer/transaction/RecoveryIT.java       |   7 +-
 .../dataverseDataset/dataverseDataset.1.adm     |   1 +
 .../lang/aql/rewrites/AqlQueryRewriter.java     |  81 +-
 .../AqlBuiltinFunctionRewriteVisitor.java       |  47 +
 .../AbstractAqlSimpleExpressionVisitor.java     | 225 +++++
 .../asterix-lang-aql/src/main/javacc/AQL.jj     |  10 +-
 .../lang/common/clause/GroupbyClause.java       |   4 +-
 .../expression/TypeReferenceExpression.java     |   7 +-
 .../lang/common/parser/ScopeChecker.java        |  95 +-
 .../lang/common/util/CommonFunctionMapUtil.java |  76 ++
 .../asterix/lang/common/util/FunctionUtil.java  | 110 +++
 .../lang/common/util/LangRecordParseUtil.java   |  58 +-
 .../lang/common/visitor/FormatPrintVisitor.java |   6 +-
 .../lang/common/visitor/QueryPrintVisitor.java  |   6 +-
 .../lang/sqlpp/rewrites/SqlppQueryRewriter.java |  70 +-
 .../SqlppGlobalAggregationSugarVisitor.java     |   1 -
 .../lang/sqlpp/util/FunctionMapUtil.java        |  60 +-
 .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 112 ++-
 .../apache/asterix/metadata/MetadataNode.java   |  14 +-
 .../metadata/bootstrap/MetadataBootstrap.java   | 264 +++---
 .../bootstrap/MetadataBuiltinEntities.java      |  44 +
 .../metadata/cluster/ClusterManager.java        |  11 +-
 .../metadata/declared/AqlMetadataProvider.java  |  20 +-
 .../metadata/declared/FeedDataSource.java       |   4 +-
 .../metadata/declared/MetadataManagerUtil.java  |   4 +-
 .../entities/AsterixBuiltinTypeMap.java         |  93 --
 .../metadata/entities/BuiltinTypeMap.java       | 111 +++
 .../apache/asterix/metadata/entities/Index.java |   2 +
 .../DatatypeTupleTranslator.java                |  10 +-
 .../IndexTupleTranslator.java                   |   4 +-
 .../metadata/feeds/FeedMetadataUtil.java        |   8 -
 .../metadata/utils/MetadataConstants.java       |   8 +-
 .../utils/SplitsAndConstraintsUtil.java         |  21 +-
 asterixdb/asterix-om/pom.xml                    |   6 +
 .../apache/asterix/builders/RecordBuilder.java  |   2 +-
 .../hash/ListItemBinaryHashFunctionFactory.java |   2 +-
 .../json/clean/ADoublePrinterFactory.java       |  12 +-
 .../json/clean/AFloatPrinterFactory.java        |  12 +-
 .../om/functions/AsterixBuiltinFunctions.java   |   4 +-
 .../om/typecomputer/base/TypeCastUtils.java     |  16 +-
 .../om/typecomputer/impl/CastTypeComputer.java  |  16 +-
 .../impl/FlowRecordResultTypeComputer.java      |  45 -
 .../impl/NotMissingTypeComputer.java            |  77 --
 .../impl/NotUnknownTypeComputer.java            |  53 ++
 .../impl/NullableDoubleTypeComputer.java        |   2 +-
 .../impl/OpenRecordConstructorResultType.java   |   6 +
 .../impl/RecordAddFieldsTypeComputer.java       |   4 +-
 .../impl/SubsetCollectionTypeComputer.java      |   3 +
 .../om/typecomputer/impl/TypeComputeUtils.java  |  35 +-
 .../om/types/hierachy/ATypeHierarchy.java       |  10 +-
 .../om/typecomputer/TypeComputerTest.java       | 116 +++
 .../management/ReplicationChannel.java          |   4 +-
 .../management/ReplicationManager.java          |   5 +-
 .../recovery/RemoteRecoveryManager.java         |   6 +-
 .../storage/ReplicaResourcesManager.java        |   6 +-
 .../message/AbstractFailbackPlanMessage.java    |   4 +-
 .../message/CompleteFailbackRequestMessage.java |  10 +-
 .../CompleteFailbackResponseMessage.java        |  12 +-
 ...PreparePartitionsFailbackRequestMessage.java |  10 +-
 ...reparePartitionsFailbackResponseMessage.java |   8 +-
 .../runtime/message/ReplicaEventMessage.java    |   8 +-
 .../message/ReportMaxResourceIdMessage.java     |  10 +-
 .../ReportMaxResourceIdRequestMessage.java      |   8 +-
 .../message/ResourceIdRequestMessage.java       |  16 +-
 .../ResourceIdRequestResponseMessage.java       |  19 +-
 .../TakeoverMetadataNodeRequestMessage.java     |  10 +-
 .../TakeoverMetadataNodeResponseMessage.java    |  12 +-
 .../TakeoverPartitionsRequestMessage.java       |  14 +-
 .../TakeoverPartitionsResponseMessage.java      |  12 +-
 .../transaction/GlobalResourceIdFactory.java    |  21 +-
 .../runtime/util/AsterixAppContextInfo.java     |   3 +-
 .../runtime/util/AsterixClusterProperties.java  | 685 --------------
 .../runtime/util/ClusterStateManager.java       | 654 +++++++++++++
 .../samples/local/bin/start-sample-cluster.bat  |  23 +-
 .../samples/local/bin/start-sample-cluster.sh   |  11 +-
 .../samples/local/bin/stop-sample-cluster.bat   |  14 +-
 .../samples/local/bin/stop-sample-cluster.sh    |  14 +-
 .../server/test/NCServiceExecutionIT.java       |  28 +-
 .../server/test/SampleLocalClusterIT.java       |  17 +-
 ...dexModificationOperationCallbackFactory.java |   6 +-
 ...dexModificationOperationCallbackFactory.java |   6 +-
 ...dexModificationOperationCallbackFactory.java |   6 +-
 ...dexModificationOperationCallbackFactory.java |   6 +-
 .../UpsertOperationCallbackFactory.java         |   6 +-
 .../service/recovery/CheckpointThread.java      |  28 +-
 .../service/recovery/RecoveryManager.java       |   9 +-
 .../transaction/TransactionSubsystem.java       |  12 +-
 .../locking/TestRuntimeContextProvider.java     |  10 +-
 .../dataverseDataset/dataverseDataset.1.adm     |   1 +
 .../core/algebra/base/PhysicalOperatorTag.java  |   2 +-
 .../operators/logical/GroupByOperator.java      |  68 +-
 .../IndexInsertDeleteUpsertOperator.java        |   5 +-
 .../logical/InsertDeleteUpsertOperator.java     |   6 +-
 .../visitors/CardinalityInferenceVisitor.java   |   3 +
 ...OperatorDeepCopyWithNewVariablesVisitor.java |   2 +-
 .../visitors/OperatorDeepCopyVisitor.java       |   4 +-
 .../logical/visitors/UsedVariableVisitor.java   |   7 +-
 .../AbstractPreclusteredGroupByPOperator.java   |  36 +-
 .../operators/physical/AggregatePOperator.java  |   6 +-
 .../MicroPreclusteredGroupByPOperator.java      |  19 +-
 .../physical/PreclusteredGroupByPOperator.java  |  34 +-
 .../operators/physical/ReplicatePOperator.java  |   2 +-
 .../LogicalOperatorPrettyPrintVisitor.java      |  12 +-
 .../algebra/util/OperatorManipulationUtil.java  |  18 +-
 .../core/rewriter/base/HeuristicOptimizer.java  |   4 +-
 .../AbstractIntroduceGroupByCombinerRule.java   |  11 +-
 .../rules/EliminateGroupByEmptyKeyRule.java     |   4 +
 .../rules/ExtractCommonOperatorsRule.java       |   4 +-
 .../rewriter/rules/IntroduceProjectsRule.java   |  47 +-
 .../rewriter/rules/PushGroupByIntoSortRule.java |  10 +-
 .../rules/RemoveRedundantGroupByDecorVars.java  |  85 --
 .../RemoveRedundantGroupByDecorVarsRule.java    | 156 ++++
 .../RemoveUnusedAssignAndAggregateRule.java     | 263 ++++--
 .../SetAlgebricksPhysicalOperatorsRule.java     |   2 +-
 .../rewriter/rules/SetExecutionModeRule.java    |  25 +-
 ...estedPlansAccumulatingAggregatorFactory.java |   5 +-
 .../client/HyracksClientInterfaceFunctions.java |  28 +-
 .../HyracksClientInterfaceRemoteProxy.java      |  61 +-
 .../hyracks/api/client/HyracksConnection.java   |   9 +-
 .../api/client/IHyracksClientConnection.java    |   8 +-
 .../api/client/IHyracksClientInterface.java     |   4 +-
 .../api/context/IHyracksJobletContext.java      |   5 +-
 .../api/context/IHyracksTaskContext.java        |   2 +-
 .../apache/hyracks/api/messages/IMessage.java   |   3 -
 .../hyracks/api/messages/IMessageBroker.java    |   3 -
 .../control/cc/ClusterControllerService.java    |  71 +-
 .../hyracks/control/cc/NodeControllerState.java |  18 +-
 .../cc/application/CCApplicationContext.java    |   3 +-
 .../control/cc/work/ClusterShutdownWork.java    |  60 +-
 .../control/cc/work/GetNodeDetailsJSONWork.java | 124 ++-
 .../control/cc/work/GetThreadDumpWork.java      | 111 +++
 .../cc/work/NotifyThreadDumpResponse.java       |  50 +
 .../control/cc/work/ShutdownNCServiceWork.java  |  61 ++
 .../hyracks/control/cc/work/TriggerNCWork.java  |  55 +-
 .../common/application/ApplicationContext.java  |  16 +-
 .../control/common/base/IClusterController.java |   2 +
 .../control/common/base/INodeController.java    |   4 +-
 .../control/common/controllers/NCConfig.java    |  80 +-
 .../common/controllers/ServiceConstants.java    |  27 +
 .../common/dataset/ResultStateSweeper.java      |   4 +-
 .../common/deployment/DeploymentUtils.java      |  29 +-
 .../control/common/ipc/CCNCFunctions.java       |  61 ++
 .../ipc/ClusterControllerRemoteProxy.java       |  31 +-
 .../common/ipc/NodeControllerRemoteProxy.java   |  10 +-
 .../control/common/shutdown/ShutdownRun.java    |  22 +-
 .../common/utils/HyracksThreadFactory.java      |  38 +
 .../control/common/utils/ThreadDumpHelper.java  |  86 ++
 .../control/common/work/AbstractWork.java       |   6 +
 .../hyracks/control/common/work/WorkQueue.java  |  90 +-
 .../org/apache/hyracks/control/nc/Joblet.java   |  18 +-
 .../control/nc/NodeControllerService.java       |  97 +-
 .../nc/application/NCApplicationContext.java    |   3 +-
 .../MaterializingPipelinedPartition.java        |  10 +-
 .../hyracks/control/nc/task/ShutdownTask.java   |  66 ++
 .../hyracks/control/nc/task/ThreadDumpTask.java |  53 ++
 .../control/nc/work/ApplicationMessageWork.java |   2 +-
 .../hyracks/control/nc/work/ShutdownWork.java   |  67 --
 .../hyracks/control/nc/work/StartTasksWork.java |   2 +-
 .../hyracks/control/nc/service/NCService.java   |  85 +-
 .../PreclusteredGroupOperatorDescriptor.java    |  14 +-
 .../PreclusteredGroupOperatorNodePushable.java  |   7 +-
 .../preclustered/PreclusteredGroupWriter.java   |  23 +-
 .../helper/IndexLifecycleManagerProvider.java   |   4 +-
 .../examples/btree/helper/RuntimeContext.java   |   6 +-
 .../shutdown/test/ClusterShutdownIT.java        |   4 +-
 .../hyracks/storage/am/common/api/IIndex.java   |   2 +-
 .../am/common/api/IIndexLifecycleManager.java   |  38 -
 .../api/IIndexLifecycleManagerProvider.java     |   2 +-
 .../common/api/IResourceLifecycleManager.java   |  83 ++
 .../am/common/dataflow/IndexDataflowHelper.java |  11 +-
 .../common/dataflow/IndexLifecycleManager.java  |  10 +-
 .../dataflow/ExternalBTreeDataflowHelper.java   |   2 +-
 .../ExternalBTreeWithBuddyDataflowHelper.java   |   2 +-
 .../lsm/common/api/ILSMMergePolicyFactory.java  |   4 +-
 .../impls/ConstantMergePolicyFactory.java       |   4 +-
 .../common/impls/LSMComponentFilterManager.java |  25 +-
 .../lsm/common/impls/NoMergePolicyFactory.java  |   4 +-
 .../common/impls/PrefixMergePolicyFactory.java  |   4 +-
 .../invertedindex/impls/LSMInvertedIndex.java   |  10 +-
 .../dataflow/ExternalRTreeDataflowHelper.java   |   2 +-
 .../storage/common/buffercache/BufferCache.java |  29 +-
 .../TestIndexLifecycleManagerProvider.java      |   7 +-
 .../TestStorageManagerComponentHolder.java      |  11 +-
 4274 files changed, 27574 insertions(+), 23331 deletions(-)
----------------------------------------------------------------------