From 2a7ff9cb4ab673338e7f8119f43c53f3730c3d78 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Fri, 25 Aug 2017 12:10:43 -0400 Subject: [PATCH] Testing old method --- .../centralrepository/datamodel/AbstractSqlEamDb.java | 10 +++++----- .../optionspanel/ImportHashDatabaseDialog.java | 2 +- .../org/netbeans/core/startup/Bundle.properties | 2 +- .../netbeans/core/windows/view/ui/Bundle.properties | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java index f4ca260e79..54d46d3c72 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java @@ -1527,7 +1527,7 @@ public abstract class AbstractSqlEamDb implements EamDb { PreparedStatement bulkPs = null; try { - conn.setAutoCommit(false); + //conn.setAutoCommit(false); // FUTURE: have a separate global_files table for each Type. String sql = "INSERT INTO %s(reference_set_id, value, known_status, comment) VALUES (?, ?, ?, ?) " @@ -1540,12 +1540,12 @@ public abstract class AbstractSqlEamDb implements EamDb { bulkPs.setString(2, globalInstance.getMD5Hash()); bulkPs.setString(3, globalInstance.getKnownStatus().name()); bulkPs.setString(4, globalInstance.getComment()); - //bulkPs.addBatch(); - bulkPs.executeUpdate(); + bulkPs.addBatch(); + //bulkPs.executeUpdate(); } - //bulkPs.executeBatch(); - conn.commit(); + bulkPs.executeBatch(); + //conn.commit(); } catch (SQLException ex) { //conn.rollback(); throw new EamDbException("Error inserting bulk artifacts.", ex); // NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java index 3fb349d91d..9718104048 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ImportHashDatabaseDialog.java @@ -652,7 +652,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog { dbManager.bulkInsertReferenceTypeEntries(globalInstances, contentType); globalInstances.clear(); } - if(numLines % 1000000 == 0){ + if(numLines % 10000 == 0){ LOGGER.log(Level.INFO, "Database entries processed: " + numLines); } } diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 9fa4b48338..5b1698042d 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Thu, 22 Jun 2017 08:50:21 -0400 +#Fri, 25 Aug 2017 12:02:51 -0400 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=314 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 9207917601..08d7219915 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,4 +1,4 @@ #Updated by build script -#Thu, 22 Jun 2017 08:50:21 -0400 +#Fri, 25 Aug 2017 12:02:51 -0400 CTL_MainWindow_Title=Autopsy 4.4.1 CTL_MainWindow_Title_No_Project=Autopsy 4.4.1