Repository: vxquery Updated Branches: refs/heads/prestonc/exrt_benchmark_queries [created] 1fea6e3e6
Continued tweaks to finish the benchmarks. - Added CLI local execution parameter to allow running with a hyracks instance with default parameters. - XML file merge now supports symbolic links when creating a single XML file for MRQL testings. - Found an old function name still in use. Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/f6390c3f Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/f6390c3f Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/f6390c3f Branch: refs/heads/prestonc/exrt_benchmark_queries Commit: f6390c3f9775158862a6f1f2227bf15ed6d20744 Parents: 75d1997 Author: Preston Carman <[email protected]> Authored: Tue Aug 26 15:57:32 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Mon Sep 22 20:15:07 2014 -0700 ---------------------------------------------------------------------- .../main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh | 1 + .../resources/noaa-ghcn-daily/scripts/weather_benchmark.py | 8 ++++---- vxquery-benchmark/src/main/resources/util/merge_xml_files.py | 2 +- .../src/main/java/org/apache/vxquery/cli/VXQuery.java | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/f6390c3f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh index 632dbcb..88339bd 100755 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh @@ -26,6 +26,7 @@ # run_benchmark.sh ./noaa-ghcn-daily/benchmarks/local_speed_up/queries/ "" q03 # REPEAT=5 +IGNORE=2 FRAME_SIZE=$((8*1024)) BUFFER_SIZE=$((32*1024*1024)) JOIN_HASH_SIZE=-1 http://git-wip-us.apache.org/repos/asf/vxquery/blob/f6390c3f/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py index 783a332..4f81f86 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/weather_benchmark.py @@ -119,9 +119,9 @@ class WeatherBenchmark: def get_local_partition_scheme(self, test, partition): scheme = [] - virtual_partitions = get_local_virtual_disk_partitions(self.partitions) - data_schemes = get_disk_partition_scheme(0, virtual_partitions, self.base_paths) - link_base_schemes = get_disk_partition_scheme(0, virtual_partitions, self.base_paths, self.DATA_LINKS_FOLDER + test) + virtual_disk_partitions = get_local_virtual_disk_partitions(self.partitions) + data_schemes = get_disk_partition_scheme(0, virtual_disk_partitions, self.base_paths) + link_base_schemes = get_disk_partition_scheme(0, partition, self.base_paths, self.DATA_LINKS_FOLDER + test) # Match link paths to real data paths. group_size = len(data_schemes) / len(link_base_schemes) @@ -230,7 +230,7 @@ class WeatherBenchmark: def get_zero_partition_path(self, node, key): '''Return a partition path for the zero partition.''' base_path = self.base_paths[0] - new_link_path = get_partition_scheme(node, 1, [base_path], key)[0][PARTITION_INDEX_PATH] + new_link_path = get_disk_partition_scheme(node, 1, [base_path], key)[0][PARTITION_INDEX_PATH] return new_link_path.replace("p1", "p0") def get_current_node_index(self): http://git-wip-us.apache.org/repos/asf/vxquery/blob/f6390c3f/vxquery-benchmark/src/main/resources/util/merge_xml_files.py ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/util/merge_xml_files.py b/vxquery-benchmark/src/main/resources/util/merge_xml_files.py index 9238a19..2df026b 100644 --- a/vxquery-benchmark/src/main/resources/util/merge_xml_files.py +++ b/vxquery-benchmark/src/main/resources/util/merge_xml_files.py @@ -24,7 +24,7 @@ XML_PREFIX = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><root>' + " XML_SUFFIX = '</root>' + "\n" def find_files(directory, pattern): - for root, dirs, files in os.walk(directory): + for root, dirs, files in os.walk(directory, followlinks=True): for basename in files: if fnmatch.fnmatch(basename, pattern): yield (root, basename) http://git-wip-us.apache.org/repos/asf/vxquery/blob/f6390c3f/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java ---------------------------------------------------------------------- diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java index 8451bd5..c0ca612 100644 --- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java +++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java @@ -375,6 +375,7 @@ public class VXQuery { ccConfig.clientNetPort = 39000; ccConfig.clusterNetIpAddress = "127.0.0.1"; ccConfig.clusterNetPort = 39001; + ccConfig.httpPort = 39002; ccConfig.profileDumpPeriod = 10000; cc = new ClusterControllerService(ccConfig); cc.start();
