From: Thomas Nelson <nelson24@att.com>
Date: Fri, 27 Dec 2019 04:55:27 +0000 (+0000)
Subject: Merge "Update junits"
X-Git-Tag: 3.2.38~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=music.git;a=commitdiff_plain;h=5a7bf5e9f67701d1587ab7df48ce392a5fe8d940;hp=-c

Merge "Update junits"
---

5a7bf5e9f67701d1587ab7df48ce392a5fe8d940
diff --combined music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
index 6a68b81c,cb6816e0..e9533344
--- a/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
+++ b/music-core/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java
@@@ -129,7 -129,7 +129,7 @@@ public class CassaLockStore 
          table = table_prepend_name+table;
          String tabQuery = "CREATE TABLE IF NOT EXISTS "+keyspace+"."+table
                  + " ( key text, lockReference bigint, createTime text, acquireTime text, guard bigint static, "
-                 + "lockType text, owner text, PRIMARY KEY ((key), lockReference) ) "
+                 + "lockType text, leasePeriodTime bigint, owner text, PRIMARY KEY ((key), lockReference) ) "
                  + "WITH CLUSTERING ORDER BY (lockReference ASC);";
          PreparedQueryObject queryObject = new PreparedQueryObject();
          
@@@ -478,7 -478,7 +478,7 @@@
          queryObject.appendQueryString(" WHERE lockType = ? ALLOW FILTERING");
          queryObject.addValue(LockType.WRITE);
  
 -        DeadlockDetectionUtil ddu = new DeadlockDetectionUtil();
 +        DeadlockDetectionUtil ddu = getDeadlockDetectionUtil();
  
          ResultSet rs = dsHandle.executeLocalQuorumConsistencyGet(queryObject);
          logger.debug("rs has " + rs.getAvailableWithoutFetching() + (rs.isFullyFetched()?"":" (or more!)") );
@@@ -493,14 -493,6 +493,14 @@@
          return deadlock;
      }
  
 +    /**
 +     * This is used for testing purpose
 +     * @return new DeadlockDetectionUtil object
 +     */
 +    DeadlockDetectionUtil getDeadlockDetectionUtil() {
 +    	return new DeadlockDetectionUtil();
 +    }
 +    
      public List<String> getAllLocksForOwner(String ownerId, String keyspace, String table) throws MusicServiceException, MusicQueryException {
          List<String> toRet = new ArrayList<String>();
          String lockTable = table_prepend_name + table;