Merge pull request sleuthkit#3379 from sleuthkit/merge-in-4.14

Merge in 4.14

Author: simsong

bindings/java/src/org/sleuthkit/datamodel/CaseDbAccessManager.java

@@ -755,15 +755,44 @@ public void select(CaseDbPreparedStatement preparedStatement, boolean runOptimiz
 			} catch (SQLException ex) {
 				throw new TskCoreException("An error occurred while attempting to optimize the call", ex);
 			}
-			try (Statement optimizeStmt = preparedStatement.connection.createStatement()) {
-				optimizeStmt.executeQuery("ANALYZE");
-				preparedStatement.connection.commitTransaction();
+		}
+		
+		select(preparedStatement, queryCallback);
+	}
+	
+	/**
+	 * Runs the ANALYZE SQL command to refresh query-planner statistics.
+	 *
+	 * This is primarily useful for SQLite after large data changes (bulk
+	 * inserts, updates, deletes) or index/schema changes, or when query plans
+	 * appear suboptimal. For PostgreSQL, statistics are refreshed automatically, 
+	 * so manually running ANALYZE is usually unnecessary.
+	 *
+	 * @throws TskCoreException
+	 */
+	@Beta
+	public void runAnalyze() throws TskCoreException {
+		CaseDbTransaction localTrans = tskDB.beginTransaction();
+
+		try {
+			CaseDbConnection connection = localTrans.getConnection();
+
+			try (Statement statement = connection.createStatement()) {
+				statement.executeUpdate("ANALYZE");
 			} catch (SQLException ex) {
 				throw new TskCoreException("An error occurred while attempting to run ANALYZE", ex);
 			}
+			localTrans.commit();
+			localTrans = null;
+		} finally {
+			if (null != localTrans) {
+				try {
+					localTrans.rollback();
+				} catch (TskCoreException ex) {
+					logger.log(Level.SEVERE, "Failed to rollback transaction after exception", ex);
+				}
+			}
 		}
-		
-		select(preparedStatement, queryCallback);
 	}
 
 	/**