From 4c1fbcf74910ff33c2c5babaa09c6ac7253f99e5 Mon Sep 17 00:00:00 2001
From: fegaras <fegaras@cse.uta.edu>
Date: Fri, 24 Jul 2015 10:06:16 -0500
Subject: [PATCH] [MRQL-76] Change the mrql.flink shell script to work with
 Flink 0.9.0

---
 bin/mrql.flink | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/mrql.flink b/bin/mrql.flink
index 40d7777..f3b4b37 100755
--- a/bin/mrql.flink
+++ b/bin/mrql.flink
@@ -21,6 +21,7 @@
 #--------------------------------------------------------------------------------
 #
 # run Apache MRQL in Apache Flink mode
+#  (need to run $FLINK_HOME/bin/yarn-session.sh on a separate window first)
 #
 #--------------------------------------------------------------------------------
 
@@ -54,14 +55,15 @@ fi
 if [ "$1" == "-dist" ]; then
     if ([ -a $FLINK_HOME/conf/.yarn-jobmanager ]); then
 	export FLINK_MASTER=`cat $FLINK_HOME/conf/.yarn-jobmanager`
-    fi
-    if ([ -a $FLINK_HOME/conf/.yarn-properties ]); then
+    elif ([ -a $FLINK_HOME/conf/.yarn-properties ]); then
 	. $FLINK_HOME/conf/.yarn-properties
 	export FLINK_MASTER=$jobManager
+    else
+	export FLINK_MASTER=
     fi
     args=" -flink $*"
     args=${args// /\!}
-    $FLINK_HOME/bin/flink run $FULL_JAR -c org.apache.mrql.Main -v args $args
+    $FLINK_HOME/bin/flink run -c org.apache.mrql.Main $FULL_JAR args $args | grep -v " switched to "
 else 
-    $JAVA_HOME/bin/java -classpath "$FULL_JAR:$FLINK_JARS" org.apache.mrql.Main -flink $*
+    $JAVA_HOME/bin/java -classpath "$FULL_JAR:$FLINK_JARS" org.apache.mrql.Main -flink $*  | grep -v " switched to "
 fi