| commit | afd59aa9413bb99ad63c3ebba91be9726e27e339 | [log] [tgz] |
|---|---|---|
| author | icetindil <icetindil@gmail.com> | Tue Jun 04 18:25:56 2013 -0700 |
| committer | icetindil <icetindil@gmail.com> | Tue Jun 04 18:25:56 2013 -0700 |
| tree | 52118208312ac670d59c7691b827ba11e53bf22d | |
| parent | 12781313dad92f355b72a76e5d5d6c9dcb1ce056 [diff] |
fixing merge issues
diff --git a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/EntityInfoManager.java b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/EntityInfoManager.java index 57e4583..1e944bc 100644 --- a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/EntityInfoManager.java +++ b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/EntityInfoManager.java
@@ -301,7 +301,7 @@ } public int getShrinkTimerThreshold() { - return SHRINK_TIMER_THRESHOLD; + return shrinkTimerThreshold; } public void initEntityInfo(int slotNum, int jobId, int datasetId, int PKHashVal, byte lockMode) {
diff --git a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java index 71b9129..f0875e0 100644 --- a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java +++ b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/service/locking/LockManager.java
@@ -2093,7 +2093,7 @@ try { StringBuilder sb = new StringBuilder(); sb.append("\n>>dump_begin\t>>----- [ConfVars] -----"); - sb.append("\nESCALATE_TRHESHOLD_ENTITY_TO_DATASET: " + ESCALATE_TRHESHOLD_ENTITY_TO_DATASET); + sb.append("\nESCALATE_TRHESHOLD_ENTITY_TO_DATASET: " + txnSubsystem.getTransactionProperties().getEntityToDatasetLockEscalationThreshold()); sb.append("\nSHRINK_TIMER_THRESHOLD (entityLockInfoManager): " + entityLockInfoManager.getShrinkTimerThreshold()); sb.append("\nSHRINK_TIMER_THRESHOLD (entityInfoManager): " + entityInfoManager.getShrinkTimerThreshold());