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.

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

Reverts entity data without locking for better performance #1452

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/main/java/org/commcare/cases/entity/AsyncEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ public String getNormalizedField(int i) {

@Override
public String getSortField(int i) {
if (sortData[i] != null) {
return sortData[i];
}
Comment on lines +135 to +137
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix thread safety issue in early return check

The early return check of sortData[i] is not thread-safe. Without proper synchronization, changes to sortData[i] made by other threads may not be visible due to the Java Memory Model's visibility guarantees.

Apply this diff to fix the thread visibility issue:

-        if (sortData[i] != null) {
-            return sortData[i];
-        }
+        synchronized (mAsyncLock) {
+            if (sortData[i] != null) {
+                return sortData[i];
+            }
+        }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (sortData[i] != null) {
return sortData[i];
}
synchronized (mAsyncLock) {
if (sortData[i] != null) {
return sortData[i];
}
}


try (Closeable ignored = mEntityStorageCache != null ? mEntityStorageCache.lockCache() : null) {
//get our second lock.
synchronized (mAsyncLock) {
Expand Down