Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed bug cursor not closed #141

Merged
merged 1 commit into from
Apr 3, 2019
Merged

Fixed bug cursor not closed #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 42 additions & 25 deletions ...src/main/java/com/amazonaws/mobileconnectors/appsync/AWSAppSyncDeltaSyncDBOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,28 @@ boolean deleteRecord(Long id) {
DeltaSyncRecord getRecordByID(long id) {
DeltaSyncRecord record = null;

Cursor cursor = database.query(AWSAppSyncDeltaSyncSqlHelper.TABLE_DELTA_SYNC,
allColumns, AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID + " = ?",
new String[]{"" + id},
null,
null,
null);

if (cursor != null && cursor.getCount() > 0 && cursor.moveToNext()) {
record.id = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID));
record.key = cursor.getString(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY));
record.lastRunTimeInMilliSeconds = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_LAST_RUN_TIME));
Cursor cursor = null;

try {
cursor = database.query(AWSAppSyncDeltaSyncSqlHelper.TABLE_DELTA_SYNC,
allColumns, AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID + " = ?",
new String[]{"" + id},
null,
null,
null);

if (cursor != null && cursor.getCount() > 0 && cursor.moveToNext()) {
record.id = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID));
record.key = cursor.getString(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY));
record.lastRunTimeInMilliSeconds = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_LAST_RUN_TIME));
}
} finally {
if (cursor != null && !cursor.isClosed()) {
cursor.close();
}

}
cursor.close();

return record;
}

Expand All @@ -142,20 +151,28 @@ DeltaSyncRecord getRecordByID(long id) {
DeltaSyncRecord getRecordByKey(String key) {
DeltaSyncRecord record = null;

Cursor cursor = database.query(AWSAppSyncDeltaSyncSqlHelper.TABLE_DELTA_SYNC,
allColumns, AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY + " = ?",
new String[]{key},
null,
null,
null);

if (cursor != null && cursor.getCount() > 0 && cursor.moveToNext()) {
record = new DeltaSyncRecord();
record.id = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID));
record.key = cursor.getString(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY));
record.lastRunTimeInMilliSeconds = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_LAST_RUN_TIME));
Cursor cursor = null;

try {
cursor = database.query(AWSAppSyncDeltaSyncSqlHelper.TABLE_DELTA_SYNC,
allColumns, AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY + " = ?",
new String[]{key},
null,
null,
null);

if (cursor != null && cursor.getCount() > 0 && cursor.moveToNext()) {
record = new DeltaSyncRecord();
record.id = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_ID));
record.key = cursor.getString(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_DELTA_SYNC_KEY));
record.lastRunTimeInMilliSeconds = cursor.getLong(cursor.getColumnIndex(AWSAppSyncDeltaSyncSqlHelper.COLUMN_LAST_RUN_TIME));
}
} finally {
if (cursor != null && !cursor.isClosed()) {
cursor.close();
}
}
cursor.close();

return record;
}

Expand Down
69 changes: 40 additions & 29 deletions ...c/main/java/com/amazonaws/mobileconnectors/appsync/AppSyncMutationSqlCacheOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,39 +96,50 @@ boolean deleteRecord(String recordIdentifier) {

List<PersistentOfflineMutationObject> fetchAllRecords() {
LinkedList<PersistentOfflineMutationObject> mutationObjects = new LinkedList<>();
Cursor cursor = database.query(AppSyncMutationsSqlHelper.TABLE_MUTATION_RECORDS,
allColumns, null, null,
null, null, AppSyncMutationsSqlHelper.COLUMN_ID);
if (cursor == null || !cursor.moveToFirst()) {
return mutationObjects;
}

if (cursor.moveToFirst()) {
while (!cursor.isAfterLast()) {
String recordIdentifier = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.RECORD_IDENTIFIER));
String record = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_RECORD));
String responseClass = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.RESPONSE_CLASS));
String clientState = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_CLIENT_STATE));
String bucket = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_BUCKET));
String key = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_KEY));
String region = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_REGION));
String localUri = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_LOCAL_URI));
String mimeType = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_MIME_TYPE));
PersistentOfflineMutationObject mutationObject = new PersistentOfflineMutationObject(recordIdentifier,
record,
responseClass,
clientState,
bucket,
key,
region,
localUri,
mimeType);
mutationObjects.add(mutationObject);
cursor.moveToNext();
Cursor cursor = null;

try {
cursor = database.query(AppSyncMutationsSqlHelper.TABLE_MUTATION_RECORDS,
allColumns, null, null,
null, null, AppSyncMutationsSqlHelper.COLUMN_ID);

if (cursor == null || !cursor.moveToFirst()) {
return mutationObjects;
}

if (cursor.moveToFirst()) {
while (!cursor.isAfterLast()) {

String recordIdentifier = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.RECORD_IDENTIFIER));
String record = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_RECORD));
String responseClass = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.RESPONSE_CLASS));
String clientState = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_CLIENT_STATE));
String bucket = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_BUCKET));
String key = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_KEY));
String region = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_REGION));
String localUri = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_LOCAL_URI));
String mimeType = cursor.getString(cursor.getColumnIndex(AppSyncMutationsSqlHelper.COLUMN_MIME_TYPE));
PersistentOfflineMutationObject mutationObject = new PersistentOfflineMutationObject(recordIdentifier,
record,
responseClass,
clientState,
bucket,
key,
region,
localUri,
mimeType);
mutationObjects.add(mutationObject);
cursor.moveToNext();
}
}

} finally {
if (cursor != null && !cursor.isClosed()) {
cursor.close();
}
}

cursor.close();
return mutationObjects;
}

Expand Down
11 changes: 9 additions & 2 deletions ...psync/src/main/java/com/apollographql/apollo/cache/normalized/sql/SqlNormalizedCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,21 @@ Optional<Record> selectRecordForKey(String key) {
allColumns, AppSyncSqlHelper.COLUMN_KEY + " = ?", new String[]{key},
null, null, null);
if (cursor == null || !cursor.moveToFirst()) {
if (cursor != null && !cursor.isClosed()) {
cursor.close();
}
return Optional.absent();
}

try {
return Optional.of(cursorToRecord(cursor));
Record rec = cursorToRecord(cursor);
return Optional.of(rec);
} catch (IOException exception) {
return Optional.absent();
} finally {
cursor.close();
if (!cursor.isClosed()) {
cursor.close();
}
}
}

Expand Down