Fixed #1652 - App crash with deleteDocument with concurrencyControl (#1656)

Author: Hideki Itakura

android/CouchbaseLite/src/androidTest/java/com/couchbase/lite/DatabaseTest.java

@@ -1745,6 +1745,24 @@ public void testDeleteNonExistingDoc() throws CouchbaseLiteException {
         db.delete(doc1b);
         assertEquals(0, db.getCount());
         assertNull(db.getDocument(doc1b.getId()));
+    }
+
+    // https://github.com/couchbase/couchbase-lite-android/issues/1652
+    @Test
+    public void testDeleteWithOldDocInstance() throws CouchbaseLiteException {
+        // 1. save
+        MutableDocument mdoc = new MutableDocument("doc");
+        mdoc.setBoolean("updated", false);
+        db.save(mdoc);
 
+        // 2. update
+        Document doc = db.getDocument("doc");
+        mdoc = doc.toMutable();
+        mdoc.setBoolean("updated", true);
+        db.save(mdoc);
+
+        // 3. delete by previously retrived document
+        db.delete(doc);
+        assertNull(db.getDocument("doc"));
     }
 }

android/CouchbaseLite/src/androidTest/java/com/couchbase/lite/LoadTest.java

@@ -323,4 +323,51 @@ boolean updateMap(Map map, int i, long l) {
         }
         return true;
     }
+
+    // NOTE: not yet activated
+    // @Test
+    public void testAddRevisions() {
+        final int revs = 10000;
+        addRevisions(revs, false);
+        addRevisions(revs, true);
+    }
+
+    void addRevisions(final int revisions, final boolean retriveNewDoc) {
+        try {
+            db.inBatch(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        MutableDocument mDoc = new MutableDocument("doc");
+                        if (retriveNewDoc)
+                            updateDocWithGetDocument(mDoc, revisions);
+                        else
+                            updateDoc(mDoc, revisions);
+                    } catch (CouchbaseLiteException e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            Document doc = db.getDocument("doc");
+            assertEquals(revisions - 1, doc.getInt("count")); // start from 0.
+        } catch (CouchbaseLiteException e) {
+            e.printStackTrace();
+        }
+    }
+
+    void updateDoc(MutableDocument doc, final int revisions) throws CouchbaseLiteException {
+        for (int i = 0; i < revisions; i++) {
+            doc.setValue("count", i);
+            db.save(doc);
+            System.gc();
+        }
+    }
+
+    void updateDocWithGetDocument(MutableDocument doc, final int revisions) throws CouchbaseLiteException {
+        for (int i = 0; i < revisions; i++) {
+            doc.setValue("count", i);
+            db.save(doc);
+            doc = db.getDocument("doc").toMutable();
+        }
+    }
 }

shared/src/main/java/com/couchbase/lite/AbstractDatabase.java

@@ -621,7 +621,6 @@ public static void setLogLevel(LogDomain domain, LogLevel level) {
     public String toString() {
         return "Database@" + Integer.toHexString(hashCode()) + "{" +
                 "name='" + name + '\'' +
-                //"dir='" + (c4db != null ? c4db.getPath() : "[closed]") + '\'' +
                 '}';
     }
 
@@ -716,14 +715,6 @@ SharedKeys getSharedKeys() {
     }
 
     //////// DOCUMENTS:
-    C4Document read(String docID, boolean mustExist)
-            throws CouchbaseLiteException {
-        try {
-            return getC4Database().get(docID, mustExist);
-        } catch (LiteCoreException e) {
-            throw CBLStatus.convertException(e);
-        }
-    }
 
     Set<Replicator> getActiveReplications() {
         return activeReplications;
@@ -824,17 +815,15 @@ private File getDefaultDirectory() {
     }
 
     private void setupDirectory(File dir) throws CouchbaseLiteException {
-        if (!dir.exists()) {
+        if (!dir.exists())
             dir.mkdirs();
-        }
         if (!dir.isDirectory()) {
             throw new CouchbaseLiteException(String.format(Locale.ENGLISH,
                     "Unable to create directory for: %s", dir));
         }
     }
 
     private static File getDatabasePath(File dir, String name) {
-        // TODO:
         name = name.replaceAll("/", ":");
         name = String.format(Locale.ENGLISH, "%s.%s", name, DB_EXTENSION);
         return new File(dir, name);

shared/src/main/java/com/couchbase/lite/Document.java

@@ -420,10 +420,7 @@ void setC4Document(C4Document c4doc) {
 
     void replaceC4Document(C4Document c4doc) {
         synchronized (lock) {
-            C4Document oldC4Doc = this._c4doc;
             this._c4doc = c4doc;
-            if (oldC4Doc != null && (c4doc == null || !oldC4Doc.equals(c4doc)))
-                oldC4Doc.free();
         }
     }