Author: travis
Date: Wed Nov 28 19:55:47 2012
New Revision: 1414886
URL: http://svn.apache.org/viewvc?rev=1414886&view=rev
Log:
HCATALOG-555 hcat script should look for hcatalog-core jar and add
HCAT_PREFIX/conf as a config location that is checked.
Modified:
incubator/hcatalog/trunk/CHANGES.txt
incubator/hcatalog/trunk/bin/hcat
incubator/hcatalog/trunk/bin/hcat-config.sh
Modified: incubator/hcatalog/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1414886&r1=1414885&r2=1414886&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Nov 28 19:55:47 2012
@@ -145,6 +145,8 @@ Trunk (unreleased changes)
OPTIMIZATIONS
BUG FIXES
+ HCAT-555 hcat script should look for hcatalog-core jar and add
HCAT_PREFIX/conf as a config location that is checked. (arpitgupta via
traviscrawford)
+
HCAT-534 HCat_Drop_Table_3 dfs mkdir failing on hadoop23 (cdrome via toffer)
HCAT-453 HCatalog queries fail due to exceeding max jobconf size (pengfeng
via traviscrawford)
Modified: incubator/hcatalog/trunk/bin/hcat
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/bin/hcat?rev=1414886&r1=1414885&r2=1414886&view=diff
==============================================================================
--- incubator/hcatalog/trunk/bin/hcat (original)
+++ incubator/hcatalog/trunk/bin/hcat Wed Nov 28 19:55:47 2012
@@ -99,11 +99,11 @@ fi
# Find our hcatalog jar
shopt -s extglob
-if (( `ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar | wc -l` > 1 )) ;
then
- echo "Error: found more than one hcatalog jar in
$HCAT_PREFIX/share/hcatalog"
+if [ "$(ls -1 $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar | wc -l)"
-ne 1 ]; then
+ echo "Error: did not find exactly one hcatalog-core jar in
$HCAT_PREFIX/share/hcatalog"
exit 1
fi
-HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-[0-9]*.jar`
+HCAT_JAR=`ls $HCAT_PREFIX/share/hcatalog/hcatalog-core-[0-9]*.jar`
# Find the storage-handler jars.
for jar in ${HCAT_PREFIX}/share/hcatalog/lib/*.jar ; do
Modified: incubator/hcatalog/trunk/bin/hcat-config.sh
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/bin/hcat-config.sh?rev=1414886&r1=1414885&r2=1414886&view=diff
==============================================================================
--- incubator/hcatalog/trunk/bin/hcat-config.sh (original)
+++ incubator/hcatalog/trunk/bin/hcat-config.sh Wed Nov 28 19:55:47 2012
@@ -50,6 +50,8 @@ fi
# Allow alternate conf dir location.
if [ -e "${HCAT_PREFIX}/etc/hcatalog/hcat-env.sh" ]; then
DEFAULT_CONF_DIR=${HCAT_PREFIX}/"etc/hcatalog"
+elif [ -e "${HCAT_PREFIX}/conf/hcat-env.sh" ]; then
+ DEFAULT_CONF_DIR=${HCAT_PREFIX}/"conf"
else
DEFAULT_CONF_DIR="/etc/hcatalog"
fi
