mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:23:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add SQL query pagination to fix #5891

Browse source 
Signed-Off-By: GDR! <gdr@gdr.name>
This commit is contained in:
GDR! 2020-04-24 15:24:32 +02:00 committed by tobiasKaminsky
parent 4a39f3970d
commit da1a2e20f7
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
1 changed files with 71 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java
View file

@ -39,6 +39,8 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.operations.UploadFileOperation;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Observable;
@ -284,35 +286,78 @@ public class UploadsStorageManager extends Observable {
}
private OCUpload[] getUploads(@Nullable String selection, @Nullable String... selectionArgs) {
OCUpload[] list;
ArrayList<OCUpload> uploads = new ArrayList<>();
final long pageSize = 100;
long offset = 0;
long page = 0;
long rowsRead = 0;
long rowsTotal = 0;
long lastRowID = -1;
Cursor c = getDB().query(
ProviderTableMeta.CONTENT_URI_UPLOADS,
null,
selection,
selectionArgs,
null
);
if (c != null) {
list = new OCUpload[c.getCount()];
if (c.moveToFirst()) {
do {
OCUpload upload = createOCUploadFromCursor(c);
if (upload == null) {
Log_OC.e(TAG, "OCUpload could not be created from cursor");
} else {
list[c.getPosition()] = upload;
}
} while (c.moveToNext() && !c.isAfterLast());
do {
String pageSelection = selection;
String[] pageSelectionArgs = selectionArgs;
if(page > 0 && lastRowID >= 0) {
if(selection != null) {
pageSelection = "(" + selection + ") AND _id < ?";
} else {
pageSelection = "_id < ?";
}
if(selectionArgs != null) {
pageSelectionArgs = Arrays.copyOf(selectionArgs, selectionArgs.length + 1);
} else {
pageSelectionArgs = new String[1];
}
pageSelectionArgs[pageSelectionArgs.length - 1] = String.valueOf(lastRowID);
Log_OC.d(TAG, String.format("QUERY: %s ROWID: %d", pageSelection, lastRowID));
} else {
Log_OC.d(TAG, String.format("QUERY: %s ROWID: %d", selection, lastRowID));
}
c.close();
} else {
list = new OCUpload[0];
}
rowsRead = 0;
return list;
Cursor c = getDB().query(
ProviderTableMeta.CONTENT_URI_UPLOADS,
null,
pageSelection,
pageSelectionArgs,
String.format("_id DESC LIMIT %d", pageSize)
);
if (c != null) {
if (c.moveToFirst()) {
do {
rowsRead++;
rowsTotal++;
lastRowID = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
OCUpload upload = createOCUploadFromCursor(c);
if (upload == null) {
Log_OC.e(TAG, "OCUpload could not be created from cursor");
} else {
uploads.add(upload);
}
} while (c.moveToNext() && !c.isAfterLast());
}
c.close();
Log_OC.v(TAG, String.format("getUploads() got %d rows from page %d, %d rows total so far, last ID %d",
rowsRead,
page,
rowsTotal,
lastRowID
));
offset += rowsRead;
page += 1;
} else {
break;
}
} while(rowsRead > 0);
Log_OC.v(TAG, String.format("getUploads() returning %d (%d) rows after reading %d pages",
rowsTotal,
uploads.size(),
page
));
return (OCUpload[])uploads.toArray(new OCUpload[uploads.size()]);
}
private OCUpload createOCUploadFromCursor(Cursor c) {