Removed logging from the benchmark. - Due to the additional logging from VXQueryOperatorDescriptor, I removed logging from the benchmark. - Logging for the benchmark now has its own logging.properties file.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/b98b3bd3 Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/b98b3bd3 Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/b98b3bd3 Branch: refs/heads/site Commit: b98b3bd3e1671dcc25cbaf3df81380264ebb3b3c Parents: 304c61e Author: Preston Carman <[email protected]> Authored: Fri May 30 06:57:25 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Fri May 30 06:57:25 2014 -0700 ---------------------------------------------------------------------- .../noaa-ghcn-daily/scripts/benchmark_logging.properties | 1 + .../src/main/resources/noaa-ghcn-daily/scripts/run_benchmark.sh | 2 +- .../resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh | 4 ++-- .../vxquery/metadata/VXQueryCollectionOperatorDescriptor.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/b98b3bd3/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties new file mode 100644 index 0000000..2fb0af0 --- /dev/null +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties @@ -0,0 +1 @@ +java.util.logging.ConsoleHandler.level=OFF \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/b98b3bd3/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 82e4ad7..7c3229c 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 @@ -34,7 +34,7 @@ then exit fi -export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError" +export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties" for j in $(find ${1} -name '*q??.xq') do http://git-wip-us.apache.org/repos/asf/vxquery/blob/b98b3bd3/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh index 505f0ed..74bb088 100644 --- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh +++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/run_benchmark_cluster.sh @@ -44,8 +44,8 @@ fi echo "Starting ${2} cluster nodes" python vxquery-server/src/main/resources/scripts/cluster_cli.py -c vxquery-server/src/main/resources/conf/${2}nodes.xml -a start -export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError" - +export JAVA_OPTS="$JAVA_OPTS -server -Xmx8G -XX:+HeapDumpOnOutOfMemoryError -Djava.util.logging.config.file=./vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties" + for j in $(find ${1} -name '*q??.xq') do # Only work with i nodes. http://git-wip-us.apache.org/repos/asf/vxquery/blob/b98b3bd3/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java index 560967a..ad8e19a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java @@ -98,8 +98,8 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO TrueFileFilter.INSTANCE); while (it.hasNext()) { File xmlDocument = it.next(); - if (LOGGER.isLoggable(Level.INFO)) { - LOGGER.info("Starting to read XML document: " + xmlDocument.getAbsolutePath()); + if (LOGGER.isLoggable(Level.FINE)) { + LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath()); } parser.parseOutElements(xmlDocument, writer, fta, t); }
