You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2016/10/23 19:16:09 UTC
[1/2] jena git commit: Code review
Repository: jena
Updated Branches:
refs/heads/master bcd80b118 -> d3b9c4668
Code review
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3b9c466
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3b9c466
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3b9c466
Branch: refs/heads/master
Commit: d3b9c4668fe8af303d7be8b6fd3ed673f60818db
Parents: c61b418
Author: ajs6f <aj...@virginia.edu>
Authored: Fri Oct 21 12:15:45 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Sun Oct 23 15:15:43 2016 -0400
----------------------------------------------------------------------
apache-jena/bin/tdbloader2index | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d3b9c466/apache-jena/bin/tdbloader2index
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2index b/apache-jena/bin/tdbloader2index
index a6ab7d7..dadea54 100755
--- a/apache-jena/bin/tdbloader2index
+++ b/apache-jena/bin/tdbloader2index
@@ -150,7 +150,8 @@ LOC=
KEEP_WORK=0
DEBUG=0
JVM_ARGS=
-if [ -n $SORT_ARGS ]; then
+SORT_ARGS="${SORT_ARGS:-}"
+if [ -n "$SORT_ARGS" ]; then
echo "Using SORT_ARGS: $SORT_ARGS"
fi
[2/2] jena git commit: SORT_ARGS behavior
Posted by aj...@apache.org.
SORT_ARGS behavior
Allow env variable SORT_ARGS to be used for multiflag sort args
Do not override parallel flag if it is set on CLI in --sort-args or in env SORT_ARGS
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c61b418e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c61b418e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c61b418e
Branch: refs/heads/master
Commit: c61b418e26fd2b7d3f383de95c2e44d0b8782018
Parents: bcd80b1
Author: A. Soroka <aj...@apache.org>
Authored: Fri Oct 21 09:56:41 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Sun Oct 23 15:15:43 2016 -0400
----------------------------------------------------------------------
apache-jena/bin/tdbloader2 | 1 -
apache-jena/bin/tdbloader2index | 21 ++++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c61b418e/apache-jena/bin/tdbloader2
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2 b/apache-jena/bin/tdbloader2
index 4086fd6..e61cd3e 100755
--- a/apache-jena/bin/tdbloader2
+++ b/apache-jena/bin/tdbloader2
@@ -193,7 +193,6 @@ KEEP_WORK=0
DEBUG=0
TRACE=0
JVM_ARGS=
-SORT_ARGS=
while [ $# -gt 0 ]
do
http://git-wip-us.apache.org/repos/asf/jena/blob/c61b418e/apache-jena/bin/tdbloader2index
----------------------------------------------------------------------
diff --git a/apache-jena/bin/tdbloader2index b/apache-jena/bin/tdbloader2index
index eed2edc..a6ab7d7 100755
--- a/apache-jena/bin/tdbloader2index
+++ b/apache-jena/bin/tdbloader2index
@@ -150,7 +150,9 @@ LOC=
KEEP_WORK=0
DEBUG=0
JVM_ARGS=
-SORT_ARGS=
+if [ -n $SORT_ARGS ]; then
+ echo "Using SORT_ARGS: $SORT_ARGS"
+fi
while [ $# -gt 0 ]
do
@@ -241,15 +243,16 @@ debug "Data text files are $DATA_TRIPLES and $DATA_QUADS"
# Prepare sort arguments
if [ -z "$SORT_ARGS" ]; then
SORT_ARGS="--buffer-size=50%"
-
- # --parallel is not always available.
- # Temporarily disable exit on error while we check for --parallel support
- set +e
- sort --parallel=3 < /dev/null 2>/dev/null
- if [ $? = 0 ]; then
- SORT_ARGS="$SORT_ARGS --parallel=3"
+ if [[ "$SORT_ARGS" != *"--parallel="* ]]; then
+ # --parallel is not always available.
+ # Temporarily disable exit on error while we check for --parallel support
+ set +e
+ sort --parallel=3 < /dev/null 2>/dev/null
+ if [ $? = 0 ]; then
+ SORT_ARGS="$SORT_ARGS --parallel=3"
+ fi
+ set -e
fi
- set -e
fi
# Prepare JVM arguments