Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 019BD200BC5 for ; Mon, 17 Oct 2016 21:54:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 004E2160AF0; Mon, 17 Oct 2016 19:54:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 52D83160AF2 for ; Mon, 17 Oct 2016 21:54:55 +0200 (CEST) Received: (qmail 55741 invoked by uid 500); 17 Oct 2016 19:54:54 -0000 Mailing-List: contact commits-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list commits@asterixdb.apache.org Received: (qmail 54206 invoked by uid 99); 17 Oct 2016 19:54:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2016 19:54:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB544E69AD; Mon, 17 Oct 2016 19:54:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prestonc@apache.org To: commits@asterixdb.apache.org Date: Mon, 17 Oct 2016 19:55:37 -0000 Message-Id: <46d45e0434a345c299858c7fa67ec2e5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] asterixdb git commit: merge master with interval tests archived-at: Mon, 17 Oct 2016 19:54:58 -0000 merge master with interval tests Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e256e637 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e256e637 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e256e637 Branch: refs/heads/ecarm002/interval_join_merge Commit: e256e6378fa949070455dc88b25fe9542359e1b7 Parents: ed86c88 2e3d167 Author: Preston Carman Authored: Mon Oct 3 23:42:46 2016 -0700 Committer: Preston Carman Committed: Mon Oct 3 23:42:46 2016 -0700 ---------------------------------------------------------------------- .gitignore | 4 + README.md | 31 +- .../TranslateIntervalExpressionRule.java | 23 +- .../interval_overlapping.3.adm | 35 + .../interval_overlapping.4.adm | 35 + .../api/http/servlet/QueryServiceServlet.java | 18 + .../queries/aggregate/count-dataset.sqlpp | 2 +- .../aggregate/query-ASTERIXDB-1626-2.sqlpp | 2 +- .../aggregate/query-ASTERIXDB-1626-3.sqlpp | 2 +- .../aggregate/query-ASTERIXDB-1626.sqlpp | 2 +- .../queries/query-ASTERIXDB-159-3.sqlpp | 2 +- .../inlined_q18_large_volume_customer.sqlpp | 4 +- .../queries_sqlpp/nest_aggregate.sqlpp | 2 +- .../queries_sqlpp/orders-aggreg.sqlpp | 4 +- .../q01_pricing_summary_report_nt.sqlpp | 16 +- .../queries_sqlpp/q03_shipping_priority.sqlpp | 2 +- .../q05_local_supplier_volume.sqlpp | 2 +- .../queries_sqlpp/query-issue562.sqlpp | 6 +- .../queries_sqlpp/query-issue697.sqlpp | 2 +- .../queries_sqlpp/query-issue785.sqlpp | 2 +- .../queries_sqlpp/query-issue810-2.sqlpp | 2 +- .../queries_sqlpp/query-issue810.sqlpp | 2 +- .../queries_sqlpp/query-issue827-2.sqlpp | 16 +- .../queries_sqlpp/split-materialization.sqlpp | 4 +- .../interval_before/interval_before.3.query.aql | 1 - .../interval_before/interval_before.4.query.aql | 1 - .../interval_covers/interval_covers.3.query.aql | 1 - .../interval_covers/interval_covers.4.query.aql | 1 - .../interval_ends/interval_ends.3.query.aql | 1 - .../interval_ends/interval_ends.4.query.aql | 1 - .../interval_meets/interval_meets.3.query.aql | 1 - .../interval_meets/interval_meets.4.query.aql | 1 - .../interval_overlapping.3.query.aql | 1 - .../interval_overlapping.4.query.aql | 1 - .../interval_overlaps.3.query.aql | 1 - .../interval_overlaps.4.query.aql | 1 - .../interval_starts/interval_starts.3.query.aql | 1 - .../interval_starts/interval_starts.4.query.aql | 1 - .../agg_null/agg_null.3.query.sqlpp | 2 +- .../agg_null_rec/agg_null_rec.3.query.sqlpp | 10 +- .../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.3.query.sqlpp | 10 +- .../avg_double/avg_double.3.query.sqlpp | 2 +- .../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 | 2 +- .../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.3.query.sqlpp | 2 +- .../avg_int16/avg_int16.3.query.sqlpp | 2 +- .../avg_int16_null/avg_int16_null.3.query.sqlpp | 2 +- .../avg_int32/avg_int32.3.query.sqlpp | 2 +- .../avg_int32_null/avg_int32_null.3.query.sqlpp | 2 +- .../avg_int64/avg_int64.3.query.sqlpp | 2 +- .../avg_int64_null/avg_int64_null.3.query.sqlpp | 2 +- .../avg_int8/avg_int8.3.query.sqlpp | 2 +- .../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 | 2 +- .../count_empty_02.2.update.sqlpp | 2 +- .../count_empty_02/count_empty_02.3.query.sqlpp | 4 +- .../count_null/count_null.3.query.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 | 4 +- .../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 | 2 +- .../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 | 2 +- .../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.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 | 2 +- .../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.3.query.sqlpp | 2 +- .../sum_int16/sum_int16.3.query.sqlpp | 2 +- .../sum_int16_null/sum_int16_null.3.query.sqlpp | 2 +- .../sum_int32/sum_int32.3.query.sqlpp | 2 +- .../sum_int32_null/sum_int32_null.3.query.sqlpp | 2 +- .../sum_int64/sum_int64.3.query.sqlpp | 2 +- .../sum_int64_null/sum_int64_null.3.query.sqlpp | 2 +- .../sum_int8/sum_int8.3.query.sqlpp | 2 +- .../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 | 4 +- .../sum_null-with-pred.2.update.sqlpp | 4 +- .../sum_null-with-pred.3.query.sqlpp | 6 +- .../sum_numeric_null.1.ddl.sqlpp | 2 +- .../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.3.query.sqlpp | 10 +- .../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.3.query.sqlpp | 10 +- .../avg_double/avg_double.3.query.sqlpp | 2 +- .../avg_double_null.3.query.sqlpp | 2 +- .../avg_empty_01/avg_empty_01.3.query.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.3.query.sqlpp | 2 +- .../aggregate/avg_int16/avg_int16.3.query.sqlpp | 2 +- .../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.3.query.sqlpp | 2 +- .../aggregate/avg_int64/avg_int64.3.query.sqlpp | 2 +- .../avg_int64_null/avg_int64_null.3.query.sqlpp | 2 +- .../aggregate/avg_int8/avg_int8.3.query.sqlpp | 2 +- .../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.3.query.sqlpp | 2 +- .../count_null/count_null.3.query.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.3.query.sqlpp | 4 +- .../max_empty_01/max_empty_01.3.query.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.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.3.query.sqlpp | 2 +- .../sum_empty_01/sum_empty_01.3.query.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.3.query.sqlpp | 2 +- .../aggregate/sum_int16/sum_int16.3.query.sqlpp | 2 +- .../sum_int16_null/sum_int16_null.3.query.sqlpp | 2 +- .../aggregate/sum_int32/sum_int32.3.query.sqlpp | 2 +- .../sum_int32_null/sum_int32_null.3.query.sqlpp | 2 +- .../aggregate/sum_int64/sum_int64.3.query.sqlpp | 2 +- .../sum_int64_null/sum_int64_null.3.query.sqlpp | 2 +- .../aggregate/sum_int8/sum_int8.3.query.sqlpp | 2 +- .../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 | 2 +- .../sum_null-with-pred.2.update.sqlpp | 2 +- .../sum_null-with-pred.3.query.sqlpp | 4 +- .../sum_numeric_null.1.ddl.sqlpp | 2 +- .../sum_numeric_null.2.update.sqlpp | 2 +- .../sum_numeric_null.3.query.sqlpp | 4 +- .../cross-dv03/cross-dv03.3.query.sqlpp | 2 +- .../custord/join_q_06/join_q_06.3.query.sqlpp | 2 +- .../custord/join_q_07/join_q_07.3.query.sqlpp | 2 +- .../query-issue382/query-issue382.3.query.sqlpp | 2 +- ...pricing_summary_report_failure.3.query.sqlpp | 16 +- .../feeds/feeds_07/feeds_07.3.query.sqlpp | 2 +- .../feeds/feeds_08/feeds_08.3.query.sqlpp | 2 +- .../feeds/feeds_09/feeds_09.3.query.sqlpp | 2 +- .../feeds/feeds_10/feeds_10.3.query.sqlpp | 2 +- .../flwor/grpby01/grpby01.3.query.sqlpp | 2 +- .../flwor/grpby02/grpby02.3.query.sqlpp | 2 +- .../query-ASTERIXDB-883.3.query.sqlpp | 6 +- .../q06_error/q06_error.3.query.sqlpp | 2 +- .../global-aggregate/q08/q08.3.query.sqlpp | 2 +- .../query-ASTERIXDB-159.3.query.sqlpp | 2 +- .../query-ASTERIXDB-1626-2.3.query.sqlpp | 2 +- .../query-ASTERIXDB-1626.3.query.sqlpp | 2 +- .../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_6.3.query.sqlpp | 2 +- .../list/listify_03/listify_03.3.query.sqlpp | 4 +- .../query-ASTERIXDB-159-2.3.query.sqlpp | 2 +- .../query-ASTERIXDB-159-3.3.query.sqlpp | 2 +- .../issue289_query/issue289_query.3.query.sqlpp | 2 +- .../assign-reuse/assign-reuse.3.query.sqlpp | 4 +- .../groupby-orderby-count.3.query.sqlpp | 4 +- .../query-issue258.2.update.sqlpp | 2 +- .../everysat_03/everysat_03.3.query.sqlpp | 2 +- .../somesat_03/somesat_03.3.query.sqlpp | 2 +- .../somesat_04/somesat_04.3.query.sqlpp | 2 +- .../count-nullable/count-nullable.3.query.sqlpp | 2 +- ...ell-aggregation-with-filtering.3.query.sqlpp | 2 +- .../cell-aggregation.3.query.sqlpp | 2 +- .../relational_division2.3.query.sqlpp | 2 +- .../q01_pricing_summary_report_nt.3.query.sqlpp | 16 +- .../temporal/agg_max/agg_max.3.query.sqlpp | 10 +- .../temporal/agg_min/agg_min.3.query.sqlpp | 10 +- .../overlap_bins_gby_1.3.query.sqlpp | 2 +- .../overlap_bins_gby_3.3.query.sqlpp | 4 +- .../query-ASTERIXDB-1331.25.query.sqlpp | 2 +- .../tinysocial-suite.14.query.sqlpp | 2 +- .../tinysocial-suite.22.query.sqlpp | 2 +- .../tinysocial-suite.14.query.sqlpp | 2 +- .../tinysocial-suite.22.query.sqlpp | 2 +- .../tinysocial-suite.25.query.sqlpp | 2 +- .../query-ASTERIXDB-1580.3.query.sqlpp | 2 +- .../query-ASTERIXDB-1602.3.query.sqlpp | 2 +- .../q01_pricing_summary_report_nt.3.query.sqlpp | 14 +- .../q02_minimum_cost_supplier.3.query.sqlpp | 2 +- .../q03_shipping_priority_nt.3.query.sqlpp | 2 +- .../q04_order_priority.3.query.sqlpp | 2 +- .../q05_local_supplier_volume.3.query.sqlpp | 2 +- .../q07_volume_shipping.3.query.sqlpp | 2 +- .../q08_national_market_share.3.query.sqlpp | 4 +- .../q09_product_type_profit_nt.3.query.sqlpp | 2 +- .../q10_returned_item.3.query.sqlpp | 2 +- .../q10_returned_item_int64.3.query.sqlpp | 2 +- .../q11_important_stock.3.query.sqlpp | 4 +- .../q12_shipping/q12_shipping.3.query.sqlpp | 4 +- .../q13_customer_distribution.3.query.sqlpp | 4 +- .../q14_promotion_effect.3.query.sqlpp | 4 +- .../q15_top_supplier.3.query.sqlpp | 4 +- ...16_parts_supplier_relationship.3.query.sqlpp | 2 +- .../q17_large_gby_variant.3.query.sqlpp | 20 +- ...7_small_quantity_order_revenue.3.query.sqlpp | 4 +- .../q18_large_volume_customer.3.query.sqlpp | 4 +- .../q19_discounted_revenue.3.query.sqlpp | 2 +- .../q20_potential_part_promotion.3.query.sqlpp | 2 +- ...pliers_who_kept_orders_waiting.3.query.sqlpp | 10 +- .../q22_global_sales_opportunity.3.query.sqlpp | 4 +- .../query-issue601/query-issue601.3.query.sqlpp | 2 +- .../query-issue638/query-issue638.3.query.sqlpp | 2 +- .../query-issue785-2.3.query.sqlpp | 2 +- .../query-issue785/query-issue785.3.query.sqlpp | 4 +- .../query-issue786/query-issue786.3.query.sqlpp | 2 +- .../q13_customer_distribution.3.query.sqlpp | 2 +- .../query-issue562/query-issue562.3.query.sqlpp | 2 +- .../query-issue810-2.3.query.sqlpp | 2 +- .../query-issue810-3.3.query.sqlpp | 4 +- .../query-issue810/query-issue810.3.query.sqlpp | 4 +- .../q13_customer_distribution.3.query.sqlpp | 2 +- .../query-issue562/query-issue562.3.query.sqlpp | 2 +- .../query-issue810-2.3.query.sqlpp | 2 +- .../query-issue810-3.3.query.sqlpp | 4 +- .../query-issue810/query-issue810.3.query.sqlpp | 4 +- .../nest_aggregate/nest_aggregate.3.query.sqlpp | 2 +- .../nest_aggregate2.3.query.sqlpp | 2 +- .../q01_pricing_summary_report_nt.3.query.sqlpp | 14 +- .../q02_minimum_cost_supplier.3.query.sqlpp | 2 +- .../q03_shipping_priority_nt.3.query.sqlpp | 2 +- .../q05_local_supplier_volume.3.query.sqlpp | 2 +- .../q06_forecast_revenue_change.3.query.sqlpp | 2 +- .../q07_volume_shipping.3.query.sqlpp | 2 +- .../q08_national_market_share.3.query.sqlpp | 4 +- .../q09_product_type_profit_nt.3.query.sqlpp | 2 +- .../q10_returned_item.3.query.sqlpp | 2 +- .../q10_returned_item_int64.3.query.sqlpp | 2 +- .../q11_important_stock.3.query.sqlpp | 4 +- .../q12_shipping/q12_shipping.3.query.sqlpp | 4 +- .../q13_customer_distribution.3.query.sqlpp | 4 +- .../q14_promotion_effect.3.query.sqlpp | 4 +- .../q15_top_supplier.3.query.sqlpp | 4 +- ...16_parts_supplier_relationship.3.query.sqlpp | 2 +- .../q17_large_gby_variant.3.query.sqlpp | 20 +- ...7_small_quantity_order_revenue.3.query.sqlpp | 4 +- .../q18_large_volume_customer.3.query.sqlpp | 4 +- .../q19_discounted_revenue.3.query.sqlpp | 2 +- .../q20_potential_part_promotion.3.query.sqlpp | 2 +- ...pliers_who_kept_orders_waiting.3.query.sqlpp | 8 +- .../q22_global_sales_opportunity.3.query.sqlpp | 4 +- .../query-issue562/query-issue562.3.query.sqlpp | 6 +- .../query-issue785-2.3.query.sqlpp | 2 +- .../query-issue785/query-issue785.3.query.sqlpp | 4 +- .../query-issue786/query-issue786.3.query.sqlpp | 2 +- .../query-issue810-2.3.query.sqlpp | 2 +- .../query-issue810-3.3.query.sqlpp | 2 +- .../query-issue810/query-issue810.3.query.sqlpp | 2 +- .../query-issue827-2.3.query.sqlpp | 16 +- .../query-issue827/query-issue827.3.query.sqlpp | 4 +- .../nest_aggregate/nest_aggregate.3.query.sqlpp | 2 +- .../nest_aggregate2.3.query.sqlpp | 2 +- .../q01_pricing_summary_report_nt.3.query.sqlpp | 16 +- .../q02_minimum_cost_supplier.3.query.sqlpp | 2 +- .../q03_shipping_priority_nt.3.query.sqlpp | 2 +- .../q05_local_supplier_volume.3.query.sqlpp | 2 +- .../q06_forecast_revenue_change.3.query.sqlpp | 2 +- .../q07_volume_shipping.3.query.sqlpp | 2 +- .../q08_national_market_share.3.query.sqlpp | 4 +- .../q09_product_type_profit_nt.3.query.sqlpp | 2 +- .../q10_returned_item.3.query.sqlpp | 2 +- .../q10_returned_item_int64.3.query.sqlpp | 2 +- .../q11_important_stock.3.query.sqlpp | 4 +- .../q12_shipping/q12_shipping.3.query.sqlpp | 4 +- .../q13_customer_distribution.3.query.sqlpp | 4 +- .../q14_promotion_effect.3.query.sqlpp | 4 +- .../q15_top_supplier.3.query.sqlpp | 4 +- ...16_parts_supplier_relationship.3.query.sqlpp | 2 +- .../q17_large_gby_variant.3.query.sqlpp | 20 +- ...7_small_quantity_order_revenue.3.query.sqlpp | 4 +- .../q18_large_volume_customer.3.query.sqlpp | 4 +- .../q19_discounted_revenue.3.query.sqlpp | 2 +- .../q20_potential_part_promotion.3.query.sqlpp | 2 +- ...pliers_who_kept_orders_waiting.3.query.sqlpp | 8 +- .../q22_global_sales_opportunity.3.query.sqlpp | 4 +- .../query-issue562/query-issue562.3.query.sqlpp | 6 +- .../query-issue638/query-issue638.3.query.sqlpp | 2 +- .../query-issue785-2.3.query.sqlpp | 2 +- .../query-issue785/query-issue785.3.query.sqlpp | 4 +- .../query-issue786/query-issue786.3.query.sqlpp | 2 +- .../query-issue810-2.3.query.sqlpp | 2 +- .../query-issue810-3.3.query.sqlpp | 2 +- .../query-issue810/query-issue810.3.query.sqlpp | 2 +- .../query-issue827-2.3.query.sqlpp | 16 +- .../query-issue827/query-issue827.3.query.sqlpp | 4 +- .../query-issue489/query-issue489.2.query.sqlpp | 2 +- .../query-issue489/query-issue489.4.query.sqlpp | 2 +- .../interval_ends/interval_ends.3.adm | 8 +- .../interval_ends/interval_ends.4.adm | 8 +- .../src/test/resources/runtimets/testsuite.xml | 7 +- .../apache/asterix/common/utils/JSONUtil.java | 2 +- asterixdb/asterix-doc/pom.xml | 12 +- .../src/main/markdown/builtins/0_toc.md | 37 + .../src/main/markdown/builtins/10_comparison.md | 76 + .../src/main/markdown/builtins/11_others.md | 249 ++ .../src/main/markdown/builtins/1_numeric.md | 518 ++++ .../src/main/markdown/builtins/2_string.md | 690 +++++ .../src/main/markdown/builtins/3_binary.md | 143 + .../src/main/markdown/builtins/4_spatial.md | 326 +++ .../src/main/markdown/builtins/5_similarity.md | 146 + .../src/main/markdown/builtins/6_tokenizing.md | 45 + .../src/main/markdown/builtins/7_allens.md | 274 ++ .../src/main/markdown/builtins/7_temporal.md | 803 ++++++ .../src/main/markdown/builtins/8_record.md | 235 ++ .../main/markdown/builtins/9_aggregate_aql.md | 297 ++ .../main/markdown/builtins/9_aggregate_sql.md | 303 ++ .../src/main/markdown/sqlpp/0_toc.md | 27 +- .../src/main/markdown/sqlpp/1_intro.md | 38 +- .../src/main/markdown/sqlpp/2_expr.md | 48 +- .../src/main/markdown/sqlpp/3_query.md | 46 +- .../src/main/markdown/sqlpp/4_ddl.md | 452 --- .../src/main/markdown/sqlpp/4_error.md | 97 + .../src/main/markdown/sqlpp/5_ddl.md | 441 +++ .../main/markdown/sqlpp/appendix_1_keywords.md | 26 + .../asterix-doc/src/site/markdown/aql/allens.md | 273 -- .../src/site/markdown/aql/functions.md | 2676 ------------------ asterixdb/asterix-doc/src/site/site.xml | 7 +- .../lang/sqlpp/util/FunctionMapUtil.java | 32 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 7 +- .../functions/temporal/IntervalLogic.java | 18 +- .../control/cc/scheduler/JobScheduler.java | 11 +- .../control/cc/work/TaskFailureWork.java | 4 +- .../org/apache/hyracks/control/nc/Joblet.java | 1 + .../hyracks/control/nc/work/AbortTasksWork.java | 7 +- .../hyracks/control/nc/work/StartTasksWork.java | 49 +- .../AbstractMultiNCIntegrationTest.java | 59 +- .../tests/integration/JobFailureTest.java | 54 + ...onOnCreatePushRuntimeOperatorDescriptor.java | 136 + 445 files changed, 5982 insertions(+), 4320 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e256e637/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/temporal/TranslateIntervalExpressionRule.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/temporal/TranslateIntervalExpressionRule.java index b0eac36,15cda86..b6e821f --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/temporal/TranslateIntervalExpressionRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/temporal/TranslateIntervalExpressionRule.java @@@ -19,9 -19,10 +19,11 @@@ package org.apache.asterix.optimizer.rules.temporal; import java.util.ArrayList; + import java.util.HashSet; import java.util.List; + import java.util.Set; +import org.apache.asterix.common.annotations.IntervalJoinExpressionAnnotation; import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.commons.lang3.mutable.Mutable; @@@ -78,16 -88,10 +90,19 @@@ public class TranslateIntervalExpressio return translateIntervalExpression(exprRef, funcExpr); } - private boolean hasIntervalAnnotation(AbstractFunctionCallExpression funcExpr) { + private boolean hasTranslatableInterval(AbstractFunctionCallExpression funcExpr) { + for (Object key : funcExpr.getAnnotations().keySet()) { + IExpressionAnnotation annot = funcExpr.getAnnotations().get(key); + if (annot instanceof IntervalJoinExpressionAnnotation) { + IntervalJoinExpressionAnnotation ijea = (IntervalJoinExpressionAnnotation) annot; + if (ijea.isRawJoin()) { + return true; + } + } + } + if (TRANSLATABLE_INTERVALS.contains(funcExpr.getFunctionIdentifier())) { + return true; + } return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e256e637/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml ---------------------------------------------------------------------- diff --cc asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml index e00e263,e90b2e7..f45ebb4 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml @@@ -16,13 -16,15 +16,16 @@@ ! specific language governing permissions and limitations ! under the License. !--> + + + ]>