owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #921 from owo-uwu-nyaa/master

Browse Source 
Make sure cursor stays under 1MB size limit
This commit is contained in:
Gregory K
2024-11-13 20:30:23 +03:00
committed by GitHub
parent 6e4590caf2 62cd754f3a
commit f91b887586
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
View File

@@ -382,21 +382,40 @@ public class AccountSessionManager{
} }
private void readInstanceInfo(SQLiteDatabase db, Set<String> domains){ private void readInstanceInfo(SQLiteDatabase db, Set<String> domains){
try(Cursor cursor=db.query("instances", null, "`domain` IN ("+String.join(", ", Collections.nCopies(domains.size(), "?"))+")", domains.toArray(new String[0]), null, null, null)){ for(String domain : domains){
ContentValues values=new ContentValues(); final int maxEmojiLength=500000;
while(cursor.moveToNext()){ try(Cursor cursor=db.rawQuery("SELECT domain, instance_obj, substring(emojis,0,?) AS emojis, length(emojis) AS emoji_length, last_updated, version FROM instances WHERE `domain` = ?",
DatabaseUtils.cursorRowToContentValues(cursor, values); new String[]{String.valueOf(maxEmojiLength) , domain})) {
String domain=values.getAsString("domain"); ContentValues values=new ContentValues();
int version=values.getAsInteger("version"); while(cursor.moveToNext()){
Instance instance=MastodonAPIController.gson.fromJson(values.getAsString("instance_obj"), switch(version){ DatabaseUtils.cursorRowToContentValues(cursor, values);
case 1 -> InstanceV1.class; int version=values.getAsInteger("version");
case 2 -> InstanceV2.class; Instance instance=MastodonAPIController.gson.fromJson(values.getAsString("instance_obj"), switch(version){
default -> throw new IllegalStateException("Unexpected value: " + version); case 1 -> InstanceV1.class;
}); case 2 -> InstanceV2.class;
List<Emoji> emojis=MastodonAPIController.gson.fromJson(values.getAsString("emojis"), new TypeToken<List<Emoji>>(){}.getType()); default -> throw new IllegalStateException("Unexpected value: "+version);
instances.put(domain, instance); });
customEmojis.put(domain, groupCustomEmojis(emojis)); StringBuilder emojiSB=new StringBuilder();
instancesLastUpdated.put(domain, values.getAsLong("last_updated")); emojiSB.append(values.getAsString("emojis"));
//get emoji in chunks of 1MB if it didn't fit in the first query
int emojiStringLength=values.getAsInteger("emoji_length");
if(emojiStringLength>maxEmojiLength){
final int pagesize=1000000;
for(int start=maxEmojiLength; start<emojiStringLength; start+=pagesize){
try(Cursor emojiCursor=db.rawQuery("SELECT substr(emojis,?, ?) FROM instances WHERE `domain` = ?", new String[]{String.valueOf(start), String.valueOf(pagesize), domain})){
emojiCursor.moveToNext();
emojiSB.append(emojiCursor.getString(0));
}
}
}
List<Emoji> emojis=MastodonAPIController.gson.fromJson(emojiSB.toString(), new TypeToken<List<Emoji>>(){}.getType());
instances.put(domain, instance);
customEmojis.put(domain, groupCustomEmojis(emojis));
instancesLastUpdated.put(domain, values.getAsLong("last_updated"));
}
}catch(Exception ex){
Log.d(TAG, "readInstanceInfo failed", ex);
return;
} }
} }
if(!loadedInstances){ if(!loadedInstances){