Revert last commit because SqlJet doesn't support parallel read.

This reverts commit 1e69e23.
Sheep-y · Aug 4, 2016 · faebd4f · faebd4f
1 parent 1e69e23
commit faebd4f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/java/db4e/controller/Controller.java b/java/db4e/controller/Controller.java
@@ -37,7 +37,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import netscape.javascript.JSException;
-import org.tmatesoft.sqljet.core.SqlJetException;
 import org.tmatesoft.sqljet.core.table.SqlJetDb;
 import org.w3c.dom.Document;
 import sheepy.util.Utils;
@@ -260,7 +259,6 @@ private void openOrCreateTable () {
          synchronized ( categories ) {
             dal.setDb( db, categories, state );
          }
-         loadIndex();
 
       } catch ( Exception e1 ) {
 
@@ -270,7 +268,6 @@ private void openOrCreateTable () {
             synchronized ( categories ) {
                dal.setDb( db, categories, state );
             }
-         loadIndex();
 
          } catch ( Exception e2 ) {
             log.log( Level.SEVERE, "Cannot create tables: {0}", Utils.stacktrace( e2 ) );
@@ -292,10 +289,6 @@ private void openOrCreateTable () {
       state.update();
    }
 
-   private void loadIndex() throws SqlJetException {
-      dal.loadEntryIndex( categories, state );
-   }
-
    /**
     * If current database is bigger than last backup, update the backup.
     */

diff --git a/java/db4e/controller/DbAbstraction.java b/java/db4e/controller/DbAbstraction.java
@@ -19,6 +19,10 @@
 import org.tmatesoft.sqljet.core.table.SqlJetDb;
 import sheepy.util.JavaFX;
 
+/**
+ * Database abstraction.
+ * Note that SqlJet does not support multi-thread.
+ */
 class DbAbstraction {
 
    private static final Logger log = Main.log;
@@ -46,6 +50,7 @@ void setDb ( SqlJetDb db, ObservableList<Category> categories, ProgressState sta
       log.log( Level.CONFIG, "Database version {0,number,#}, opened.", version );
 
       loadCategory( categories );
+      loadEntryIndex( categories, state );
    }
 
    void createTables () throws SqlJetException {
@@ -137,7 +142,7 @@ private void loadCategory ( ObservableList<Category> categories ) throws SqlJetE
       // TODO: Backup good db.
    }
 
-   void loadEntryIndex ( List<Category> categories, ProgressState state ) throws SqlJetException {
+   private void loadEntryIndex ( List<Category> categories, ProgressState state ) throws SqlJetException {
       int downCount = 0;
       state.reset();
 
@@ -149,7 +154,7 @@ void loadEntryIndex ( List<Category> categories, ProgressState state ) throws Sq
          state.total = total;
          cursor.close();
 
-         for ( Category category : categories ) {
+         for ( Category category : categories ) synchronized( category ) {
             int countWithData = 0, size = category.total_entry.get();
             List<Entry> list = category.entries;
             list.clear();
@@ -184,7 +189,7 @@ void loadEntityContent ( List<Category> categories, ProgressState state ) throws
       db.beginTransaction( SqlJetTransactionMode.READ_ONLY );
       try {
          ISqlJetTable tblEntry = db.getTable( "entry" );
-         for ( Category category : categories ) {
+         for ( Category category : categories ) synchronized( category ) {
             log.log( Level.FINE, "Loading {0} content", category.id );
             for ( Entry entry : category.entries ) {
                if ( entry.fields == null || entry.content == null ) {
@@ -265,7 +270,7 @@ void saveEntry ( Entry entry ) throws SqlJetException {
    // Utils
    /////////////////////////////////////////////////////////////////////////////
 
-   private static final String csvTokenPattern = "(?<=^|,)([^\"\\r\\n,]*|\"(?:\"\"|[^\"])*\")(?:,|$)";
+   private final String csvTokenPattern = "(?<=^|,)([^\"\\r\\n,]*|\"(?:\"\"|[^\"])*\")(?:,|$)";
    private final Matcher csvToken = Pattern.compile( csvTokenPattern ).matcher( "" );
    private final List<String> csvBuffer = new ArrayList<>();