[LENS-1545]: Fixed Bug in Prepared Query.

lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java

@@ -556,6 +556,8 @@ public String getPlan() {
   public QueryCost estimate(AbstractQueryContext qctx) throws LensException {
     MethodMetricsContext validateGauge = MethodMetricsFactory.createMethodGauge(qctx.getDriverConf(this), true,
       VALIDATE_GAUGE);
+    String rewrittenQuery = rewriteQuery(qctx);
+    qctx.setSelectedDriverQuery(rewrittenQuery);
     validate(qctx);
     validateGauge.markSuccess();
     return calculateQueryCost(qctx);

lens-server-api/src/main/java/org/apache/lens/server/api/query/PreparedQueryContext.java

@@ -77,7 +77,7 @@ public class PreparedQueryContext extends AbstractQueryContext implements Delaye
   /**
    * The millis in week.
    */
-  private static long millisInWeek = 7 * 24 * 60 * 60 * 1000;
+  private static long millisInTenMinutes = 10 * 60 * 1000;
 
   /**
    * Instantiates a new prepared query context.
@@ -129,7 +129,7 @@ public long getDelay(TimeUnit units) {
     if (this.prepareStartTime != null) {
       Date now = new Date();
       long elapsedMills = now.getTime() - this.prepareStartTime.getTime();
-      delayMillis = millisInWeek - elapsedMills;
+      delayMillis = millisInTenMinutes - elapsedMills;
       return units.convert(delayMillis, TimeUnit.MILLISECONDS);
     } else {
       return Integer.MAX_VALUE;

lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java

@@ -35,11 +35,11 @@
 import org.apache.lens.api.query.QueryStatus;
 import org.apache.lens.server.api.error.LensException;
 import org.apache.lens.server.api.query.FinishedLensQuery;
+import org.apache.lens.server.api.query.PreparedLensQuery;
 import org.apache.lens.server.api.query.PreparedQueryContext;
 import org.apache.lens.server.api.query.QueryContext;
 import org.apache.lens.server.session.LensSessionImpl;
 import org.apache.lens.server.util.UtilityMethods;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.dbutils.*;
 import org.apache.commons.dbutils.handlers.BeanHandler;
@@ -868,4 +868,18 @@ public void insertPreparedQuery(PreparedQueryContext preparedQueryContext) throw
       DbUtils.closeQuietly(conn);
     }
   }
+
+  public PreparedLensQuery getPreparedQuery(String handle) {
+    ResultSetHandler<PreparedLensQuery> rsh = new BeanHandler<>(PreparedLensQuery.class,
+        new BasicRowProcessor(new FinishedLensQueryBeanProcessor()));
+    String sql = "select * from prepared_queries where handle=?";
+    QueryRunner runner = new QueryRunner(ds);
+    try {
+      PreparedLensQuery preparedLensQuery = runner.query(sql, rsh, handle);
+      return preparedLensQuery;
+    } catch (SQLException e) {
+      log.error("SQL exception while executing query.", e);
+    }
+    return null;
+  }
 }

lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java

@@ -2461,7 +2461,13 @@ private PreparedQueryContext getPreparedQueryContext(LensSessionHandle sessionHa
       acquire(sessionHandle);
       PreparedQueryContext ctx = preparedQueries.get(prepareHandle);
       if (ctx == null) {
-        throw new NotFoundException("Prepared query not found " + prepareHandle);
+        PreparedLensQuery preparedLensQuery = lensServerDao.getPreparedQuery(prepareHandle.getQueryHandleString());
+        if (preparedLensQuery == null) {
+          throw new NotFoundException("Prepared query not found " + prepareHandle);
+        }
+        ctx = new PreparedQueryContext(preparedLensQuery.getUserquery(), preparedLensQuery.getSubmitter(), conf,
+            drivers.values());
+        ctx.setSelectedDriverQuery(preparedLensQuery.getDriverquery());
       }
       return ctx;
     } finally {

lens-server/src/test/java/org/apache/lens/server/query/TestLensDAO.java

@@ -260,7 +260,10 @@ public void testPreparedQueryDAO() throws Exception {
       PreparedQueryContext preparedQueryContext = new PreparedQueryContext("query", "user1", driverConf,
           createDriver(driverConf));
       preparedQueryContext.setPrepareEndTime(new Date());
-      service.lensServerDao.insertPreparedQuery(preparedQueryContext);
+      service.lensServerDao.insertPreparedQuery(preparedQueryContext);  
+      PreparedLensQuery preparedLensQuery = service.lensServerDao.getPreparedQuery(preparedQueryContext.getQueryHandleString());
+      Assert.assertEquals(preparedLensQuery.getHandle(), preparedQueryContext.getQueryHandleString());
+      Assert.assertEquals(preparedLensQuery.getSubmitter(), "user1");
     } catch (Exception e) {
       Assert.fail("it shouldn't be coming in this catch block");
     }