merge master
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9baab026 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9baab026 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9baab026 Branch: refs/heads/ecarm002/interval_join_merge Commit: 9baab026f330a790be49f1dffeb77ae1dd3fc0ef Parents: b4a3fd5 4819ea4 Author: Preston Carman <prest...@apache.org> Authored: Mon Oct 17 12:18:06 2016 -0700 Committer: Preston Carman <prest...@apache.org> Committed: Mon Oct 17 12:18:06 2016 -0700 ---------------------------------------------------------------------- .../active/message/ActiveManagerMessage.java | 2 +- .../active/message/ActivePartitionMessage.java | 2 +- asterixdb/asterix-algebra/pom.xml | 4 + .../optimizer/rules/LoadRecordFieldsRule.java | 46 +- .../rules/PushLimitIntoOrderByRule.java | 16 +- .../SweepIllegalNonfunctionalFunctions.java | 11 +- .../subplan/InlineAllNtsInSubplanVisitor.java | 11 +- ...neLeftNtsInSubplanJoinFlatteningVisitor.java | 7 +- .../SubplanSpecialFlatteningCheckVisitor.java | 10 +- .../translator/AbstractLangTranslator.java | 9 +- .../translator/util/FunctionCollection.java | 12 + .../asterix-app/data/tpcds/call_center.csv | 5 + .../asterix-app/data/tpcds/catalog_page.csv | 5 + .../asterix-app/data/tpcds/catalog_returns.csv | 32 +- .../asterix-app/data/tpcds/catalog_sales.csv | 38 +- asterixdb/asterix-app/data/tpcds/customer.csv | 20 +- .../asterix-app/data/tpcds/customer_address.csv | 20 +- .../data/tpcds/customer_demographics.csv | 6 + asterixdb/asterix-app/data/tpcds/date_dim.csv | 27 +- .../data/tpcds/household_demographics.csv | 7 + .../asterix-app/data/tpcds/income_band.csv | 5 + asterixdb/asterix-app/data/tpcds/inventory.csv | 15 + asterixdb/asterix-app/data/tpcds/item.csv | 19 +- asterixdb/asterix-app/data/tpcds/promotion.csv | 10 + asterixdb/asterix-app/data/tpcds/reason.csv | 10 + asterixdb/asterix-app/data/tpcds/ship_mode.csv | 5 + asterixdb/asterix-app/data/tpcds/store.csv | 5 + .../asterix-app/data/tpcds/store_returns.csv | 17 + .../asterix-app/data/tpcds/store_sales.csv | 48 +- asterixdb/asterix-app/data/tpcds/time_dim.csv | 8 + asterixdb/asterix-app/data/tpcds/warehouse.csv | 5 + asterixdb/asterix-app/data/tpcds/web_page.csv | 10 + .../asterix-app/data/tpcds/web_returns.csv | 13 + asterixdb/asterix-app/data/tpcds/web_sales.csv | 16 + asterixdb/asterix-app/data/tpcds/web_site.csv | 5 + asterixdb/asterix-app/pom.xml | 14 + .../interval_overlapping.3.adm | 35 - .../interval_overlapping.4.adm | 35 - .../common/AsterixHyracksIntegrationUtil.java | 2 +- .../asterix/api/http/servlet/APIServlet.java | 12 +- .../api/http/servlet/QueryServiceServlet.java | 19 +- .../app/nc/AsterixNCAppRuntimeContext.java | 24 +- .../asterix/app/translator/QueryTranslator.java | 6 +- .../bootstrap/CCApplicationEntryPoint.java | 17 +- .../bootstrap/ClusterLifecycleListener.java | 14 +- .../bootstrap/NCApplicationEntryPoint.java | 17 +- .../resources/asterix-build-configuration.xml | 5 +- ...ataset_with_default_dataverse_type.1.ddl.aql | 25 + ...aset_with_default_dataverse_type.2.query.aql | 23 + ...ataset_with_default_dataverse_type.3.ddl.aql | 20 + .../dataset_with_default_dataverse_type.2.adm | 1 + .../src/test/resources/metadata/testsuite.xml | 5 + .../queries/multi-indexes/skip-one-index.aql | 49 + .../queries/multi-indexes/skip-two-index.aql | 53 ++ .../queries/query-ASTERIXDB-1671.sqlpp | 40 + .../results/multi-indexes/skip-one-index.plan | 26 + .../results/multi-indexes/skip-two-index.plan | 15 + .../results/query-ASTERIXDB-1671.plan | 17 + .../polygon-from-open-list_issue1627.1.ddl.aql | 34 + ...olygon-from-open-list_issue1627.2.update.aql | 30 + ...polygon-from-open-list_issue1627.3.query.aql | 28 + .../feed-with-external-function.4.sleep.aql | 19 - .../feed-with-external-function.5.pollquery.aql | 33 + .../feed-with-external-function.5.query.aql | 32 - .../query-ASTERIXDB-1671-2.1.ddl.sqlpp | 47 + .../query-ASTERIXDB-1671-2.2.update.sqlpp | 24 + .../query-ASTERIXDB-1671-2.3.query.sqlpp | 27 + .../query-ASTERIXDB-1671.1.ddl.sqlpp | 47 + .../query-ASTERIXDB-1671.2.update.sqlpp | 24 + .../query-ASTERIXDB-1671.3.query.sqlpp | 27 + .../query-ASTERIXDB-1689.1.query.sqlpp | 22 + .../everysat_04/everysat_04.3.query.sqlpp | 2 +- .../query-ASTERIXDB-1674.1.ddl.sqlpp | 38 + .../query-ASTERIXDB-1674.2.update.sqlpp | 24 + .../query-ASTERIXDB-1674.3.query.sqlpp | 39 + .../somesat_06/somesat_06.3.query.sqlpp | 2 +- .../query-ASTERIXDB-1674.1.ddl.sqlpp | 38 + .../query-ASTERIXDB-1674.2.update.sqlpp | 24 + .../query-ASTERIXDB-1674.3.query.sqlpp | 38 + .../queries_sqlpp/tpcds/q03/q03.1.ddl.sqlpp | 115 +++ .../queries_sqlpp/tpcds/q03/q03.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q03/q03.3.query.sqlpp | 40 + .../queries_sqlpp/tpcds/q07/q07.1.ddl.sqlpp | 155 ++++ .../queries_sqlpp/tpcds/q07/q07.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q07/q07.3.query.sqlpp | 40 + .../queries_sqlpp/tpcds/q15/q15.1.ddl.sqlpp | 140 +++ .../queries_sqlpp/tpcds/q15/q15.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q15/q15.3.query.sqlpp | 40 + .../queries_sqlpp/tpcds/q19/q19.1.ddl.sqlpp | 193 ++++ .../queries_sqlpp/tpcds/q19/q19.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q19/q19.3.query.sqlpp | 44 + .../queries_sqlpp/tpcds/q21/q21.1.ddl.sqlpp | 116 +++ .../queries_sqlpp/tpcds/q21/q21.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q21/q21.3.query.sqlpp | 53 ++ .../queries_sqlpp/tpcds/q24a/q24a.1.ddl.sqlpp | 185 ++++ .../tpcds/q24a/q24a.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q24a/q24a.3.query.sqlpp | 70 ++ .../queries_sqlpp/tpcds/q24b/q24b.1.ddl.sqlpp | 185 ++++ .../tpcds/q24b/q24b.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q24b/q24b.3.query.sqlpp | 70 ++ .../queries_sqlpp/tpcds/q25/q25.1.ddl.sqlpp | 215 +++++ .../queries_sqlpp/tpcds/q25/q25.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q25/q25.3.query.sqlpp | 69 ++ .../queries_sqlpp/tpcds/q26/q26.1.ddl.sqlpp | 164 ++++ .../queries_sqlpp/tpcds/q26/q26.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q26/q26.3.query.sqlpp | 40 + .../queries_sqlpp/tpcds/q29/q29.1.ddl.sqlpp | 215 +++++ .../queries_sqlpp/tpcds/q29/q29.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q29/q29.3.query.sqlpp | 66 ++ .../queries_sqlpp/tpcds/q30/q30.1.ddl.sqlpp | 131 +++ .../queries_sqlpp/tpcds/q30/q30.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q30/q30.3.query.sqlpp | 50 + .../queries_sqlpp/tpcds/q31/q31.1.ddl.sqlpp | 146 +++ .../queries_sqlpp/tpcds/q31/q31.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q31/q31.3.query.sqlpp | 71 ++ .../queries_sqlpp/tpcds/q34/q34.1.ddl.sqlpp | 156 ++++ .../queries_sqlpp/tpcds/q34/q34.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q34/q34.3.query.sqlpp | 55 ++ .../queries_sqlpp/tpcds/q37/q37.1.ddl.sqlpp | 135 +++ .../queries_sqlpp/tpcds/q37/q37.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q37/q37.3.query.sqlpp | 36 + .../queries_sqlpp/tpcds/q41/q41.1.ddl.sqlpp | 52 ++ .../queries_sqlpp/tpcds/q41/q41.2.update.sqlpp | 23 + .../queries_sqlpp/tpcds/q41/q41.3.query.sqlpp | 71 ++ .../queries_sqlpp/tpcds/q42/q42.1.ddl.sqlpp | 115 +++ .../queries_sqlpp/tpcds/q42/q42.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q42/q42.3.query.sqlpp | 41 + .../queries_sqlpp/tpcds/q43/q43.1.ddl.sqlpp | 122 +++ .../queries_sqlpp/tpcds/q43/q43.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q43/q43.3.query.sqlpp | 38 + .../queries_sqlpp/tpcds/q45/q45.1.ddl.sqlpp | 169 ++++ .../queries_sqlpp/tpcds/q45/q45.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q45/q45.3.query.sqlpp | 38 + .../queries_sqlpp/tpcds/q46/q46.1.ddl.sqlpp | 176 ++++ .../queries_sqlpp/tpcds/q46/q46.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q46/q46.3.query.sqlpp | 54 ++ .../queries_sqlpp/tpcds/q50/q50.1.ddl.sqlpp | 148 +++ .../queries_sqlpp/tpcds/q50/q50.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q50/q50.3.query.sqlpp | 78 ++ .../queries_sqlpp/tpcds/q52/q52.1.ddl.sqlpp | 115 +++ .../queries_sqlpp/tpcds/q52/q52.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q52/q52.3.query.sqlpp | 41 + .../queries_sqlpp/tpcds/q55/q55.1.ddl.sqlpp | 115 +++ .../queries_sqlpp/tpcds/q55/q55.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q55/q55.3.query.sqlpp | 33 + .../queries_sqlpp/tpcds/q59/q59.1.ddl.sqlpp | 122 +++ .../queries_sqlpp/tpcds/q59/q59.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q59/q59.3.query.sqlpp | 63 ++ .../queries_sqlpp/tpcds/q62/q62.1.ddl.sqlpp | 162 ++++ .../queries_sqlpp/tpcds/q62/q62.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q62/q62.3.query.sqlpp | 54 ++ .../queries_sqlpp/tpcds/q68/q68.1.ddl.sqlpp | 175 ++++ .../queries_sqlpp/tpcds/q68/q68.2.update.sqlpp | 33 + .../queries_sqlpp/tpcds/q68/q68.3.query.sqlpp | 61 ++ .../queries_sqlpp/tpcds/q73/q73.1.ddl.sqlpp | 156 ++++ .../queries_sqlpp/tpcds/q73/q73.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q73/q73.3.query.sqlpp | 48 + .../queries_sqlpp/tpcds/q79/q79.1.ddl.sqlpp | 156 ++++ .../queries_sqlpp/tpcds/q79/q79.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q79/q79.3.query.sqlpp | 42 + .../queries_sqlpp/tpcds/q81/q81.1.ddl.sqlpp | 134 +++ .../queries_sqlpp/tpcds/q81/q81.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q81/q81.3.query.sqlpp | 50 + .../queries_sqlpp/tpcds/q82/q82.1.ddl.sqlpp | 125 +++ .../queries_sqlpp/tpcds/q82/q82.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q82/q82.3.query.sqlpp | 36 + .../queries_sqlpp/tpcds/q88/q88.1.ddl.sqlpp | 113 +++ .../queries_sqlpp/tpcds/q88/q88.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q88/q88.3.query.sqlpp | 103 +++ .../queries_sqlpp/tpcds/q91/q91.1.ddl.sqlpp | 195 ++++ .../queries_sqlpp/tpcds/q91/q91.2.update.sqlpp | 35 + .../queries_sqlpp/tpcds/q91/q91.3.query.sqlpp | 50 + .../queries_sqlpp/tpcds/q94/q94.1.ddl.sqlpp | 179 ++++ .../queries_sqlpp/tpcds/q94/q94.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q94/q94.3.query.sqlpp | 51 ++ .../queries_sqlpp/tpcds/q95/q95.1.ddl.sqlpp | 179 ++++ .../queries_sqlpp/tpcds/q95/q95.2.update.sqlpp | 31 + .../queries_sqlpp/tpcds/q95/q95.3.query.sqlpp | 58 ++ .../queries_sqlpp/tpcds/q96/q96.1.ddl.sqlpp | 113 +++ .../queries_sqlpp/tpcds/q96/q96.2.update.sqlpp | 29 + .../queries_sqlpp/tpcds/q96/q96.3.query.sqlpp | 38 + .../queries_sqlpp/tpcds/q98/q98.1.ddl.sqlpp | 115 +++ .../queries_sqlpp/tpcds/q98/q98.2.update.sqlpp | 27 + .../queries_sqlpp/tpcds/q98/q98.3.query.sqlpp | 75 ++ .../types/isarray/isarray.1.query.sqlpp | 30 + .../types/isboolean/isboolean.1.query.sqlpp | 30 + .../types/isnumber/isnumber.1.query.sqlpp | 31 + .../types/isobject/isobject.1.query.sqlpp | 30 + .../types/isstring/isstring.1.query.sqlpp | 30 + .../api/cluster_state_1/cluster_state_1.1.adm | 39 +- .../polygon-from-open-list_issue1627.1.adm | 1 + .../query-ASTERIXDB-1671.1.adm | 0 .../query-ASTERIXDB-1689.1.adm | 1 + .../query-ASTERIXDB-1674.1.adm | 1 + .../query-ASTERIXDB-1674.1.adm | 2 + .../runtimets/results/tpcds/q03/q03.1.adm | 1 + .../runtimets/results/tpcds/q07/q07.1.adm | 1 + .../runtimets/results/tpcds/q15/q15.1.adm | 1 + .../runtimets/results/tpcds/q19/q19.1.adm | 1 + .../runtimets/results/tpcds/q21/q21.1.adm | 1 + .../runtimets/results/tpcds/q24a/q24a.1.adm | 1 + .../runtimets/results/tpcds/q24b/q24b.1.adm | 1 + .../runtimets/results/tpcds/q25/q25.1.adm | 1 + .../runtimets/results/tpcds/q26/q26.1.adm | 1 + .../runtimets/results/tpcds/q29/q29.1.adm | 1 + .../runtimets/results/tpcds/q30/q30.1.adm | 1 + .../runtimets/results/tpcds/q31/q31.1.adm | 1 + .../runtimets/results/tpcds/q34/q34.1.adm | 1 + .../runtimets/results/tpcds/q37/q37.1.adm | 1 + .../runtimets/results/tpcds/q41/q41.1.adm | 1 + .../runtimets/results/tpcds/q42/q42.1.adm | 2 + .../runtimets/results/tpcds/q43/q43.1.adm | 2 + .../runtimets/results/tpcds/q45/q45.1.adm | 1 + .../runtimets/results/tpcds/q46/q46.1.adm | 1 + .../runtimets/results/tpcds/q50/q50.1.adm | 3 + .../runtimets/results/tpcds/q52/q52.1.adm | 3 + .../runtimets/results/tpcds/q55/q55.1.adm | 1 + .../runtimets/results/tpcds/q59/q59.1.adm | 2 + .../runtimets/results/tpcds/q62/q62.1.adm | 2 + .../runtimets/results/tpcds/q68/q68.1.adm | 1 + .../runtimets/results/tpcds/q73/q73.1.adm | 1 + .../runtimets/results/tpcds/q79/q79.1.adm | 2 + .../runtimets/results/tpcds/q81/q81.1.adm | 1 + .../runtimets/results/tpcds/q82/q82.1.adm | 1 + .../runtimets/results/tpcds/q88/q88.1.adm | 1 + .../runtimets/results/tpcds/q91/q91.1.adm | 1 + .../runtimets/results/tpcds/q94/q94.1.adm | 1 + .../runtimets/results/tpcds/q95/q95.1.adm | 1 + .../runtimets/results/tpcds/q96/q96.1.adm | 1 + .../runtimets/results/tpcds/q98/q98.1.adm | 1 + .../query-ASTERIXDB-1580.1.adm | 2 +- .../query-ASTERIXDB-1581-2.1.adm | 2 +- .../query-ASTERIXDB-1581-4.1.adm | 2 +- .../query-ASTERIXDB-1581-6.1.adm | 2 +- .../query-ASTERIXDB-1581-correlated.1.adm | 2 +- .../query-ASTERIXDB-1591.1.adm | 2 +- .../query-ASTERIXDB-1596.1.adm | 38 +- .../query-ASTERIXDB-1602.1.adm | 2 +- .../results/types/isarray/isarray.1.adm | 1 + .../results/types/isboolean/isboolean.1.adm | 1 + .../results/types/isnumber/isnumber.1.adm | 1 + .../results/types/isobject/isobject.1.adm | 1 + .../results/types/isstring/isstring.1.adm | 1 + .../src/test/resources/runtimets/testsuite.xml | 5 + .../resources/runtimets/testsuite_sqlpp.xml | 225 +++++ asterixdb/asterix-client-helper/pom.xml | 2 - .../org/apache/asterix/clienthelper/Args.java | 2 +- .../clienthelper/commands/RemoteCommand.java | 8 + .../commands/WaitForClusterCommand.java | 10 +- .../common/api/IClusterManagementWork.java | 1 + .../common/cluster/ClusterPartition.java | 9 +- .../config/AsterixMetadataProperties.java | 35 + .../common/config/AsterixProperties.java | 2 +- .../config/AsterixPropertiesAccessor.java | 55 +- .../messaging/api/IApplicationMessage.java | 2 +- .../common/metadata/IMetadataBootstrap.java | 29 + .../apache/asterix/common/utils/JSONUtil.java | 11 +- .../apache/asterix/common/utils/PrintUtil.java | 48 + .../apache/asterix/test/aql/TestExecutor.java | 41 + asterixdb/asterix-doc/pom.xml | 4 +- .../src/main/markdown/builtins/0_toc.md | 3 +- .../src/main/markdown/builtins/11_others.md | 249 ----- .../src/main/markdown/builtins/11_type.md | 263 ++++++ .../src/main/markdown/builtins/12_misc.md | 185 ++++ .../src/main/markdown/builtins/7_temporal.md | 3 - .../src/main/markdown/sqlpp/1_intro.md | 8 +- .../src/main/markdown/sqlpp/2_expr.md | 47 +- .../src/main/markdown/sqlpp/3_query.md | 13 +- .../src/main/markdown/sqlpp/5_ddl.md | 16 +- .../main/markdown/sqlpp/appendix_1_keywords.md | 24 +- .../src/site/markdown/aql/datamodel.md | 398 -------- .../src/site/markdown/aql/primer-sql-like.md | 907 ------------------- .../asterix-doc/src/site/markdown/aql/primer.md | 749 +++++++-------- .../asterix-doc/src/site/markdown/datamodel.md | 398 ++++++++ .../src/site/markdown/feeds/tutorial.md | 27 +- .../src/site/markdown/sqlpp/primer-sqlpp.md | 3 - asterixdb/asterix-doc/src/site/site.xml | 3 +- .../docker/asterix-configuration.xml | 13 +- .../configs/asterix-configuration.xml | 14 +- asterixdb/asterix-external-data/pom.xml | 16 + .../external/util/ExternalDataConstants.java | 4 + .../asterix/external/util/TwitterUtil.java | 38 +- asterixdb/asterix-installer/pom.xml | 7 + .../resources/conf/asterix-configuration.xml | 13 +- .../installer/test/AsterixRestartIT.java | 102 +++ .../integrationts/asterix-configuration.xml | 13 +- .../resources/integrationts/restart/828.h1w.adm | 100 ++ .../issue-1636/issue-1636.01.ddl.aql | 81 ++ .../issue-1636/issue-1636.02.ddl.aql | 27 + .../issue-1636/issue-1636.03.script.aql | 1 + .../issue-1636/issue-1636.04.ddl.aql | 35 + .../issue-1636/issue-1636.05.mgx.aql | 2 + .../issue-1636/issue-1636.06.mgx.aql | 2 + .../issue-1636/issue-1636.07.script.aql | 1 + .../issue-1636/issue-1636.08.ddl.aql | 27 + .../issue-1636/issue-1636.09.sleep.aql | 25 + .../issue-1636/issue-1636.10.script.aql | 1 + .../issue-1636/issue-1636.11.script.aql | 1 + .../scripts/feed-restart/issue-1636/cat.sh | 18 + .../scripts/feed-restart/issue-1636/grep_log.sh | 20 + .../feed-restart/issue-1636/kill_cc_and_nc.sh | 18 + .../scripts/feed-restart/issue-1636/touch.sh | 21 + .../integrationts/restart/testsuite.xml | 28 + .../resources/integrationts/restart/tweets.json | 39 + .../lang/common/parser/ScopeChecker.java | 13 +- .../lang/common/util/CommonFunctionMapUtil.java | 14 + .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 7 +- .../asterix/metadata/GarbageCollector.java | 37 +- .../asterix/metadata/MetadataManager.java | 152 ++-- .../metadata/api/IAsterixStateProxy.java | 5 +- .../asterix/metadata/api/IMetadataManager.java | 55 +- .../metadata/bootstrap/AsterixStateProxy.java | 20 +- .../apache/asterix/builders/RecordBuilder.java | 8 - .../serde/ARecordSerializerDeserializer.java | 89 +- .../om/functions/AsterixBuiltinFunctions.java | 22 +- .../pointables/ARecordVisitablePointable.java | 39 +- .../om/pointables/PointableAllocator.java | 18 +- .../om/pointables/cast/ACastVisitor.java | 4 +- .../asterix/om/pointables/cast/AListCaster.java | 4 +- .../om/pointables/cast/ARecordCaster.java | 15 +- .../impl/BooleanOrMissingTypeComputer.java | 44 + .../om/typecomputer/TypeComputerTest.java | 1 + .../functions/CreatePolygonDescriptor.java | 5 +- .../evaluators/functions/IsArrayDescriptor.java | 68 ++ .../functions/IsBooleanDescriptor.java | 68 ++ .../functions/IsNumberDescriptor.java | 73 ++ .../functions/IsObjectDescriptor.java | 68 ++ .../functions/IsStringDescriptor.java | 68 ++ .../message/CompleteFailbackRequestMessage.java | 2 +- .../CompleteFailbackResponseMessage.java | 2 +- ...PreparePartitionsFailbackRequestMessage.java | 2 +- ...reparePartitionsFailbackResponseMessage.java | 2 +- .../runtime/message/ReplicaEventMessage.java | 2 +- .../message/ReportMaxResourceIdMessage.java | 2 +- .../ReportMaxResourceIdRequestMessage.java | 2 +- .../message/ResourceIdRequestMessage.java | 2 +- .../TakeoverMetadataNodeRequestMessage.java | 2 +- .../TakeoverMetadataNodeResponseMessage.java | 2 +- .../TakeoverPartitionsRequestMessage.java | 2 +- .../TakeoverPartitionsResponseMessage.java | 2 +- .../runtime/util/AsterixAppContextInfo.java | 25 +- .../runtime/util/ClusterStateManager.java | 39 +- asterixdb/asterix-server/pom.xml | 7 + .../src/main/samples/local/conf/cc.conf | 2 +- .../server/test/NCServiceExecutionIT.java | 2 +- .../test/resources/NCServiceExecutionIT/cc.conf | 2 +- asterixdb/asterix-yarn/pom.xml | 7 + .../resources/base-asterix-configuration.xml | 13 +- .../configs/base-asterix-configuration.xml | 13 +- asterixdb/pom.xml | 9 +- .../algebricks/algebricks-compiler/pom.xml | 19 +- .../algebricks/algebricks-core/pom.xml | 30 +- .../core/algebra/base/LogicalOperatorTag.java | 2 +- .../core/algebra/base/PhysicalOperatorTag.java | 4 +- .../logical/AbstractReplicateOperator.java | 103 +++ .../logical/PartitioningSplitOperator.java | 119 --- .../operators/logical/ReplicateOperator.java | 70 +- .../operators/logical/SplitOperator.java | 65 ++ .../visitors/CardinalityInferenceVisitor.java | 6 +- .../visitors/FDsAndEquivClassesVisitor.java | 3 +- .../visitors/IsomorphismOperatorVisitor.java | 19 +- .../IsomorphismVariableMappingVisitor.java | 9 +- ...OperatorDeepCopyWithNewVariablesVisitor.java | 18 +- .../visitors/LogicalPropertiesVisitor.java | 6 + .../visitors/OperatorDeepCopyVisitor.java | 15 +- .../visitors/PrimaryKeyVariablesVisitor.java | 7 +- .../visitors/ProducedVariableVisitor.java | 14 +- .../logical/visitors/SchemaVariableVisitor.java | 16 +- .../visitors/SubstituteVariableVisitor.java | 11 +- .../logical/visitors/UsedVariableVisitor.java | 19 +- .../physical/AbstractReplicatePOperator.java | 68 ++ .../operators/physical/ReplicatePOperator.java | 47 +- .../operators/physical/SplitPOperator.java | 68 ++ .../LogicalOperatorPrettyPrintVisitor.java | 21 +- .../visitors/ILogicalOperatorVisitor.java | 8 +- .../algebricks/algebricks-data/pom.xml | 10 + .../algebricks-examples/piglet-example/pom.xml | 45 + .../algebricks/algebricks-rewriter/pom.xml | 15 + .../rules/RemoveRedundantVariablesRule.java | 19 +- .../RemoveUnusedAssignAndAggregateRule.java | 2 +- ...placeNtsWithSubplanInputOperatorVisitor.java | 7 +- .../algebricks/algebricks-runtime/pom.xml | 20 +- .../PartitioningSplitOperatorDescriptor.java | 217 ----- .../operators/std/SplitOperatorDescriptor.java | 188 ++++ .../data/simple/int-string-part1-split-0.tbl | 4 + .../data/simple/int-string-part1-split-1.tbl | 3 + .../data/simple/int-string-part1.tbl | 7 + .../algebricks/algebricks-tests/pom.xml | 48 +- .../tests/pushruntime/PushRuntimeTest.java | 73 +- hyracks-fullstack/hyracks/hyracks-api/pom.xml | 24 +- .../application/IClusterLifecycleListener.java | 11 +- .../SuperActivityOperatorNodePushable.java | 40 +- .../hyracks/hyracks-client/pom.xml | 7 +- .../hyracks-control/hyracks-control-cc/pom.xml | 62 +- .../org/apache/hyracks/control/cc/CCDriver.java | 2 +- .../cc/application/CCApplicationContext.java | 2 +- .../control/cc/work/RemoveDeadNodesWork.java | 11 +- .../hyracks-control-common/pom.xml | 27 +- .../control/common/controllers/CCConfig.java | 46 +- .../control/common/controllers/IniUtils.java | 8 +- .../control/common/controllers/NCConfig.java | 4 +- .../control/common/work/SynchronizableWork.java | 14 +- .../hyracks-control/hyracks-control-nc/pom.xml | 25 + .../org/apache/hyracks/control/nc/Task.java | 24 +- .../hyracks-control/hyracks-nc-service/pom.xml | 87 +- .../hyracks-data/hyracks-data-std/pom.xml | 5 + .../hyracks/hyracks-dataflow-std/pom.xml | 20 + .../AbstractReplicateOperatorDescriptor.java | 233 +++++ .../std/misc/ReplicateOperatorDescriptor.java | 36 + .../std/misc/SplitOperatorDescriptor.java | 231 ----- .../std/sort/HybridTopKSortRunGenerator.java | 3 + .../btree-example/btreeclient/pom.xml | 34 +- .../btree-example/btreehelper/pom.xml | 14 +- .../btree-example/btreeserver/pom.xml | 22 - .../hyracks-integration-tests/pom.xml | 70 +- .../tests/integration/JobFailureTest.java | 11 +- .../integration/ReplicateOperatorTest.java | 115 +++ .../tests/integration/SplitOperatorTest.java | 116 --- ...onOnCreatePushRuntimeOperatorDescriptor.java | 11 +- .../hyracks-shutdown-test/pom.xml | 29 +- .../text-example/textclient/pom.xml | 23 +- .../text-example/texthelper/pom.xml | 8 +- .../text-example/textserver/pom.xml | 39 +- .../tpch-example/tpchclient/pom.xml | 15 + .../tpch-example/tpchserver/pom.xml | 27 - .../hyracks-hdfs/hyracks-hdfs-1.x/pom.xml | 23 +- .../hyracks/hdfs/MiniDFSClusterFactory.java | 35 - .../hyracks/hdfs/MiniDFSClusterFactory.java | 35 + .../hyracks-hdfs/hyracks-hdfs-2.x/pom.xml | 49 +- .../hyracks/hdfs/MiniDFSClusterFactory.java | 38 - .../hyracks/hdfs/MiniDFSClusterFactory.java | 38 + .../hyracks-hdfs/hyracks-hdfs-core/pom.xml | 160 +++- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +- .../hyracks/hyracks-server/pom.xml | 49 +- .../apache/hyracks/server/test/NCServiceIT.java | 2 +- .../hyracks-storage-am-bloomfilter/pom.xml | 17 +- .../hyracks/hyracks-storage-am-btree/pom.xml | 22 + .../hyracks/hyracks-storage-am-common/pom.xml | 5 + .../hyracks-storage-am-lsm-btree/pom.xml | 31 +- .../hyracks-storage-am-lsm-common/pom.xml | 26 +- .../pom.xml | 39 +- .../hyracks-storage-am-lsm-rtree/pom.xml | 41 +- .../hyracks/hyracks-storage-am-rtree/pom.xml | 26 +- .../hyracks/hyracks-storage-common/pom.xml | 7 +- .../hyracks/hyracks-test-support/pom.xml | 40 +- .../hyracks-storage-am-bloomfilter-test/pom.xml | 28 +- .../hyracks-storage-am-btree-test/pom.xml | 32 +- .../hyracks-storage-am-lsm-btree-test/pom.xml | 43 +- .../hyracks-storage-am-lsm-common-test/pom.xml | 28 +- .../pom.xml | 45 +- .../hyracks-storage-am-lsm-rtree-test/pom.xml | 48 +- .../hyracks-storage-am-rtree-test/pom.xml | 33 +- .../hyracks-storage-common-test/pom.xml | 12 +- hyracks-fullstack/pom.xml | 28 +- 454 files changed, 15274 insertions(+), 4032 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SweepIllegalNonfunctionalFunctions.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SweepIllegalNonfunctionalFunctions.java index c7d21f8,4a79387..72c47c3 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SweepIllegalNonfunctionalFunctions.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SweepIllegalNonfunctionalFunctions.java @@@ -49,10 -50,7 +50,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java index 6597006,874cc7c..ead78b7 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineAllNtsInSubplanVisitor.java @@@ -67,9 -67,8 +67,9 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; + import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineLeftNtsInSubplanJoinFlatteningVisitor.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineLeftNtsInSubplanJoinFlatteningVisitor.java index d5f8fe9,eeb2c2a..ccdb41d --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineLeftNtsInSubplanJoinFlatteningVisitor.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/InlineLeftNtsInSubplanJoinFlatteningVisitor.java @@@ -53,9 -53,7 +53,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/SubplanSpecialFlatteningCheckVisitor.java ---------------------------------------------------------------------- diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/SubplanSpecialFlatteningCheckVisitor.java index e5c67cc,ccf0aeb..75a42a5 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/SubplanSpecialFlatteningCheckVisitor.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/subplan/SubplanSpecialFlatteningCheckVisitor.java @@@ -37,10 -38,7 +38,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/FunctionCollection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/AsterixBuiltinFunctions.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalOperatorTag.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalOperatorTag.java index 07c35a3,cc7a75f..c7f9aa1 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalOperatorTag.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/LogicalOperatorTag.java @@@ -38,9 -38,7 +38,8 @@@ public enum LogicalOperatorTag MATERIALIZE, NESTEDTUPLESOURCE, ORDER, - PARTITIONINGSPLIT, PROJECT, + RANGE_FORWARD, REPLICATE, RUNNINGAGGREGATE, SCRIPT, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/PhysicalOperatorTag.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/PhysicalOperatorTag.java index 25a47ee,1d20e08..949f6c8 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/PhysicalOperatorTag.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/base/PhysicalOperatorTag.java @@@ -52,9 -50,9 +51,10 @@@ public enum PhysicalOperatorTag PRE_SORTED_DISTINCT_BY, RANDOM_PARTITION_EXCHANGE, RANDOM_MERGE_EXCHANGE, + RANGE_FORWARD, RANGE_PARTITION_EXCHANGE, RANGE_PARTITION_MERGE_EXCHANGE, + REPLICATE, RTREE_SEARCH, RUNNING_AGGREGATE, SINGLE_PARTITION_INVERTED_INDEX_SEARCH, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/CardinalityInferenceVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/CardinalityInferenceVisitor.java index d7e8864,d278078..1ab0606 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/CardinalityInferenceVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/CardinalityInferenceVisitor.java @@@ -48,9 -48,7 +48,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java index af875f2,b259869..2bb43c9 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/FDsAndEquivClassesVisitor.java @@@ -67,9 -66,7 +66,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java index 737b246,7f34e8b..7c114c8 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java @@@ -55,9 -55,7 +55,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java index 87e4f71,58b31f8..7f099cb --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismVariableMappingVisitor.java @@@ -57,9 -57,7 +57,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java index 26f8637,f4b3195..d68f8d7 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalOperatorDeepCopyWithNewVariablesVisitor.java @@@ -52,9 -52,8 +52,9 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; + import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -411,14 -402,12 +403,20 @@@ public class LogicalOperatorDeepCopyWit } @Override + public ILogicalOperator visitRangeForwardOperator(RangeForwardOperator op, ILogicalOperator arg) + throws AlgebricksException { + // TODO fix deep copy of range map + RangeForwardOperator opCopy = new RangeForwardOperator(op.getRangeId(), op.getRangeMap()); + deepCopyInputsAnnotationsAndExecutionMode(op, arg, opCopy); + return opCopy; + } + + public ILogicalOperator visitSplitOperator(SplitOperator op, ILogicalOperator arg) throws AlgebricksException { + SplitOperator opCopy = new SplitOperator(op.getOutputArity(), op.getBranchingExpression()); + deepCopyInputsAnnotationsAndExecutionMode(op, arg, opCopy); + return opCopy; + } + @Override public ILogicalOperator visitMaterializeOperator(MaterializeOperator op, ILogicalOperator arg) throws AlgebricksException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java index 58b2cd7,7e92869..f7113c0 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/LogicalPropertiesVisitor.java @@@ -194,12 -186,11 +195,17 @@@ public class LogicalPropertiesVisitor i } @Override + public Void visitRangeForwardOperator(RangeForwardOperator op, IOptimizationContext arg) throws AlgebricksException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Void visitSplitOperator(SplitOperator op, IOptimizationContext arg) throws AlgebricksException { + return null; + } + + @Override public Void visitMaterializeOperator(MaterializeOperator op, IOptimizationContext arg) throws AlgebricksException { // TODO Auto-generated method stub return null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java index 067a4bc,442899f..578dab0 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/OperatorDeepCopyVisitor.java @@@ -53,9 -52,8 +53,9 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; + import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/PrimaryKeyVariablesVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/PrimaryKeyVariablesVisitor.java index f3d2990,9f1acea..ec74b4e --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/PrimaryKeyVariablesVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/PrimaryKeyVariablesVisitor.java @@@ -49,9 -49,7 +49,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java index 1a2c754,3645aff..a5adfa4 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/ProducedVariableVisitor.java @@@ -52,10 -53,7 +53,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -256,11 -250,11 +251,16 @@@ public class ProducedVariableVisitor im } @Override + public Void visitRangeForwardOperator(RangeForwardOperator op, Void arg) throws AlgebricksException { + return null; + } + + @Override + public Void visitSplitOperator(SplitOperator op, Void arg) throws AlgebricksException { + return null; + } + + @Override public Void visitMaterializeOperator(MaterializeOperator op, Void arg) throws AlgebricksException { return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SchemaVariableVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SchemaVariableVisitor.java index 93d878c,a746cf2..e1343d3 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SchemaVariableVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SchemaVariableVisitor.java @@@ -50,10 -51,7 +51,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -289,12 -282,12 +283,18 @@@ public class SchemaVariableVisitor impl } @Override + public Void visitRangeForwardOperator(RangeForwardOperator op, Void arg) throws AlgebricksException { + standardLayout(op); + return null; + } + + @Override + public Void visitSplitOperator(SplitOperator op, Void arg) throws AlgebricksException { + standardLayout(op); + return null; + } + + @Override public Void visitMaterializeOperator(MaterializeOperator op, Void arg) throws AlgebricksException { standardLayout(op); return null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java index 3623221,7345928..5d6a7b3 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/SubstituteVariableVisitor.java @@@ -51,10 -52,7 +52,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -415,12 -404,13 +415,19 @@@ public class SubstituteVariableVisito } @Override + public Void visitSplitOperator(SplitOperator op, Pair<LogicalVariable, LogicalVariable> arg) + throws AlgebricksException { + op.substituteVar(arg.first, arg.second); + return null; + } + + @Override + public Void visitRangeForwardOperator(RangeForwardOperator op, Pair<LogicalVariable, LogicalVariable> arg) + throws AlgebricksException { + return null; + } + + @Override public Void visitMaterializeOperator(MaterializeOperator op, Pair<LogicalVariable, LogicalVariable> arg) throws AlgebricksException { return null; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java index c0ca32e,3daa00f..e6a8032 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/UsedVariableVisitor.java @@@ -52,9 -52,7 +52,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator.IOrder; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java index eb1780c,d3dd166..566f954 --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java @@@ -49,9 -50,7 +50,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -364,8 -354,9 +355,16 @@@ public class LogicalOperatorPrettyPrint } @Override + public Void visitRangeForwardOperator(RangeForwardOperator op, Integer indent) throws AlgebricksException { + addIndent(indent).append("range forward "); ++ addIndent(indent).append("split " + branchingExpression.getValue().accept(exprVisitor, indent)); ++ return null; ++ } ++ ++ @Override + public Void visitSplitOperator(SplitOperator op, Integer indent) throws AlgebricksException { + Mutable<ILogicalExpression> branchingExpression = op.getBranchingExpression(); + addIndent(indent).append("split " + branchingExpression.getValue().accept(exprVisitor, indent)); return null; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/ILogicalOperatorVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/ILogicalOperatorVisitor.java index 0548ab3,f5ff8b4..85332ca --- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/ILogicalOperatorVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/visitors/ILogicalOperatorVisitor.java @@@ -38,10 -39,7 +39,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.LeftOuterUnnestOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; @@@ -83,12 -82,10 +83,12 @@@ public interface ILogicalOperatorVisito public R visitProjectOperator(ProjectOperator op, T arg) throws AlgebricksException; - public R visitPartitioningSplitOperator(PartitioningSplitOperator op, T arg) throws AlgebricksException; - public R visitReplicateOperator(ReplicateOperator op, T arg) throws AlgebricksException; + public R visitRangeForwardOperator(RangeForwardOperator op, T arg) throws AlgebricksException; + + public R visitSplitOperator(SplitOperator op, T arg) throws AlgebricksException; + public R visitMaterializeOperator(MaterializeOperator op, T arg) throws AlgebricksException; public R visitScriptOperator(ScriptOperator op, T arg) throws AlgebricksException; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-data/pom.xml ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-data/pom.xml index 8502577,d95810a..b35694b --- a/hyracks-fullstack/algebricks/algebricks-data/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-data/pom.xml @@@ -54,8 -54,13 +54,18 @@@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + <version>0.2.18-SNAPSHOT</version> + </dependency> ++ <dependency> ++ <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java ---------------------------------------------------------------------- diff --cc hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java index ce86332,c5d7291..29e96f6 --- a/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java +++ b/hyracks-fullstack/algebricks/algebricks-rewriter/src/main/java/org/apache/hyracks/algebricks/rewriter/rules/subplan/ReplaceNtsWithSubplanInputOperatorVisitor.java @@@ -48,9 -48,7 +48,8 @@@ import org.apache.hyracks.algebricks.co import org.apache.hyracks.algebricks.core.algebra.operators.logical.MaterializeOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.NestedTupleSourceOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.OrderOperator; - import org.apache.hyracks.algebricks.core.algebra.operators.logical.PartitioningSplitOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ProjectOperator; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.RangeForwardOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ReplicateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.RunningAggregateOperator; import org.apache.hyracks.algebricks.core.algebra.operators.logical.ScriptOperator; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9baab026/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml ---------------------------------------------------------------------- diff --cc hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 0eeddce,1a5d4ab..3692cd5 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@@ -113,15 -91,8 +91,13 @@@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-dataflow-common</artifactId> + <version>0.2.18-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-client</artifactId> <version>${project.version}</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>com.e-movimento.tinytools</groupId>