Repository: lens Updated Branches: refs/heads/master d9884ec6d -> 39252f9af
LENS-1308: User config loader database calls not inserting entries Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/39252f9a Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/39252f9a Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/39252f9a Branch: refs/heads/master Commit: 39252f9afdffa2cd777f0c94c3426ee149359700 Parents: d9884ec Author: Rajat Khandelwal <pro...@apache.org> Authored: Wed Oct 12 18:25:23 2016 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Wed Oct 12 18:25:23 2016 +0530 ---------------------------------------------------------------------- .../apache/lens/server/query/LensServerDAO.java | 20 ++++++-------------- .../apache/lens/server/util/UtilityMethods.java | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/39252f9a/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java b/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java index 0aada40..a540c3c 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/LensServerDAO.java @@ -37,7 +37,6 @@ import org.apache.lens.server.util.UtilityMethods; import org.apache.commons.codec.binary.Base64; import org.apache.commons.dbutils.BasicRowProcessor; import org.apache.commons.dbutils.BeanProcessor; -import org.apache.commons.dbutils.DbUtils; import org.apache.commons.dbutils.QueryRunner; import org.apache.commons.dbutils.ResultSetHandler; import org.apache.commons.dbutils.RowProcessor; @@ -114,23 +113,16 @@ public class LensServerDAO { FinishedLensQuery alreadyExisting = getQuery(query.getHandle()); if (alreadyExisting == null) { // The expected case - Connection conn = null; String sql = "insert into finished_queries (handle, userquery, submitter, priority, " + "starttime,endtime,result,status,metadata,rows,filesize," + "errormessage,driverstarttime,driverendtime, drivername, queryname, submissiontime, driverquery, conf)" + " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; - try { - conn = getConnection(); - QueryRunner runner = new QueryRunner(); - runner.update(conn, sql, query.getHandle(), query.getUserQuery(), query.getSubmitter(), query.getPriority(), - query.getStartTime(), query.getEndTime(), query.getResult(), query.getStatus(), query.getMetadata(), - query.getRows(), query.getFileSize(), query.getErrorMessage(), query.getDriverStartTime(), - query.getDriverEndTime(), query.getDriverName(), query.getQueryName(), query.getSubmissionTime(), - query.getDriverQuery(), serializeConf(query.getConf())); - conn.commit(); - } finally { - DbUtils.closeQuietly(conn); - } + QueryRunner runner = new QueryRunner(ds); + runner.update(sql, query.getHandle(), query.getUserQuery(), query.getSubmitter(), query.getPriority(), + query.getStartTime(), query.getEndTime(), query.getResult(), query.getStatus(), query.getMetadata(), + query.getRows(), query.getFileSize(), query.getErrorMessage(), query.getDriverStartTime(), + query.getDriverEndTime(), query.getDriverName(), query.getQueryName(), query.getSubmissionTime(), + query.getDriverQuery(), serializeConf(query.getConf())); } else { log.warn("Re insert happening in purge: " + Thread.currentThread().getStackTrace()); if (alreadyExisting.equals(query)) { http://git-wip-us.apache.org/repos/asf/lens/blob/39252f9a/lens-server/src/main/java/org/apache/lens/server/util/UtilityMethods.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/util/UtilityMethods.java b/lens-server/src/main/java/org/apache/lens/server/util/UtilityMethods.java index 90226d1..3216efd 100644 --- a/lens-server/src/main/java/org/apache/lens/server/util/UtilityMethods.java +++ b/lens-server/src/main/java/org/apache/lens/server/util/UtilityMethods.java @@ -148,7 +148,7 @@ public final class UtilityMethods { tmp.setPassword(conf.get(LensConfConstants.SERVER_DB_JDBC_PASS, LensConfConstants.DEFAULT_SERVER_DB_PASS)); tmp.setValidationQuery( conf.get(LensConfConstants.SERVER_DB_VALIDATION_QUERY, LensConfConstants.DEFAULT_SERVER_DB_VALIDATION_QUERY)); - tmp.setDefaultAutoCommit(false); + tmp.setDefaultAutoCommit(true); return tmp; }
