Till Westmann has submitted this change and it was merged. Change subject: Symbolic constants in lock manager ......................................................................
Symbolic constants in lock manager Change-Id: I774dd40113f5fa4fee94dde72f4ec6a1891c6b6e Reviewed-on: https://asterix-gerrit.ics.uci.edu/694 Sonar-Qube: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified; No violations found diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java index faec2ed..280f8d2 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java @@ -784,8 +784,8 @@ @Override public void add(long request, long resource, long job) { long upgrader = resArenaMgr.getFirstUpgrader(resource); - reqArenaMgr.setNextRequest(request, -1); - if (upgrader == -1) { + reqArenaMgr.setNextRequest(request, NILL); + if (upgrader == NILL) { resArenaMgr.setFirstUpgrader(resource, request); } else { appendToRequestQueue(upgrader, request); @@ -906,8 +906,8 @@ } private boolean resourceNotUsed(long resource) { - return resArenaMgr.getLastHolder(resource) == -1 && resArenaMgr.getFirstUpgrader(resource) == -1 - && resArenaMgr.getFirstWaiter(resource) == -1; + return resArenaMgr.getLastHolder(resource) == NILL && resArenaMgr.getFirstUpgrader(resource) == NILL + && resArenaMgr.getFirstWaiter(resource) == NILL; } private void validateJob(ITransactionContext txnContext) throws ACIDException { -- To view, visit https://asterix-gerrit.ics.uci.edu/694 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I774dd40113f5fa4fee94dde72f4ec6a1891c6b6e Gerrit-PatchSet: 16 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
