Merge branch 'release/1.1.0'

* release/1.1.0: (24 commits)
  - return false in case of any error during database initialization - remove unnecessary cursor close code
  Fixed #607 - Apply transaction for database initialization.
  Just removed debugging code
  Applied java coding style
  Fixed #596
  Applied @pasin 's feedback https://github.com/couchbase/couchbase-lite-java-core/pull/605/files#r29380839
  attachment folder and its parent folder should be deleted separately.
  delete obsoleted file path
  Check if directory exists before calling mkdir() method
  Fixed #604 -　Attachments folder path is not compatible with iOS
  Use `private` instead of `public`.
  Fixed #602 Make / db names work in windows
  Removed Replicator.ChangeListener
  - Apply synchronized - Changed Log.e(), Log.w(), and Log.i() to Log.d() for non-error cases
  Fixed #575
  Fixed #456
  Fixed #590
  Fixed CBL Android 210 - Heavy memory usage causes the null field return value for SQL query. It causes the missing index.
  Applied the feedback from @pasin
  - convert from digest to blob key could fail, for example, digest is md5-xxxx.
  ...

Author: Hideki Itakura

src/main/java/com/couchbase/lite/BlobStore.java

@@ -56,7 +56,9 @@ public BlobStore(String path, boolean autoMigrate) {
         this.path = path;
         File directory = new File(path);
 
-        directory.mkdirs();
+        if (!directory.exists()) {
+            directory.mkdirs();
+        }
         if (!directory.isDirectory()) {
             throw new IllegalStateException(String.format("Unable to create directory for: %s", directory));
         }
@@ -173,6 +175,12 @@ public boolean getKeyForFilename(BlobKey outKey, String filename) {
         return true;
     }
 
+    public boolean hasBlobForKey(BlobKey key){
+        String path = pathForKey(key);
+        File file = new File(path);
+        return file.isFile() && file.exists();
+    }
+
     public byte[] blobForKey(BlobKey key) {
         String path = pathForKey(key);
         File file = new File(path);
@@ -369,7 +377,9 @@ public File tempDir() {
         File directory = new File(path);
         File tempDirectory = new File(directory, "temp_attachments");
 
-        tempDirectory.mkdirs();
+        if (!tempDirectory.exists()) {
+            tempDirectory.mkdirs();
+        }
         if (!tempDirectory.isDirectory()) {
             throw new IllegalStateException(String.format("Unable to create directory for: %s", tempDirectory));
         }

src/main/java/com/couchbase/lite/Database.java

@@ -10,7 +10,6 @@
 import com.couchbase.lite.support.Version;
 import com.couchbase.lite.util.Log;
 import com.couchbase.lite.util.StreamUtils;
-
 import com.couchbase.lite.util.Utils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -130,7 +129,9 @@ public Manager(Context context, ManagerOptions options) throws IOException {
         this.databases = new HashMap<String, Database>();
         this.replications = new ArrayList<Replication>();
 
-        directoryFile.mkdirs();
+        if (!directoryFile.exists()) {
+            directoryFile.mkdirs();
+        }
         if (!directoryFile.isDirectory()) {
             throw new IOException(String.format("Unable to create directory for: %s", directoryFile));
         }
@@ -289,7 +290,9 @@ private void replaceDatabase(String databaseName, InputStream databaseStream, It
             StreamUtils.copyStream(databaseStream, destStream);
             File attachmentsFile = new File(dstAttachmentsPath);
             FileDirUtils.deleteRecursive(attachmentsFile);
-            attachmentsFile.mkdirs();
+            if (!attachmentsFile.exists()) {
+                attachmentsFile.mkdirs();
+            }
             if (attachmentStreams != null) {
                 StreamUtils.copyStreamsToFolder(attachmentStreams, attachmentsFile);
             }
@@ -417,7 +420,14 @@ private String pathForName(String name) {
         if ((name == null) || (name.length() == 0) || Pattern.matches(LEGAL_CHARACTERS, name)) {
             return null;
         }
-        name = name.replace('/', ':');
+        // NOTE: CouchDB allows forward slash as part of database name.
+        //       However, ':' is illegal character on Windows platform.
+        //       For Windows, substitute with period '.'
+        if(isWindows()) {
+            name = name.replace('/', '.');
+        }else{
+            name = name.replace('/', ':');
+        }
         String result = directoryFile.getPath() + File.separator + name + Manager.DATABASE_SUFFIX;
         return result;
     }
@@ -668,5 +678,15 @@ public Context getContext() {
     protected boolean isAutoMigrateBlobStoreFilename() {
         return this.options.isAutoMigrateBlobStoreFilename();
     }
+
+    private static String OS = System.getProperty("os.name").toLowerCase();
+
+    /**
+     * Check if platform is Windows
+     */
+    @InterfaceAudience.Private
+    private static boolean isWindows() {
+        return (OS.indexOf("win") >= 0);
+    }
 }
 

src/main/java/com/couchbase/lite/Manager.java

@@ -512,9 +512,16 @@ public void emit(Object key, Object value) {
                 }
             };
 
-            // Now scan every revision added since the last time the view was
-            // indexed:
-            StringBuffer sql = new StringBuffer( "SELECT revs.doc_id, sequence, docid, revid, json, no_attachments, deleted FROM revs, docs WHERE sequence>? AND current!=0 ");
+            // Now scan every revision added since the last time the view was indexed:
+
+            // NOTE: Below is original Query. In case query result uses a lot of memory,
+            //       Android SQLiteDatabase causes null value column. Then it causes the missing
+            //       index data because following logic skip result if column is null.
+            //       To avoid the issue, retrieving json field is isolated from original query.
+            //       Because json field could be large, maximum size is 2MB.
+            // StringBuffer sql = new StringBuffer( "SELECT revs.doc_id, sequence, docid, revid, json, no_attachments, deleted FROM revs, docs WHERE sequence>? AND current!=0 ");
+
+            StringBuffer sql = new StringBuffer( "SELECT revs.doc_id, sequence, docid, revid, no_attachments, deleted FROM revs, docs WHERE sequence>? AND current!=0 ");
             if(minLastSequence == 0) {
                 sql.append("AND deleted=0 ");
             }
@@ -542,10 +549,9 @@ public void emit(Object key, Object value) {
                     continue;
                 }
                 String revId = cursor.getString(3);
-                byte[] json = cursor.getBlob(4);
 
-                boolean noAttachments = cursor.getInt(5) > 0;
-                boolean deleted = cursor.getInt(6) > 0;
+                boolean noAttachments = cursor.getInt(4) > 0;
+                boolean deleted = cursor.getInt(5) > 0;
 
                 while ((keepGoing = cursor.moveToNext()) && (cursor.isNull(0) || cursor.getLong(0) == docID)) {
                     // Skip rows with the same doc_id -- these are losing conflicts.
@@ -583,8 +589,6 @@ public void emit(Object key, Object value) {
                                 revId = oldRevId;
                                 sequence = oldSequence;
                                 deleted = false;
-                                String[] selectArgs3 = { Long.toString(sequence) };
-                                json = Utils.byteArrayResultForQuery(database.getDatabase(), "SELECT json FROM revs WHERE sequence=?", selectArgs3);
                             }
                         }
                     } finally {
@@ -598,6 +602,9 @@ public void emit(Object key, Object value) {
                     continue;
                 }
 
+                String[] selectArgs3 = { Long.toString(sequence) };
+                byte[] json = Utils.byteArrayResultForQuery(database.getDatabase(), "SELECT json FROM revs WHERE sequence=?", selectArgs3);
+
                 // Get the document properties, to pass to the map function:
                 EnumSet<TDContentOptions> contentOptions = EnumSet.noneOf(Database.TDContentOptions.class);
                 if (noAttachments)
@@ -615,7 +622,11 @@ public void emit(Object key, Object value) {
                     // pairs from this revision:
                     emitBlock.setSequence(sequence);
                     mapBlock.map(properties, emitBlock);
+
+                    properties.clear();
+                    properties = null;
                 }
+                json = null;
             }
 
             // Finally, record the last revision sequence number that was

src/main/java/com/couchbase/lite/View.java

@@ -217,7 +217,7 @@ public void setAuthenticator(Authenticator authenticator) {
 
     @Override
     public void run() {
-        Log.e(Log.TAG_CHANGE_TRACKER, "Thread id => " + Thread.currentThread().getId());
+        Log.d(Log.TAG_CHANGE_TRACKER, "Thread id => " + Thread.currentThread().getId());
         try {
             runLoop();
         } finally {
@@ -357,7 +357,7 @@ public void process(HttpRequest request, HttpContext context) throws HttpExcepti
                                 backoff.resetBackoff();
                                 continue;
                             } else {
-                                Log.w(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling stop (LongPoll)", this);
+                                Log.d(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling stop (LongPoll)", this);
                                 client.changeTrackerFinished(this);
                                 break;
                             }
@@ -389,7 +389,7 @@ public void process(HttpRequest request, HttpContext context) throws HttpExcepti
                             if (isContinuous()) {  // if enclosing replication is continuous
                                 mode = ChangeTrackerMode.LongPoll;
                             } else {
-                                Log.w(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling stop (OneShot)", this);
+                                Log.d(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling stop (OneShot)", this);
                                 client.changeTrackerFinished(this);
                                 break;
                             }
@@ -496,10 +496,10 @@ public void stop() {
     private void stopped() {
         Log.d(Log.TAG_CHANGE_TRACKER, "%s: Change tracker in stopped()", this);
         if (client != null) {
-            Log.w(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling changeTrackerStopped, client: %s", this, client);
+            Log.d(Log.TAG_CHANGE_TRACKER, "%s: Change tracker calling changeTrackerStopped, client: %s", this, client);
             client.changeTrackerStopped(ChangeTracker.this);
         } else {
-            Log.w(Log.TAG_CHANGE_TRACKER, "%s: Change tracker not calling changeTrackerStopped, client == null", this);
+            Log.d(Log.TAG_CHANGE_TRACKER, "%s: Change tracker not calling changeTrackerStopped, client == null", this);
         }
         client = null;
         running = false; // in case stop() method was not called to stop