Merge pull request #45 from harveyfeng/v2

Add Shark 0.9.1 support

shark/init.sh

@@ -4,6 +4,7 @@ pushd /root
 
 if [ -d "shark" ]; then
   echo "Shark seems to be installed. Exiting."
+  popd
   return
 fi
 
@@ -45,8 +46,16 @@ else
         wget http://s3.amazonaws.com/spark-related-packages/shark-0.8.1-bin-cdh4.tgz
       fi
       ;;
+    0.9.0 | 0.9.1)
+      if [[ "$HADOOP_MAJOR_VERSION" == "1" ]]; then
+        wget https://s3.amazonaws.com/spark-related-packages/shark-0.9.1-bin-hadoop1.tgz
+      else
+        wget https://s3.amazonaws.com/spark-related-packages/shark-0.9.1-bin-hadoop2.tgz
+      fi
+      ;;
     *)
       echo "ERROR: Unknown Shark version"
+      popd
       return
   esac
 

templates/root/shark/conf/shark-env.sh

@@ -8,7 +8,12 @@ SPARK_JAVA_OPTS+="-Dspark.kryoserializer.buffer.mb=10 "
 #SPARK_JAVA_OPTS+="-verbose:gc -XX:-PrintGCDetails -XX:+PrintGCTimeStamps "
 export SPARK_JAVA_OPTS
 
-export HIVE_HOME="/root/hive-0.9.0-bin"
+if [ -f "/root/hive-0.9-bin" ]; then
+  # Point HIVE_HOME to the Hive 0.9 binary manually fetched
+  # during instance setup. This only applies for Shark v0.8.
+  export HIVE_HOME="/root/hive-0.9.0-bin"
+fi
+
 export HADOOP_HOME=/root/ephemeral-hdfs
 export HIVE_CONF_DIR=/root/ephemeral-hdfs/conf