arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-14 09:40:58 +00:00
Code Issues Releases Wiki Activity

Commit after every 100 resource downloads to avoid TransactionTooLargeException

Browse Source
This commit is contained in:
rfc2822 2013-10-26 22:35:26 +02:00
parent d15478b863
commit 03a85da6e3
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/at/bitfire/davdroid/resource/LocalCollection.java
View File

@ -22,9 +22,10 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.RemoteException; import android.os.RemoteException;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.util.Log;
public abstract class LocalCollection<ResourceType extends Resource> { public abstract class LocalCollection<ResourceType extends Resource> {
//private static final String TAG = "davdroid.LocalCollection"; private static final String TAG = "davdroid.LocalCollection";
protected Account account; protected Account account;
protected ContentProviderClient providerClient; protected ContentProviderClient providerClient;
@ -126,7 +127,6 @@ public abstract class LocalCollection<ResourceType extends Resource> {
public void updateByRemoteName(ResourceType remoteResource) throws RemoteException, ValidationException { public void updateByRemoteName(ResourceType remoteResource) throws RemoteException, ValidationException {
ResourceType localResource = findByRemoteName(remoteResource.getName()); ResourceType localResource = findByRemoteName(remoteResource.getName());
remoteResource.validate(); remoteResource.validate();
pendingOperations.add( pendingOperations.add(
@ -155,6 +155,8 @@ public abstract class LocalCollection<ResourceType extends Resource> {
} }
public void commit() throws RemoteException, OperationApplicationException { public void commit() throws RemoteException, OperationApplicationException {
Log.i(TAG, "Committing " + pendingOperations.size() + " operations");
if (!pendingOperations.isEmpty()) if (!pendingOperations.isEmpty())
providerClient.applyBatch(pendingOperations); providerClient.applyBatch(pendingOperations);

20
src/at/bitfire/davdroid/syncadapter/SyncManager.java
View File

@ -11,7 +11,6 @@ import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.fortuna.ical4j.data.ParserException;
import net.fortuna.ical4j.model.ValidationException; import net.fortuna.ical4j.model.ValidationException;
import org.apache.http.HttpException; import org.apache.http.HttpException;
@ -22,14 +21,14 @@ import android.content.OperationApplicationException;
import android.content.SyncResult; import android.content.SyncResult;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import at.bitfire.davdroid.resource.IncapableResourceException;
import at.bitfire.davdroid.resource.LocalCollection; import at.bitfire.davdroid.resource.LocalCollection;
import at.bitfire.davdroid.resource.RemoteCollection; import at.bitfire.davdroid.resource.RemoteCollection;
import at.bitfire.davdroid.resource.Resource; import at.bitfire.davdroid.resource.Resource;
import at.bitfire.davdroid.webdav.PreconditionFailedException; import at.bitfire.davdroid.webdav.PreconditionFailedException;
public class SyncManager { public class SyncManager {
private static String TAG = "davdroid.SyncManager"; private static final String TAG = "davdroid.SyncManager";
private static final int MAX_UPDATES_BEFORE_COMMIT = 100;
protected Account account; protected Account account;
protected AccountManager accountManager; protected AccountManager accountManager;
@ -134,7 +133,7 @@ public class SyncManager {
// PHASE 3: DOWNLOAD NEW/REMOTELY-CHANGED RESOURCES // PHASE 3: DOWNLOAD NEW/REMOTELY-CHANGED RESOURCES
Log.i(TAG, "Adding " + resourcesToAdd.size() + " remote resource(s)"); Log.i(TAG, "Adding " + resourcesToAdd.size() + " remote resource(s)");
if (!resourcesToAdd.isEmpty()) if (!resourcesToAdd.isEmpty()) {
for (Resource res : dav.multiGet(resourcesToAdd.toArray(new Resource[0]))) { for (Resource res : dav.multiGet(resourcesToAdd.toArray(new Resource[0]))) {
Log.i(TAG, "Adding " + res.getName()); Log.i(TAG, "Adding " + res.getName());
try { try {
@ -142,20 +141,25 @@ public class SyncManager {
} catch (ValidationException ex) { } catch (ValidationException ex) {
Log.w(TAG, "Ignoring invalid remote resource: " + res.getName(), ex); Log.w(TAG, "Ignoring invalid remote resource: " + res.getName(), ex);
} }
syncResult.stats.numInserts++;
if (++syncResult.stats.numInserts % MAX_UPDATES_BEFORE_COMMIT == 0) // avoid TransactionTooLargeException
local.commit();
} }
local.commit(); local.commit();
}
Log.i(TAG, "Updating " + resourcesToUpdate.size() + " remote resource(s)"); Log.i(TAG, "Updating " + resourcesToUpdate.size() + " remote resource(s)");
if (!resourcesToUpdate.isEmpty()) if (!resourcesToUpdate.isEmpty())
for (Resource res : dav.multiGet(resourcesToUpdate.toArray(new Resource[0]))) { for (Resource res : dav.multiGet(resourcesToUpdate.toArray(new Resource[0]))) {
Log.i(TAG, "Updating " + res.getName());
try { try {
local.updateByRemoteName(res); local.updateByRemoteName(res);
} catch (ValidationException ex) { } catch (ValidationException ex) {
Log.e(TAG, "Ignoring invalid remote resource: " + res.getName(), ex); Log.e(TAG, "Ignoring invalid remote resource: " + res.getName(), ex);
} }
Log.i(TAG, "Updating " + res.getName());
syncResult.stats.numInserts++; if (++syncResult.stats.numUpdates % MAX_UPDATES_BEFORE_COMMIT == 0) // avoid TransactionTooLargeException
local.commit();
} }
local.commit(); local.commit();