Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6435: bin/post cleanup for 5x merge 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1648478 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2014-12-30 03:34:19 +00:00
parent fde2508de7
commit 119d8caa21
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -47,7 +47,6 @@ Other Changes
* SOLR-6127: Improve example docs, using films data (Varun Thacker via ehatcher) * SOLR-6127: Improve example docs, using films data (Varun Thacker via ehatcher)
* SOLR-6435: Add bin/post script to simplify posting content to Solr (ehatcher)
================== 5.0.0 ================== ================== 5.0.0 ==================
@ -261,6 +260,8 @@ New Features
* SOLR-6879: Have an option to disable autoAddReplicas temporarily for all collections. * SOLR-6879: Have an option to disable autoAddReplicas temporarily for all collections.
(Varun Thacker via Steve Rowe) (Varun Thacker via Steve Rowe)
* SOLR-6435: Add bin/post script to simplify posting content to Solr (ehatcher)
Bug Fixes Bug Fixes
---------------------- ----------------------

30
solr/bin/post
View File

@ -22,29 +22,50 @@
# bin/post records article*.xml # bin/post records article*.xml
# bin/post wizbang events.json # bin/post wizbang events.json
# ====== Common code copied from bin/solr (TODO: centralize/share this kind of thing)
if [ -n "$SOLR_JAVA_HOME" ]; then
JAVA=$SOLR_JAVA_HOME/bin/java
elif [ -n "$JAVA_HOME" ]; then
for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
if [ -x "$java" ]; then
JAVA="$java"
break
fi
done
else
JAVA=java
fi
# test that Java exists and is executable on this server
$JAVA -version >/dev/null 2>&1 || { echo >&2 "Java is required to run this tool! Please install Java 8 or greater before running this script."; exit 1; }
# ===== post specific code
SPT_JAR=dist/solr-core-*.jar SPT_JAR=dist/solr-core-*.jar
COLLECTION=$1; shift COLLECTION=$1; shift
echo "Collection: " $COLLECTION echo "Collection:" $COLLECTION
PROPS="-Dc=$COLLECTION" PROPS="-Dc=$COLLECTION"
PARAMS="" PARAMS=""
# TODO: Check that $COLLECTION actually exists? How to determine if user omitted collection name as first param? # TODO: Check that $COLLECTION actually exists? How to determine if user omitted collection name as first param?
echo -n "Data mode: "
if [[ $1 == http* ]]; then if [[ $1 == http* ]]; then
echo "WEB" echo "WEB"
PROPS="$PROPS -Ddata=web" PROPS="$PROPS -Ddata=web"
PARAMS=$1; shift PARAMS=$1; shift
else else
echo "PATH"
if [[ -d $1 ]]; then if [[ -d $1 ]]; then
# Directory # Directory
echo "DIRECTORY"
PROPS="$PROPS -Ddata=files -Dauto -Drecursive" PROPS="$PROPS -Ddata=files -Dauto -Drecursive"
PARAMS=$1; shift PARAMS=$1; shift
else else
# Not a URL or existing directory, assume file(s) # Not a URL or existing directory, assume file(s)
echo "FILE"
FILE=$1; shift FILE=$1; shift
EXTENSION="${FILE##*.}" EXTENSION="${FILE##*.}"
@ -65,10 +86,11 @@ else
fi fi
fi fi
# Add all additonal trailing script parameters as system properties to SPT (eg. bin/post core_name ~/Documents depth=1)
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
PROPS="$PROPS -D$1" PROPS="$PROPS -D$1"
shift shift
done done
echo java -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS echo $JAVA -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS
java -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS $JAVA -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS