Xikui Wang has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1965
Change subject: [NO ISSUE][TEST] Add import order to perf test
......................................................................
[NO ISSUE][TEST] Add import order to perf test
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
1. Add data file removal after import to save space.
2. Add import order to import small datasets first.
Change-Id: I6ce4e55d4fbd5e082e9f01c526f258891574cb68
---
M asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
M
asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
M
asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
3 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/65/1965/1
diff --git
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
index ff22a7d..9835be9 100644
---
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
+++
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/load.yml
@@ -28,8 +28,8 @@
include: loadgen.yml
- name: Load all datasets
- shell: "ansible-playbook -i {{ inventory }} {{ runquery }}
--extra-vars=\"query_file={{ dml }} report=false\""
- with_fileglob:
- - "{{ dml_dir }}/*"
+ shell: "ansible-playbook -i {{ inventory }} {{ runquery }}
--extra-vars=\"query_file={{ dml_dir }}/load{{ dataset }}.sqlpp report=false\";
+ ansible ncs -i {{ inventory }} -m shell -a \"rm -f {{ data_dir }}/{{
dataset | lower}}.tbl*\""
+ with_items: "{{ dataset_import_order }}"
loop_control:
- loop_var: dml
+ loop_var: dataset
diff --git
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
index 17a3638..4f3030e 100644
---
a/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
+++
b/asterixdb/asterix-benchmark/src/main/resources/benchmarks/tpch/load/settings.yml
@@ -23,6 +23,8 @@
# Datasets with a single file.
centralized_datasets: ["Region", "Nation"]
+dataset_import_order: ["Region", "Nation", "Supplier", "Part", "Customer",
"Partsupp", "Orders", "LineItem"]
+
# Temp directory.
temp_dir: "/tmp/asterixdb"
diff --git
a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
index ea635f4..5b07eed 100644
---
a/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
+++
b/asterixdb/asterix-benchmark/src/main/resources/others/SparkSQL/ansible/load_tpch.yml
@@ -30,4 +30,4 @@
- include_vars: "{{ playbook_dir }}/../conf/private_ip.yml"
- include_vars: ../../../benchmarks/tpch/gen/settings.yml
- name: Put data on to HDFS
- shell: for i in `ls -S {{ data_dir }}/`; do {{ hadoop_base }}/bin/hdfs
dfs -put -f {{ data_dir }}/$i hdfs://{{ cc_ip }}:9000/{{ data_dir }}; rm {{
data_dir }}/$i; done
\ No newline at end of file
+ shell: for i in `ls -rS {{ data_dir }}/`; do {{ hadoop_base }}/bin/hdfs
dfs -put -f {{ data_dir }}/$i hdfs://{{ cc_ip }}:9000/{{ data_dir }}; rm {{
data_dir }}/$i; done
\ No newline at end of file
--
To view, visit https://asterix-gerrit.ics.uci.edu/1965
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ce4e55d4fbd5e082e9f01c526f258891574cb68
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <[email protected]>
