From 8d65d4d84afd648dd1003339a3bfe5ca696f3114 Mon Sep 17 00:00:00 2001
From: Jinho Kim <jhkim@apache.org>
Date: Tue, 2 Jun 2015 13:55:21 +0900
Subject: [PATCH 1/2] add release verification tool

---
 dev-support/verifyChecksum.sh | 55 +++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100755 dev-support/verifyChecksum.sh

diff --git a/dev-support/verifyChecksum.sh b/dev-support/verifyChecksum.sh
new file mode 100755
index 0000000000..e05d641304
--- /dev/null
+++ b/dev-support/verifyChecksum.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+TAJO_VERSION=$1
+RELEASE_HOME=`dirname "$0"`
+RELEASE_HOME=`cd "$RELEASE_HOME"; pwd`
+#Verify SOURCE 
+
+function verifyMD5 {
+  echo "Verify MD5 " $1
+  MD5=`openssl md5 $1`
+  
+  if [ "$MD5" = "`cat $1.md5`" ] ; then
+    echo 'MD5 OK'
+  else
+    echo 'MD5 failed ' $MD5", " `cat $1.md5`
+    exit -1
+  fi
+}
+
+function verifySHA512 {
+  echo "Verify SHA512 " $1
+  SHA512=`openssl sha512 $1`
+
+  if [ "$SHA512" = "`cat $1.sha512`" ] ; then
+    echo 'SHA512 OK'
+  else
+    echo 'SHA512 failed ' $SHA512", " `cat $1.sha512`
+    exit -1
+  fi
+}
+
+function verifyPGP {
+  echo "Verify PGP SIGNATURE " $1
+  echo=`gpg --verify $1.asc $1`
+}
+
+SOURCE_TARBALL=./tajo-$TAJO_VERSION-src.tar.gz
+BINARY_TARBALL=./tajo-$TAJO_VERSION.tar.gz
+JDBC_JAR=./tajo-jdbc-$TAJO_VERSION.jar
+
+for i in $SOURCE_TARBALL $BINARY_TARBALL $JDBC_JAR
+do
+  echo "========================================"
+  echo "Verify " $i
+  if [ ! -f $i ]; then
+    echo "$i must be a valid file";
+    exit 4;
+  fi
+  echo "========================================"
+  verifyPGP $i
+  verifyMD5 $i
+  verifySHA512 $i
+  echo "========================================"
+
+done
+

From d29ae84c1eb43e746b79b27884dcac87647767d5 Mon Sep 17 00:00:00 2001
From: Jinho Kim <jhkim@apache.org>
Date: Thu, 18 Jun 2015 10:56:42 +0900
Subject: [PATCH 2/2] TAJO-1650

---
 dev-support/verifyChecksum.sh                 | 55 -------------------
 .../tajo/ws/rs/resources/QueryResource.java   |  9 +--
 2 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100755 dev-support/verifyChecksum.sh

diff --git a/dev-support/verifyChecksum.sh b/dev-support/verifyChecksum.sh
deleted file mode 100755
index e05d641304..0000000000
--- a/dev-support/verifyChecksum.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-TAJO_VERSION=$1
-RELEASE_HOME=`dirname "$0"`
-RELEASE_HOME=`cd "$RELEASE_HOME"; pwd`
-#Verify SOURCE 
-
-function verifyMD5 {
-  echo "Verify MD5 " $1
-  MD5=`openssl md5 $1`
-  
-  if [ "$MD5" = "`cat $1.md5`" ] ; then
-    echo 'MD5 OK'
-  else
-    echo 'MD5 failed ' $MD5", " `cat $1.md5`
-    exit -1
-  fi
-}
-
-function verifySHA512 {
-  echo "Verify SHA512 " $1
-  SHA512=`openssl sha512 $1`
-
-  if [ "$SHA512" = "`cat $1.sha512`" ] ; then
-    echo 'SHA512 OK'
-  else
-    echo 'SHA512 failed ' $SHA512", " `cat $1.sha512`
-    exit -1
-  fi
-}
-
-function verifyPGP {
-  echo "Verify PGP SIGNATURE " $1
-  echo=`gpg --verify $1.asc $1`
-}
-
-SOURCE_TARBALL=./tajo-$TAJO_VERSION-src.tar.gz
-BINARY_TARBALL=./tajo-$TAJO_VERSION.tar.gz
-JDBC_JAR=./tajo-jdbc-$TAJO_VERSION.jar
-
-for i in $SOURCE_TARBALL $BINARY_TARBALL $JDBC_JAR
-do
-  echo "========================================"
-  echo "Verify " $i
-  if [ ! -f $i ]; then
-    echo "$i must be a valid file";
-    exit 4;
-  fi
-  echo "========================================"
-  verifyPGP $i
-  verifyMD5 $i
-  verifySHA512 $i
-  echo "========================================"
-
-done
-
diff --git a/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java b/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
index a662c4d877..abecc3ad03 100644
--- a/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
+++ b/tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
@@ -155,13 +155,8 @@ public Response run(JerseyResourceDelegateContext context) {
       for (QueryInProgress queryInProgress: queryManager.getRunningQueries()) {
         queriesInfo.add(queryInProgress.getQueryInfo());
       }
-      
-      try {
-        queriesInfo.addAll(masterContext.getHistoryReader().getQueries(null));
-      } catch (Exception e) {
-        LOG.error(e.getMessage(), e);
-        return ResourcesUtil.createExceptionResponse(LOG, e.getMessage());
-      }
+
+      queriesInfo.addAll(queryManager.getFinishedQueries());
       
       if (state != null) {
         queriesInfo = selectQueriesInfoByState(queriesInfo, queryState);