From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 11 Jul 2012 11:51:57 +0000 (+0200)
Subject: Trying to improve synchronization performance with database batched operations
X-Git-Tag: oc-android-1.4.3~290
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d4f8391f509b4b211d6742db6db546b80e8277c7?ds=inline;hp=-c

Trying to improve synchronization performance with database batched operations
---

d4f8391f509b4b211d6742db6db546b80e8277c7
diff --git a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java
index e4c385f5..9f1d89bd 100644
--- a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java
+++ b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java
@@ -18,6 +18,7 @@
 
 package eu.alefzero.owncloud.datamodel;
 
+import java.util.List;
 import java.util.Vector;
 
 public interface DataStorageManager {
@@ -32,6 +33,8 @@ public interface DataStorageManager {
 
     public boolean saveFile(OCFile file);
 
+    public void saveFiles(List<OCFile> files);
+
     public Vector<OCFile> getDirectoryContent(OCFile f);
     
     public void removeFile(OCFile file);
diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
index 1feb424b..e1b62ef7 100644
--- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
+++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
@@ -19,14 +19,21 @@
 package eu.alefzero.owncloud.datamodel;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
+import eu.alefzero.owncloud.db.ProviderMeta;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import android.accounts.Account;
 import android.content.ContentProviderClient;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
 import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -155,6 +162,86 @@ public class FileDataStorageManager implements DataStorageManager {
         return overriden;
     }
 
+
+    @Override
+    public void saveFiles(List<OCFile> files) {
+        
+        Iterator<OCFile> filesIt = files.iterator();
+        ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>(files.size());
+        OCFile file = null;
+
+        // prepare operations to perform
+        while (filesIt.hasNext()) {
+            file = filesIt.next();
+            ContentValues cv = new ContentValues();
+            cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp());
+            cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp());
+            cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength());
+            cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype());
+            cv.put(ProviderTableMeta.FILE_NAME, file.getFileName());
+            if (file.getParentId() != 0)
+                cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId());
+            cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath());
+            if (!file.isDirectory())
+                cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath());
+            cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name);
+            cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDate());
+            cv.put(ProviderTableMeta.FILE_KEEP_IN_SYNC, file.keepInSync() ? 1 : 0);
+
+            if (fileExists(file.getRemotePath())) {
+                OCFile tmpfile = getFileByPath(file.getRemotePath());
+                file.setStoragePath(tmpfile.getStoragePath());
+                if (!file.isDirectory());
+                    cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath());
+                file.setFileId(tmpfile.getFileId());
+
+                operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI).
+                        withValues(cv).
+                        withSelection(  ProviderTableMeta._ID + "=?", 
+                                        new String[] { String.valueOf(file.getFileId()) })
+                        .build());
+                
+            } else {
+                operations.add(ContentProviderOperation.newInsert(ProviderTableMeta.CONTENT_URI).withValues(cv).build());
+            }
+        }
+        
+        // apply operations in batch
+        ContentProviderResult[] results = null;
+        try {
+            if (getContentResolver() != null) {
+                results = getContentResolver().applyBatch(ProviderMeta.AUTHORITY_FILES, operations);
+            
+            } else {
+                results = getContentProvider().applyBatch(operations);
+            }
+            
+        } catch (OperationApplicationException e) {
+            Log.e(TAG, "Fail to update/insert list of files to database " + e.getMessage());
+            
+        } catch (RemoteException e) {
+            Log.e(TAG, "Fail to update/insert list of files to database " + e.getMessage());
+        }
+        
+        // update new id in file objects for insertions
+        if (results != null) {
+            long newId;
+            for (int i=0; i<results.length; i++) {
+                if (results[i].uri != null) {
+                    newId = Long.parseLong(results[i].uri.getPathSegments().get(1));
+                    files.get(i).setFileId(newId);
+                    //Log.v(TAG, "Found and added id in insertion for " + files.get(i).getRemotePath());
+                }
+            }
+        }
+
+        for (OCFile aFile : files) {
+            if (aFile.isDirectory() && aFile.needsUpdatingWhileSaving())
+                saveFiles(getDirectoryContent(aFile));
+        }
+
+    }
+    
     public void setAccount(Account account) {
         mAccount = account;
     }
