[ASTERIXDB-2171][STO] Remove Temporary Datasets - user model changes: no - storage format changes: no - interface changes: yes - Removed all reference to temporary datasets.
Details: - Remove temporary datasets grammar but reserve <TEMPORARY> token. - Remove special callbacks for temp datasets. - Remove metadata garbage collector thread. - Remove isTemp flag from datasets. - Remove special storage path for temp datasets. - Remove temp datasets test cases. Change-Id: Ib50ea27e2ec9c114508cd4a109cf646e2f20dcb0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2172 Sonar-Qube: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/2c04ae07 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/2c04ae07 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/2c04ae07 Branch: refs/heads/master Commit: 2c04ae0751acb521dedbc61c4cf30d2825d67ec9 Parents: e5a6542 Author: Murtadha Hubail <[email protected]> Authored: Tue Nov 21 15:58:01 2017 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Tue Nov 21 14:20:03 2017 -0800 ---------------------------------------------------------------------- .../api/http/server/ConnectorApiServlet.java | 7 +- .../asterix/app/translator/QueryTranslator.java | 6 +- .../hyracks/bootstrap/NCApplication.java | 13 - .../http/servlet/ConnectorApiServletTest.java | 10 +- .../app/bootstrap/TestNodeController.java | 6 +- .../test/dataflow/ComponentRollbackTest.java | 2 +- .../asterix/test/dataflow/LogMarkerTest.java | 2 +- .../dataflow/MultiPartitionLSMIndexTest.java | 2 +- .../SearchCursorComponentSwitchTest.java | 2 +- .../TestLsmBTreeResourceFactoryProvider.java | 3 +- .../asterix/test/logging/CheckpointingTest.java | 2 +- .../asterix/test/storage/DiskIsFullTest.java | 2 +- .../IndexDropOperatorNodePushableTest.java | 2 +- .../basic/temp_dataset/temp_dataset.1.ddl.aql | 52 ---- .../temp_dataset/temp_dataset.2.update.aql | 24 -- .../basic/temp_dataset/temp_dataset.3.query.aql | 29 --- .../basic/temp_dataset/temp_dataset.1.adm | 1 - .../src/test/resources/metadata/testsuite.xml | 5 - ...ete-from-loaded-dataset-with-index.1.ddl.aql | 52 ---- ...-from-loaded-dataset-with-index.2.update.aql | 31 --- ...ete-from-loaded-dataset-with-index.3.ddl.aql | 30 --- ...-from-loaded-dataset-with-index.4.update.aql | 28 --- ...e-from-loaded-dataset-with-index.5.query.aql | 31 --- .../delete-from-loaded-dataset.1.ddl.aql | 52 ---- .../delete-from-loaded-dataset.2.update.aql | 33 --- .../delete-from-loaded-dataset.3.query.aql | 30 --- .../drop-empty-secondary-indexes.1.ddl.aql | 75 ------ .../drop-empty-secondary-indexes.2.update.aql | 25 -- .../drop-empty-secondary-indexes.3.query.aql | 28 --- .../drop-index/drop-index.1.ddl.aql | 51 ---- .../drop-index/drop-index.2.update.aql | 32 --- .../drop-index/drop-index.3.ddl.aql | 35 --- .../drop-index/drop-index.4.query.aql | 30 --- .../empty-load-with-index.1.ddl.aql | 52 ---- .../empty-load-with-index.2.update.aql | 33 --- .../empty-load-with-index.3.query.aql | 30 --- ...scan-dataset-with-correlated-index.1.ddl.aql | 39 --- ...n-dataset-with-correlated-index.2.update.aql | 42 ---- ...scan-dataset-with-correlated-index.3.ddl.aql | 28 --- ...an-dataset-with-correlated-index.4.query.aql | 30 --- ...insert-and-scan-dataset-with-index.1.ddl.aql | 39 --- ...ert-and-scan-dataset-with-index.2.update.aql | 42 ---- ...sert-and-scan-dataset-with-index.3.query.aql | 31 --- .../insert-and-scan-dataset.1.ddl.aql | 36 --- .../insert-and-scan-dataset.2.update.aql | 39 --- .../insert-and-scan-dataset.3.query.aql | 32 --- .../q01_pricing_summary_report_nt.1.ddl.aql | 51 ---- .../q01_pricing_summary_report_nt.2.update.aql | 30 --- .../q01_pricing_summary_report_nt.3.query.aql | 46 ---- .../scan-delete-rtree-secondary-index.1.ddl.aql | 44 ---- ...an-delete-rtree-secondary-index.2.update.aql | 30 --- .../scan-delete-rtree-secondary-index.3.ddl.aql | 28 --- ...an-delete-rtree-secondary-index.4.update.aql | 28 --- ...can-delete-rtree-secondary-index.5.query.aql | 30 --- .../scan-insert-persistent-to-temp.1.ddl.aql | 53 ---- .../scan-insert-persistent-to-temp.2.update.aql | 35 --- .../scan-insert-persistent-to-temp.3.ddl.aql | 30 --- .../scan-insert-persistent-to-temp.4.update.aql | 36 --- .../scan-insert-persistent-to-temp.5.query.aql | 31 --- .../scan-insert-rtree-secondary-index.1.ddl.aql | 53 ---- ...an-insert-rtree-secondary-index.2.update.aql | 35 --- .../scan-insert-rtree-secondary-index.3.ddl.aql | 30 --- ...an-insert-rtree-secondary-index.4.update.aql | 36 --- ...can-insert-rtree-secondary-index.5.query.aql | 31 --- .../scan-insert-temp-to-persistent.1.ddl.aql | 53 ---- .../scan-insert-temp-to-persistent.2.update.aql | 35 --- .../scan-insert-temp-to-persistent.3.ddl.aql | 30 --- .../scan-insert-temp-to-persistent.4.update.aql | 36 --- .../scan-insert-temp-to-persistent.5.query.aql | 31 --- .../temp_primary_plus_ngram_flush.1.ddl.aql | 67 ----- .../temp_primary_plus_ngram_flush.2.update.aql | 46 ---- .../temp_primary_plus_ngram_flush.3.query.aql | 29 --- ...e-from-loaded-dataset-with-index.1.ddl.sqlpp | 53 ---- ...rom-loaded-dataset-with-index.2.update.sqlpp | 30 --- ...e-from-loaded-dataset-with-index.3.ddl.sqlpp | 33 --- ...rom-loaded-dataset-with-index.4.update.sqlpp | 30 --- ...from-loaded-dataset-with-index.5.query.sqlpp | 33 --- .../delete-from-loaded-dataset.1.ddl.sqlpp | 53 ---- .../delete-from-loaded-dataset.2.update.sqlpp | 32 --- .../delete-from-loaded-dataset.3.query.sqlpp | 32 --- .../drop-empty-secondary-indexes.1.ddl.sqlpp | 77 ------ .../drop-empty-secondary-indexes.2.update.sqlpp | 25 -- .../drop-empty-secondary-indexes.3.query.sqlpp | 29 --- .../drop-index/drop-index.1.ddl.sqlpp | 53 ---- .../drop-index/drop-index.2.update.sqlpp | 30 --- .../drop-index/drop-index.3.ddl.sqlpp | 37 --- .../drop-index/drop-index.4.query.sqlpp | 32 --- .../empty-load-with-index.1.ddl.sqlpp | 55 ---- .../empty-load-with-index.2.update.sqlpp | 31 --- .../empty-load-with-index.3.query.sqlpp | 32 --- ...an-dataset-with-correlated-index.1.ddl.sqlpp | 42 ---- ...dataset-with-correlated-index.2.update.sqlpp | 35 --- ...an-dataset-with-correlated-index.3.ddl.sqlpp | 32 --- ...-dataset-with-correlated-index.4.query.sqlpp | 33 --- ...sert-and-scan-dataset-with-index.1.ddl.sqlpp | 42 ---- ...t-and-scan-dataset-with-index.2.update.sqlpp | 34 --- ...rt-and-scan-dataset-with-index.3.query.sqlpp | 32 --- .../insert-and-scan-dataset.1.ddl.sqlpp | 38 --- .../insert-and-scan-dataset.2.update.sqlpp | 35 --- .../insert-and-scan-dataset.3.query.sqlpp | 34 --- .../q01_pricing_summary_report_nt.1.ddl.sqlpp | 52 ---- ...q01_pricing_summary_report_nt.2.update.sqlpp | 29 --- .../q01_pricing_summary_report_nt.3.query.sqlpp | 44 ---- ...can-delete-rtree-secondary-index.1.ddl.sqlpp | 45 ---- ...-delete-rtree-secondary-index.2.update.sqlpp | 29 --- ...can-delete-rtree-secondary-index.3.ddl.sqlpp | 29 --- ...-delete-rtree-secondary-index.4.update.sqlpp | 29 --- ...n-delete-rtree-secondary-index.5.query.sqlpp | 32 --- .../scan-insert-persistent-to-temp.1.ddl.sqlpp | 54 ---- ...can-insert-persistent-to-temp.2.update.sqlpp | 32 --- .../scan-insert-persistent-to-temp.3.ddl.sqlpp | 32 --- ...can-insert-persistent-to-temp.4.update.sqlpp | 32 --- ...scan-insert-persistent-to-temp.5.query.sqlpp | 33 --- ...can-insert-rtree-secondary-index.1.ddl.sqlpp | 54 ---- ...-insert-rtree-secondary-index.2.update.sqlpp | 32 --- ...can-insert-rtree-secondary-index.3.ddl.sqlpp | 32 --- ...-insert-rtree-secondary-index.4.update.sqlpp | 32 --- ...n-insert-rtree-secondary-index.5.query.sqlpp | 33 --- .../scan-insert-temp-to-persistent.1.ddl.sqlpp | 54 ---- ...can-insert-temp-to-persistent.2.update.sqlpp | 32 --- .../scan-insert-temp-to-persistent.3.ddl.sqlpp | 32 --- ...can-insert-temp-to-persistent.4.update.sqlpp | 32 --- ...scan-insert-temp-to-persistent.5.query.sqlpp | 33 --- .../rebalance/all_datasets/all_datasets.11.adm | 2 +- .../rebalance/all_datasets/all_datasets.12.adm | 2 +- .../rebalance/all_datasets/all_datasets.5.adm | 2 +- .../rebalance/all_datasets/all_datasets.6.adm | 2 +- .../single_dataset/single_dataset.5.adm | 2 +- .../single_dataset/single_dataset.9.adm | 2 +- .../single_dataset_with_index.10.adm | 2 +- .../single_dataset_with_index.5.adm | 2 +- .../single_dataverse/single_dataverse.11.adm | 2 +- .../single_dataverse/single_dataverse.12.adm | 2 +- .../single_dataverse/single_dataverse.5.adm | 2 +- .../single_dataverse/single_dataverse.6.adm | 2 +- .../compact-dataset-and-its-indexes.1.adm | 167 ------------- .../delete-from-loaded-dataset-with-index.1.adm | 167 ------------- .../delete-from-loaded-dataset.1.adm | 25 -- .../drop-empty-secondary-indexes.1.adm | 0 .../temp-dataset/drop-index/drop-index.1.adm | 1 - .../empty-load-with-index.1.adm | 1 - .../insert-and-scan-dataset-with-index.1.adm | 240 ------------------ .../insert-and-scan-dataset.1.adm | 20 -- .../q01_pricing_summary_report_nt.1.adm | 4 - .../scan-delete-rtree-secondary-index.1.adm | 1 - .../scan-insert-persistent-to-temp.1.adm | 3 - .../scan-insert-rtree-secondary-index.1.adm | 3 - .../scan-insert-persistent-to-temp.1.adm | 3 - .../temp_primary_plus_ngram_flush.3.adm | 1 - .../delete-from-loaded-dataset-with-index.1.ast | 22 -- .../delete-from-loaded-dataset-with-index.2.ast | 1 - .../delete-from-loaded-dataset-with-index.3.ast | 1 - .../delete-from-loaded-dataset-with-index.4.ast | 1 - .../delete-from-loaded-dataset-with-index.5.ast | 31 --- .../delete-from-loaded-dataset.1.ast | 22 -- .../delete-from-loaded-dataset.2.ast | 1 - .../delete-from-loaded-dataset.3.ast | 22 -- .../drop-empty-secondary-indexes.1.ast | 22 -- .../drop-empty-secondary-indexes.2.ast | 0 .../drop-empty-secondary-indexes.3.ast | 29 --- .../temp-dataset/drop-index/drop-index.1.ast | 22 -- .../temp-dataset/drop-index/drop-index.2.ast | 1 - .../temp-dataset/drop-index/drop-index.3.ast | 1 - .../temp-dataset/drop-index/drop-index.4.ast | 30 --- .../empty-load-with-index.1.ast | 22 -- .../empty-load-with-index.2.ast | 1 - .../empty-load-with-index.3.ast | 24 -- .../insert-and-scan-dataset-with-index.1.ast | 10 - .../insert-and-scan-dataset-with-index.2.ast | 1 - .../insert-and-scan-dataset-with-index.3.ast | 17 -- .../insert-and-scan-dataset.1.ast | 7 - .../insert-and-scan-dataset.2.ast | 1 - .../insert-and-scan-dataset.3.ast | 17 -- .../q01_pricing_summary_report_nt.1.ast | 22 -- .../q01_pricing_summary_report_nt.2.ast | 1 - .../q01_pricing_summary_report_nt.3.ast | 249 ------------------- .../scan-delete-rtree-secondary-index.1.ast | 15 -- .../scan-delete-rtree-secondary-index.2.ast | 1 - .../scan-delete-rtree-secondary-index.3.ast | 1 - .../scan-delete-rtree-secondary-index.4.ast | 1 - .../scan-delete-rtree-secondary-index.5.ast | 45 ---- .../scan-insert-persistent-to-temp.1.ast | 22 -- .../scan-insert-persistent-to-temp.2.ast | 1 - .../scan-insert-persistent-to-temp.3.ast | 1 - .../scan-insert-persistent-to-temp.4.ast | 1 - .../scan-insert-persistent-to-temp.5.ast | 45 ---- .../scan-insert-rtree-secondary-index.1.ast | 22 -- .../scan-insert-rtree-secondary-index.2.ast | 1 - .../scan-insert-rtree-secondary-index.3.ast | 1 - .../scan-insert-rtree-secondary-index.4.ast | 1 - .../scan-insert-rtree-secondary-index.5.ast | 45 ---- .../scan-insert-temp-to-persistent.1.ast | 22 -- .../scan-insert-temp-to-persistent.2.ast | 1 - .../scan-insert-temp-to-persistent.3.ast | 1 - .../scan-insert-temp-to-persistent.4.ast | 1 - .../scan-insert-temp-to-persistent.5.ast | 45 ---- .../src/test/resources/runtimets/testsuite.xml | 72 ------ .../resources/runtimets/testsuite_sqlpp.xml | 67 +---- .../runtimets/testsuite_sqlpp_parser.xml | 62 ----- .../asterix/common/utils/StoragePathUtil.java | 1 - .../primary_index_only.1.script.aql | 19 -- .../primary_index_only.2.ddl.aql | 59 ----- .../primary_index_only.3.update.aql | 29 --- .../primary_index_only.4.txneu.aql | 40 --- .../primary_index_only.5.txnqbc.aql | 28 --- .../primary_index_only.6.script.aql | 19 -- .../primary_index_only.7.script.aql | 19 -- .../primary_index_only.8.txnqar.aql | 28 --- .../primary_index_only.9.script.aql | 19 -- ...ry_plus_default_secondary_index.1.script.aql | 19 -- ...imary_plus_default_secondary_index.2.ddl.aql | 71 ------ ...ry_plus_default_secondary_index.3.update.aql | 29 --- ...ary_plus_default_secondary_index.4.txneu.aql | 43 ---- ...ry_plus_default_secondary_index.5.txnqbc.aql | 28 --- ...ry_plus_default_secondary_index.6.script.aql | 19 -- ...ry_plus_default_secondary_index.7.script.aql | 19 -- ...ry_plus_default_secondary_index.8.txnqar.aql | 28 --- ...ry_plus_default_secondary_index.9.script.aql | 19 -- ...ry_plus_keyword_secondary_index.1.script.aql | 19 -- ...imary_plus_keyword_secondary_index.2.ddl.aql | 72 ------ ...ry_plus_keyword_secondary_index.3.update.aql | 30 --- ...ary_plus_keyword_secondary_index.4.txneu.aql | 43 ---- ...ry_plus_keyword_secondary_index.5.txnqbc.aql | 23 -- ...ry_plus_keyword_secondary_index.6.script.aql | 19 -- ...ry_plus_keyword_secondary_index.7.script.aql | 19 -- ...ry_plus_keyword_secondary_index.8.txnqar.aql | 23 -- ...ry_plus_keyword_secondary_index.9.script.aql | 19 -- ...plus_multiple_secondary_indices.1.script.aql | 19 -- ...ry_plus_multiple_secondary_indices.2.ddl.aql | 78 ------ ...plus_multiple_secondary_indices.3.update.aql | 30 --- ..._plus_multiple_secondary_indices.4.txneu.aql | 43 ---- ...plus_multiple_secondary_indices.5.txnqbc.aql | 30 --- ...plus_multiple_secondary_indices.6.script.aql | 19 -- ...plus_multiple_secondary_indices.7.script.aql | 19 -- ...plus_multiple_secondary_indices.8.txnqar.aql | 23 -- ...plus_multiple_secondary_indices.9.script.aql | 19 -- .../primary_plus_ngram_index.1.script.aql | 19 -- .../primary_plus_ngram_index.2.ddl.aql | 71 ------ .../primary_plus_ngram_index.3.update.aql | 29 --- .../primary_plus_ngram_index.4.txneu.aql | 43 ---- .../primary_plus_ngram_index.5.txnqbc.aql | 29 --- .../primary_plus_ngram_index.6.script.aql | 19 -- .../primary_plus_ngram_index.7.script.aql | 19 -- .../primary_plus_ngram_index.8.txnqar.aql | 29 --- .../primary_plus_ngram_index.9.script.aql | 19 -- .../primary_plus_rtree_index.1.script.aql | 19 -- .../primary_plus_rtree_index.2.ddl.aql | 72 ------ .../primary_plus_rtree_index.3.update.aql | 30 --- .../primary_plus_rtree_index.4.txneu.aql | 43 ---- .../primary_plus_rtree_index.5.txnqbc.aql | 23 -- .../primary_plus_rtree_index.6.script.aql | 19 -- .../primary_plus_rtree_index.7.script.aql | 19 -- .../primary_plus_rtree_index.8.txnqar.aql | 23 -- .../primary_plus_rtree_index.9.script.aql | 19 -- .../dataset_recovery.1.script.aql | 19 -- .../dataset_recovery.2.ddl.aql | 37 --- .../dataset_recovery.3.script.aql | 19 -- .../dataset_recovery.4.script.aql | 19 -- .../dataset_recovery.5.errddl.aql | 20 -- .../dataset_recovery.6.script.aql | 19 -- .../delete_after_recovery.1.script.aql | 19 -- .../delete_after_recovery.2.ddl.aql | 59 ----- .../delete_after_recovery.3.update.aql | 29 --- .../delete_after_recovery.4.script.aql | 19 -- .../delete_after_recovery.5.script.aql | 19 -- .../delete_after_recovery.6.update.aql | 23 -- .../delete_after_recovery.7.query.aql | 29 --- .../delete_after_recovery.8.script.aql | 19 -- .../insert_after_recovery.1.script.aql | 19 -- .../insert_after_recovery.2.ddl.aql | 59 ----- .../insert_after_recovery.3.update.aql | 29 --- .../insert_after_recovery.4.script.aql | 19 -- .../insert_after_recovery.5.script.aql | 19 -- .../insert_after_recovery.6.update.aql | 33 --- .../insert_after_recovery.7.query.aql | 29 --- .../insert_after_recovery.8.script.aql | 19 -- .../load_after_recovery.1.script.aql | 19 -- .../load_after_recovery.2.ddl.aql | 59 ----- .../load_after_recovery.3.script.aql | 19 -- .../load_after_recovery.4.script.aql | 19 -- .../load_after_recovery.5.update.aql | 29 --- .../load_after_recovery.6.query.aql | 28 --- .../load_after_recovery.7.script.aql | 19 -- .../secondary_index_recovery.1.script.aql | 19 -- .../secondary_index_recovery.2.ddl.aql | 39 --- .../secondary_index_recovery.3.script.aql | 19 -- .../secondary_index_recovery.4.script.aql | 19 -- .../secondary_index_recovery.5.errddl.aql | 20 -- .../secondary_index_recovery.6.script.aql | 19 -- .../delete_after_recovery.1.adm | 1 - .../insert_after_recovery.1.adm | 1 - .../load_after_recovery.1.adm | 1 - .../temp_primary_index_only/create_and_start.sh | 18 -- .../temp_primary_index_only/kill_cc_and_nc.sh | 18 -- .../temp_primary_index_only/stop_and_delete.sh | 20 -- .../temp_primary_index_only/stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../temp_dataset_recovery/create_and_start.sh | 18 -- .../temp_dataset_recovery/kill_cc_and_nc.sh | 18 -- .../temp_dataset_recovery/stop_and_delete.sh | 20 -- .../temp_dataset_recovery/stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../temp_load_after_recovery/kill_cc_and_nc.sh | 18 -- .../temp_load_after_recovery/stop_and_delete.sh | 20 -- .../temp_load_after_recovery/stop_and_start.sh | 20 -- .../create_and_start.sh | 18 -- .../kill_cc_and_nc.sh | 18 -- .../stop_and_delete.sh | 20 -- .../stop_and_start.sh | 20 -- .../test/resources/transactionts/testsuite.xml | 74 ------ .../asterix-lang-aql/src/main/javacc/AQL.jj | 11 +- .../common/statement/ExternalDetailsDecl.java | 5 - .../common/statement/IDatasetDetailsDecl.java | 2 - .../common/statement/InternalDetailsDecl.java | 9 +- .../lang/common/visitor/FormatPrintVisitor.java | 3 +- .../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 8 +- .../asterix/metadata/GarbageCollector.java | 67 ----- .../asterix/metadata/IDatasetDetails.java | 25 +- .../apache/asterix/metadata/MetadataCache.java | 24 -- .../asterix/metadata/MetadataManager.java | 85 ++----- .../asterix/metadata/api/IMetadataManager.java | 7 - .../metadata/bootstrap/MetadataBootstrap.java | 2 +- .../declared/BTreeResourceFactoryProvider.java | 7 +- .../metadata/declared/MetadataProvider.java | 22 -- .../asterix/metadata/entities/Dataset.java | 59 ++--- .../entities/ExternalDatasetDetails.java | 12 - .../entities/InternalDatasetDetails.java | 17 +- .../DatasetTupleTranslator.java | 7 +- .../asterix/metadata/utils/DatasetUtil.java | 8 +- .../utils/ExternalIndexingOperations.java | 2 +- .../InvertedIndexResourceFactoryProvider.java | 3 +- .../utils/RTreeResourceFactoryProvider.java | 5 +- ...daryCorrelatedTreeIndexOperationsHelper.java | 6 +- .../SecondaryTreeIndexOperationsHelper.java | 2 +- .../utils/SplitsAndConstraintsUtil.java | 4 +- .../DatasetTupleTranslatorTest.java | 2 +- .../IndexTupleTranslatorTest.java | 2 +- ...tasetIndexModificationOperationCallback.java | 54 ---- ...dexModificationOperationCallbackFactory.java | 80 ------ ...dexModificationOperationCallbackFactory.java | 81 ------ .../PersistentLocalResourceRepository.java | 27 +- .../management/runtime/CommitRuntime.java | 34 +-- .../runtime/CommitRuntimeFactory.java | 11 +- 370 files changed, 123 insertions(+), 9806 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java index b51187c..ba7ee12 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java @@ -102,7 +102,6 @@ public class ConnectorApiServlet extends AbstractServlet { out.flush(); return; } - boolean temp = dataset.getDatasetDetails().isTemp(); FileSplit[] fileSplits = metadataProvider.splitsForIndex(mdTxnCtx, dataset, datasetName); ARecordType recordType = (ARecordType) metadataProvider.findType(dataset.getItemTypeDataverseName(), dataset.getItemTypeName()); @@ -115,7 +114,7 @@ public class ConnectorApiServlet extends AbstractServlet { } pkStrBuf.delete(pkStrBuf.length() - 1, pkStrBuf.length()); // Constructs the returned json object. - formResponseObject(jsonResponse, fileSplits, recordType, pkStrBuf.toString(), temp, + formResponseObject(jsonResponse, fileSplits, recordType, pkStrBuf.toString(), hcc.getNodeControllerInfos()); // Flush the cached contents of the dataset to file system. @@ -138,10 +137,8 @@ public class ConnectorApiServlet extends AbstractServlet { } private void formResponseObject(ObjectNode jsonResponse, FileSplit[] fileSplits, ARecordType recordType, - String primaryKeys, boolean temp, Map<String, NodeControllerInfo> nodeMap) { + String primaryKeys, Map<String, NodeControllerInfo> nodeMap) { ArrayNode partititons = OBJECT_MAPPER.createArrayNode(); - // Whether the dataset is temp or not - jsonResponse.put("temp", temp); // Adds a primary key. jsonResponse.put("keys", primaryKeys); // Adds record type. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 05debaa..2fc3258 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -529,8 +529,6 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen String compactionPolicy = dd.getCompactionPolicy(); Map<String, String> compactionPolicyProperties = dd.getCompactionPolicyProperties(); boolean defaultCompactionPolicy = compactionPolicy == null; - boolean temp = dd.getDatasetDetailsDecl().isTemp(); - MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); boolean bActiveTxn = true; metadataProvider.setMetadataTxnContext(mdTxnCtx); @@ -602,7 +600,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } datasetDetails = new InternalDatasetDetails(InternalDatasetDetails.FileStructure.BTREE, InternalDatasetDetails.PartitioningStrategy.HASH, partitioningExprs, partitioningExprs, - keySourceIndicators, partitioningTypes, autogenerated, filterField, temp); + keySourceIndicators, partitioningTypes, autogenerated, filterField); break; case EXTERNAL: String adapter = ((ExternalDetailsDecl) dd.getDatasetDetailsDecl()).getAdapter(); @@ -2874,7 +2872,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen new DropDatasetStatement(new Identifier(dataverseNameTo), pregelixStmt.getDatasetNameTo(), true); this.handleDatasetDropStatement(metadataProvider, dropStmt, hcc, null); IDatasetDetailsDecl idd = new InternalDetailsDecl(toIndex.getKeyFieldNames(), - toIndex.getKeyFieldSourceIndicators(), false, null, toDataset.getDatasetDetails().isTemp()); + toIndex.getKeyFieldSourceIndicators(), false, null); DatasetDecl createToDataset = new DatasetDecl(new Identifier(dataverseNameTo), pregelixStmt.getDatasetNameTo(), new Identifier(toDataset.getItemTypeDataverseName()), new Identifier(toDataset.getItemTypeName()), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java index a18535d..63f5bfc 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java @@ -226,19 +226,6 @@ public class NCApplication extends BaseNCApplication { //Delete working area files from failed jobs runtimeContext.getIoManager().deleteWorkspaceFiles(); - //Reclaim storage for temporary datasets. - String storageDirName = ClusterProperties.INSTANCE.getStorageDirectoryName(); - String[] ioDevices = ((PersistentLocalResourceRepository) runtimeContext.getLocalResourceRepository()) - .getStorageMountingPoints(); - for (String ioDevice : ioDevices) { - String tempDatasetsDir = - ioDevice + storageDirName + File.separator + StoragePathUtil.TEMP_DATASETS_STORAGE_FOLDER; - File tmpDsDir = new File(tempDatasetsDir); - if (tmpDsDir.exists()) { - IoUtil.delete(tmpDsDir); - } - } - //TODO //Reclaim storage for orphaned index artifacts in NCs. //Note: currently LSM indexes invalid components are deleted when an index is activated. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java index cd58d8f..33f3a42 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java @@ -113,9 +113,7 @@ public class ConnectorApiServletTest { ObjectMapper om = new ObjectMapper(); ObjectNode actualResponse = (ObjectNode) om.readTree(outputStream.toString()); - // Checks the temp-or-not, primary key, data type of the dataset. - boolean temp = actualResponse.get("temp").asBoolean(); - Assert.assertFalse(temp); + // Checks the primary key, data type of the dataset. String primaryKey = actualResponse.get("keys").asText(); Assert.assertEquals("DataverseName,DatasetName", primaryKey); ARecordType recordType = (ARecordType) JSONDeserializerForTypes.convertFromJSON(actualResponse.get("type")); @@ -154,12 +152,10 @@ public class ConnectorApiServletTest { nodeMap.put("asterix_nc2", mockInfo2); PA.invokeMethod(let, "formResponseObject(" + ObjectNode.class.getName() + ", " + FileSplit.class.getName() + "[], " - + ARecordType.class.getName() + ", " + String.class.getName() + ", boolean, " - + Map.class.getName() + ")", - actualResponse, splits, recordType, primaryKey, true, nodeMap); + + ARecordType.class.getName() + ", " + String.class.getName() + ", " + Map.class.getName() + ")", + actualResponse, splits, recordType, primaryKey, nodeMap); // Constructs expected response. ObjectNode expectedResponse = om.createObjectNode(); - expectedResponse.put("temp", true); expectedResponse.put("keys", primaryKey); expectedResponse.set("type", recordType.toJSON()); ArrayNode splitsArray = om.createArrayNode(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java index 505ef8f..72a9b44 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java @@ -189,7 +189,7 @@ public class TestNodeController { op, true, indexHelperFactory, modOpCallbackFactory, null); CommitRuntime commitOp = new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(), primaryIndexInfo.primaryKeyIndexes, - false, true, ctx.getTaskAttemptId().getTaskId().getPartition(), true); + true, ctx.getTaskAttemptId().getTaskId().getPartition(), true); insertOp.setOutputFrameWriter(0, commitOp, primaryIndexInfo.rDesc); commitOp.setInputRecordDescriptor(0, primaryIndexInfo.rDesc); return Pair.of(insertOp, commitOp); @@ -261,7 +261,7 @@ public class TestNodeController { recordType, metaType, mergePolicy.first, mergePolicy.second); IndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory(storageComponentProvider.getStorageManager(), - primaryIndexInfo.getFileSplitProvider(), resourceFactory, !dataset.isTemp()); + primaryIndexInfo.getFileSplitProvider(), resourceFactory, true); IHyracksTaskContext ctx = createTestContext(newJobId(), partition, false); IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx, partition); indexBuilder.build(); @@ -475,7 +475,7 @@ public class TestNodeController { pkFieldsInCommitOp[i] = diff + i; } CommitRuntime commitOp = new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(), pkFieldsInCommitOp, - false, true, ctx.getTaskAttemptId().getTaskId().getPartition(), true); + true, ctx.getTaskAttemptId().getTaskId().getPartition(), true); insertOp.setOutputFrameWriter(0, commitOp, upsertOutRecDesc); commitOp.setInputRecordDescriptor(0, upsertOutRecDesc); return Pair.of(insertOp, commitOp); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java index 1ac1aa6..70436b5 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java @@ -137,7 +137,7 @@ public class ComponentRollbackTest { int partition = 0; dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); PrimaryIndexInfo primaryIndexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, partition); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java index aa08c2d..963cded 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java @@ -114,7 +114,7 @@ public class LogMarkerTest { partitioningKeys.add(Collections.singletonList("key")); Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); try { PrimaryIndexInfo indexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java index ec9c2f6..2c8141ce 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java @@ -115,7 +115,7 @@ public class MultiPartitionLSMIndexTest { partitioningKeys.add(Collections.singletonList("key")); dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); taskCtxs = new IHyracksTaskContext[NUM_PARTITIONS]; indexDataflowHelpers = new IIndexDataflowHelper[NUM_PARTITIONS]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java index 77d3795..b65ba03 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java @@ -123,7 +123,7 @@ public class SearchCursorComponentSwitchTest { partitioningKeys.add(Collections.singletonList("key")); dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); PrimaryIndexInfo primaryIndexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java index 4511f42..7268296 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java @@ -66,7 +66,6 @@ public class TestLsmBTreeResourceFactoryProvider implements IResourceFactoryProv ITypeTraits[] typeTraits = getTypeTraits(mdProvider, dataset, index, recordType, metaType); IBinaryComparatorFactory[] cmpFactories = getCmpFactories(mdProvider, dataset, index, recordType, metaType); int[] bloomFilterFields = getBloomFilterFields(dataset, index); - boolean durable = !dataset.isTemp(); double bloomFilterFalsePositiveRate = mdProvider.getStorageProperties().getBloomFilterFalsePositiveRate(); ILSMOperationTrackerFactory opTrackerFactory = dataset.getIndexOperationTrackerFactory(index); ILSMIOOperationCallbackFactory ioOpCallbackFactory = dataset.getIoOperationCallbackFactory(index); @@ -78,7 +77,7 @@ public class TestLsmBTreeResourceFactoryProvider implements IResourceFactoryProv AsterixVirtualBufferCacheProvider vbcProvider = new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()); return new TestLsmBtreeLocalResourceFactory(storageManager, typeTraits, cmpFactories, filterTypeTraits, filterCmpFactories, filterFields, opTrackerFactory, ioOpCallbackFactory, metadataPageManagerFactory, - vbcProvider, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, durable, bloomFilterFields, + vbcProvider, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, true, bloomFilterFields, bloomFilterFalsePositiveRate, index.isPrimaryIndex(), btreeFields); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java index 1be1d26..30cfb4f 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java @@ -123,7 +123,7 @@ public class CheckpointingTest { partitioningKeys.add(Collections.singletonList("key")); Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); try { nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java index 8e8b3e9..dabf9d3 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java @@ -121,7 +121,7 @@ public class DiskIsFullTest { partitioningKeys.add(Collections.singletonList("key")); Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH, - partitioningKeys, null, null, null, false, null, false), + partitioningKeys, null, null, null, false, null), null, DatasetType.INTERNAL, DATASET_ID, 0); try { nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java index cc6c0f7..402da6c 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java @@ -106,7 +106,7 @@ public class IndexDropOperatorNodePushableTest { Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME, NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, InternalDatasetDetails.PartitioningStrategy.HASH, partitioningKeys, - null, null, null, false, null, false), + null, null, null, false, null), null, DatasetConfig.DatasetType.INTERNAL, DATASET_ID, 0); // create dataset TestNodeController.PrimaryIndexInfo indexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql deleted file mode 100644 index 6674622..0000000 --- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create a temporary dataset and verify the dataset does not exist in the metadata store - * Expected Res : Success - * Date : March 12 2015 - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; - -create type LineItemType as closed { - l_orderkey: int64, - l_partkey: int64, - l_suppkey: int64, - l_linenumber: int64, - l_quantity: double, - l_extendedprice: double, - l_discount: double, - l_tax: double, - l_returnflag: string, - l_linestatus: string, - l_shipdate: string, - l_commitdate: string, - l_receiptdate: string, - l_shipinstruct: string, - l_shipmode: string, - l_comment: string -} - -create temporary dataset LineItem(LineItemType) - primary key l_orderkey, l_linenumber; - - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql deleted file mode 100644 index 3e06e46..0000000 --- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create dataverse and drop that dataverse and verify dataverse entries in metadata - * Expected Res : Success - * Date : Sep 17 2012 - */ - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql deleted file mode 100644 index 9d77309..0000000 --- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create dataverse and drop that dataverse and verify dataverse entries in metadata - * Expected Res : Success - * Date : Sep 17 2012 - */ - - -for $l in dataset('Metadata.Dataset') -where $l.DataverseName = 'test' -return $l; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm deleted file mode 100644 index 8b13789..0000000 --- a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm +++ /dev/null @@ -1 +0,0 @@ - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml b/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml index 02efe62..036a4bc 100644 --- a/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml +++ b/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml @@ -324,11 +324,6 @@ </compilation-unit> </test-case> <test-case FilePath="basic"> - <compilation-unit name="temp_dataset"> - <output-dir compare="Text">temp_dataset</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="basic"> <compilation-unit name="issue_1419_drop_type_with_collection_1"> <output-dir compare="Text">issue_1419_drop_type_with_collection</output-dir> </compilation-unit> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql deleted file mode 100644 index 3d529fb..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset with indexes. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; - -create type LineItemType as closed { - l_orderkey: int64, - l_partkey: int64, - l_suppkey: int64, - l_linenumber: int64, - l_quantity: int64, - l_extendedprice: double, - l_discount: double, - l_tax: double, - l_returnflag: string, - l_linestatus: string, - l_shipdate: string, - l_commitdate: string, - l_receiptdate: string, - l_shipinstruct: string, - l_shipmode: string, - l_comment: string -} - -create temporary dataset LineItem(LineItemType) - primary key l_orderkey, l_linenumber; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql deleted file mode 100644 index bc2b6ee..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset with indexes. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -load dataset LineItem -using localfs -(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql deleted file mode 100644 index 496ce13..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset with indexes. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -create index idx_LineItem_partkey on LineItem(l_linenumber); -create index idx_LineItem_suppkey on LineItem(l_suppkey); - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql deleted file mode 100644 index edc4af6..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset with indexes. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -delete $l from dataset LineItem where $l.l_suppkey>=2 or $l.l_linenumber>1; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql deleted file mode 100644 index 88d4a86..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset with indexes. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -for $c in dataset('LineItem') -where $c.l_suppkey<150 -order by $c.l_orderkey, $c.l_linenumber -return $c http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql deleted file mode 100644 index 7cf6796..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; - -create type LineItemType as closed { - l_orderkey: int64, - l_partkey: int64, - l_suppkey: int64, - l_linenumber: int64, - l_quantity: int64, - l_extendedprice: double, - l_discount: double, - l_tax: double, - l_returnflag: string, - l_linestatus: string, - l_shipdate: string, - l_commitdate: string, - l_receiptdate: string, - l_shipinstruct: string, - l_shipmode: string, - l_comment: string -} - -create temporary dataset LineItem(LineItemType) - primary key l_orderkey, l_linenumber; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql deleted file mode 100644 index e6b98c7..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -load dataset LineItem -using localfs -(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted; - -delete $l from dataset LineItem where $l.l_orderkey>=10; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql deleted file mode 100644 index c88cf8c..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Delete a portion of data from a loaded temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -for $c in dataset('LineItem') -order by $c.l_orderkey, $c.l_linenumber -return $c http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql deleted file mode 100644 index 3b6c965..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop empty secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; -create type Name as open { -first : string, -last : string -} - -create type Person as open { -name : Name -} - -create type TestType as open { -id : int32, -name : string, -locn : point, -zip : string, -person : Person -} - -create temporary dataset t1(TestType) primary key id; - -create index rtree_index_point on t1(locn) type rtree; - -create index rtree_index_point_open on t1(open_locn:point?) type rtree enforced; - -create index keyWD_indx on t1(name) type keyword; - -create index keyWD_indx_open on t1(nickname:string?) type keyword enforced; - -create index secndIndx on t1(zip); - -create index nested on t1(person.name.first); - -create index secndIndx_open on t1(address:string?) enforced; - -drop index t1.rtree_index_point; - -drop index t1.rtree_index_point_open; - -drop index t1.keyWD_indx; - -drop index t1.keyWD_indx_open; - -drop index t1.secndIndx; - -drop index t1.nested; - -drop index t1.secndIndx_open; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql deleted file mode 100644 index ebe3e6a..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop empty secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql deleted file mode 100644 index 61f4309..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop empty secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -for $l in dataset('Metadata.Index') -where $l.IsPrimary=false and $l.DataverseName='test' -return $l; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql deleted file mode 100644 index 887b004..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; - -create type Schema as closed { -unique1: int64, -unique2: int64, -two: int64, -four: int64, -ten: int64, -twenty: int64, -onePercent: int64, -tenPercent: int64, -twentyPercent: int64, -fiftyPercent: int64, -unique3: int64, -evenOnePercent: int64, -oddOnePercent: int64, -stringu1: string, -stringu2: string, -string4: string -} - -create temporary dataset t1(Schema) primary key unique2; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql deleted file mode 100644 index bf556a0..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -// Load data -load dataset t1 -using localfs -(("path"="asterix_nc1://data/wisc/onektup.adm"),("format"="delimited-text"),("delimiter"="|")) pre-sorted; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql deleted file mode 100644 index a66a9e5..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -// create secondary indexes -create index idx_t1_str1 on t1(stringu1); -create index idx_t1_unique1 on t1(unique1); - -// drop secondary indexes -drop index t1.idx_t1_str1; -drop index t1.idx_t1_unique1; - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql deleted file mode 100644 index 7a17743..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Drop secondary indexes for a temporary dataset. - * Expected Result : Success - * Date : 27th March 2015 - * - */ - -use dataverse test; - -for $a in dataset('t1') -where $a.unique1 > 10 and $a.stringu1="DGAAAAXXXXXXXXXXXXXXXXXXX" -return $a http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql deleted file mode 100644 index d1f5a7a..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Load a temporary dataset with previously created empty indexes. - * Expected Result : Success - * Date : March 27 2015 - */ - -drop dataverse test if exists; -create dataverse test; - -use dataverse test; - -create type LineItemType as closed { - l_orderkey: int64, - l_partkey: int64, - l_suppkey: int64, - l_linenumber: int64, - l_quantity: double, - l_extendedprice: double, - l_discount: double, - l_tax: double, - l_returnflag: string, - l_linestatus: string, - l_shipdate: string, - l_commitdate: string, - l_receiptdate: string, - l_shipinstruct: string, - l_shipmode: string, - l_comment: string -} - -create temporary dataset LineItem(LineItemType) - primary key l_orderkey, l_linenumber; - -create index part_index on LineItem(l_partkey); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/2c04ae07/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql deleted file mode 100644 index 7223583..0000000 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Load a temporary dataset with previously created empty indexes. - * Expected Result : Success - * Date : March 27 2015 - */ - -use dataverse test; - -load dataset LineItem -using localfs -(("path"="asterix_nc1://data/empty.adm"),("format"="delimited-text"),("delimiter"="|")) pre-sorted; - -load dataset LineItem -using localfs -(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