diff --git a/src/eu/alefzero/owncloud/providers/FileContentProvider.java b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
index a354be07..7ed73a9f 100644
--- a/src/eu/alefzero/owncloud/providers/FileContentProvider.java
+++ b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
@@ -123,7 +123,9 @@ public class FileContentProvider extends ContentProvider {
 
     @Override
     public Uri insert(Uri uri, ContentValues values) {
-        if (mUriMatcher.match(uri) != SINGLE_FILE) {
+        if (mUriMatcher.match(uri) != SINGLE_FILE &&
+            mUriMatcher.match(uri) != ROOT_DIRECTORY) {
+            
             throw new IllegalArgumentException("Unknown uri id: " + uri);
         }
 
diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index 1dcc7457..ef7a3d5b 100644
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -20,6 +20,7 @@ package eu.alefzero.owncloud.syncadapter;
 
 import java.io.IOException;
 import java.io.ObjectInputStream.GetField;
+import java.util.List;
 import java.util.Vector;
 
 import org.apache.jackrabbit.webdav.DavException;
@@ -50,6 +51,14 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 
     private final static String TAG = "FileSyncAdapter"; 
     
+    /*  Commented code for ugly performance tests
+    private final static int MAX_DELAYS = 100;
+    private static long[] mResponseDelays = new long[MAX_DELAYS]; 
+    private static long[] mSaveDelays = new long[MAX_DELAYS];
+    private int mDelaysIndex = 0;
+    private int mDelaysCount = 0;
+    */
+    
     private long mCurrentSyncTime;
     
     public FileSyncAdapter(Context context, boolean autoInitialize) {
@@ -66,6 +75,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setStorageManager(new FileDataStorageManager(account,
                 getContentProvider()));
         
+        /*  Commented code for ugly performance tests
+        mDelaysIndex = 0;
+        mDelaysCount = 0;
+        */
+        
+        
         Log.d(TAG, "syncing owncloud account " + account.name);
 
         sendStickyBroadcast(true, null);  // message to signal the start to the UI
@@ -101,21 +116,50 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);
             t.printStackTrace();
         }
+        
+        /*  Commented code for ugly performance tests
+        long sum = 0, mean = 0, max = 0, min = Long.MAX_VALUE;
+        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {
+            sum += mResponseDelays[i];
+            max = Math.max(max, mResponseDelays[i]);
+            min = Math.min(min, mResponseDelays[i]);
+        }
+        mean = sum / mDelaysCount;
+        Log.e(TAG, "SYNC STATS - response: mean time = " + mean + " ; max time = " + max + " ; min time = " + min);
+        
+        sum = 0; max = 0; min = Long.MAX_VALUE;
+        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {
+            sum += mSaveDelays[i];
+            max = Math.max(max, mSaveDelays[i]);
+            min = Math.min(min, mSaveDelays[i]);
+        }
+        mean = sum / mDelaysCount;
+        Log.e(TAG, "SYNC STATS - save:     mean time = " + mean + " ; max time = " + max + " ; min time = " + min);
+        Log.e(TAG, "SYNC STATS - folders measured: " + mDelaysCount);
+        */
+        
         sendStickyBroadcast(false, null);        
     }
 
     private void fetchData(String uri, SyncResult syncResult, long parentId, Account account) {
         try {
-            Log.v(TAG, "syncing: fetching " + uri);
+            //Log.v(TAG, "syncing: fetching " + uri);
             
             // remote request 
             PropFindMethod query = new PropFindMethod(uri);
+            /*  Commented code for ugly performance tests
+            long responseDelay = System.currentTimeMillis();
+            */
             getClient().executeMethod(query);
+            /*  Commented code for ugly performance tests
+            responseDelay = System.currentTimeMillis() - responseDelay;
+            Log.e(TAG, "syncing: RESPONSE TIME for " + uri + " contents, " + responseDelay + "ms");
+            */
             MultiStatus resp = null;
-            
             resp = query.getResponseBodyAsMultiStatus();
             
-            // insertion of updated files
+            // insertion or update of files
+            List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);
             for (int i = 1; i < resp.getResponses().length; ++i) {
                 WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());
                 OCFile file = fillOCFile(we);
@@ -134,12 +178,21 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 }
                 if (getStorageManager().getFileByPath(file.getRemotePath()) != null)
                     file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());
-                getStorageManager().saveFile(file);
+                //getStorageManager().saveFile(file);
+                updatedFiles.add(file);
                 if (parentId == 0)
                     parentId = file.getFileId();
             }
+            /*  Commented code for ugly performance tests
+            long saveDelay = System.currentTimeMillis();
+            */            
+            getStorageManager().saveFiles(updatedFiles);    // all "at once" ; trying to get a best performance in database update
+            /*  Commented code for ugly performance tests
+            saveDelay = System.currentTimeMillis() - saveDelay;
+            Log.e(TAG, "syncing: SAVE TIME for " + uri + " contents, " + mSaveDelays[mDelaysIndex] + "ms");
+            */
             
-            // removal of old files
+            // removal of obsolete files
             Vector<OCFile> files = getStorageManager().getDirectoryContent(
                     getStorageManager().getFileById(parentId));
             OCFile file;
@@ -162,6 +215,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     fetchData(getUri().toString() + newFile.getRemotePath(), syncResult, newFile.getFileId(), account);
                 }
             }
+            
+            /*  Commented code for ugly performance tests
+            mResponseDelays[mDelaysIndex] = responseDelay;
+            mSaveDelays[mDelaysIndex] = saveDelay;
+            mDelaysCount++;
+            mDelaysIndex++;
+            if (mDelaysIndex >= MAX_DELAYS)
+                mDelaysIndex = 0;
+             */
+            
 
 
         } catch (OperationCanceledException e) {