From 6e7f430bcf94d7f7bd4cd81b886d610b358c024e Mon Sep 17 00:00:00 2001 From: "Tschaen, Brendan" Date: Tue, 27 Nov 2018 17:29:52 -0500 Subject: Add getLockQueue to music api Change-Id: Ib7db75a2df76ee7dcca92d69d07c3b947736deab Issue-ID: MUSIC-204 Signed-off-by: Tschaen, Brendan --- .../org/onap/music/datastore/CassaLockStore.java | 61 ++++++++++++++-- src/main/java/org/onap/music/main/MusicCore.java | 81 +++++++++++++++++----- 2 files changed, 118 insertions(+), 24 deletions(-) (limited to 'src/main/java/org/onap') diff --git a/src/main/java/org/onap/music/datastore/CassaLockStore.java b/src/main/java/org/onap/music/datastore/CassaLockStore.java index c1bf4784..100d93bc 100644 --- a/src/main/java/org/onap/music/datastore/CassaLockStore.java +++ b/src/main/java/org/onap/music/datastore/CassaLockStore.java @@ -1,5 +1,6 @@ package org.onap.music.datastore; +import java.util.ArrayList; import java.util.List; import org.onap.music.eelf.logging.EELFLoggerDelegate; @@ -16,6 +17,7 @@ import com.datastax.driver.core.Row; public class CassaLockStore { private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CassaLockStore.class); + private static String table_prepend_name = "lockQ_"; public class LockObject{ public String lockRef; @@ -50,7 +52,7 @@ public class CassaLockStore { public boolean createLockQueue(String keyspace, String table) throws MusicServiceException, MusicQueryException { logger.info(EELFLoggerDelegate.applicationLogger, "Create lock queue/table for " + keyspace+"."+table); - table = "lockQ_"+table; + 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, PRIMARY KEY ((key), lockReference) ) " + "WITH CLUSTERING ORDER BY (lockReference ASC);"; @@ -74,7 +76,7 @@ public class CassaLockStore { public String genLockRefandEnQueue(String keyspace, String table, String lockName) throws MusicServiceException, MusicQueryException { logger.info(EELFLoggerDelegate.applicationLogger, "Create lock reference for " + keyspace + "." + table + "." + lockName); - table = "lockQ_" + table; + table = table_prepend_name+table; PreparedQueryObject queryObject = new PreparedQueryObject(); @@ -119,6 +121,55 @@ public class CassaLockStore { return String.valueOf(lockRef); } + /** + * Returns a result set containing the list of clients waiting for a particular lock + * @param keyspace + * @param table + * @param key + * @return list of lockrefs in the queue + * @throws MusicServiceException + * @throws MusicQueryException + */ + public List getLockQueue(String keyspace, String table, String key) + throws MusicServiceException, MusicQueryException { + logger.info(EELFLoggerDelegate.applicationLogger, + "Getting the queue for " + keyspace+"."+table+"."+key); + table = table_prepend_name+table; + String selectQuery = "select * from " + keyspace + "." + table + " where key='" + key + "';"; + PreparedQueryObject queryObject = new PreparedQueryObject(); + queryObject.appendQueryString(selectQuery); + ResultSet rs = dsHandle.executeOneConsistencyGet(queryObject); + ArrayList lockQueue = new ArrayList<>(); + for (Row row: rs) { + lockQueue.add(Long.toString(row.getLong("lockReference"))); + } + return lockQueue; + } + + + /** + * Returns a result set containing the list of clients waiting for a particular lock + * @param keyspace + * @param table + * @param key + * @return size of lockrefs queue + * @throws MusicServiceException + * @throws MusicQueryException + */ + public long getLockQueueSize(String keyspace, String table, String key) + throws MusicServiceException, MusicQueryException { + logger.info(EELFLoggerDelegate.applicationLogger, + "Getting the queue size for " + keyspace+"."+table+"."+key); + table = table_prepend_name+table; + String selectQuery = "select count(*) from " + keyspace + "." + table + " where key='" + key + "';"; + PreparedQueryObject queryObject = new PreparedQueryObject(); + queryObject.appendQueryString(selectQuery); + ResultSet rs = dsHandle.executeOneConsistencyGet(queryObject); + System.err.println(rs); + + return rs.one().getLong("count"); + } + /** * This method returns the top of lock table/queue for the key. @@ -132,7 +183,7 @@ public class CassaLockStore { public LockObject peekLockQueue(String keyspace, String table, String key) throws MusicServiceException, MusicQueryException{ logger.info(EELFLoggerDelegate.applicationLogger, "Peek in lock table for " + keyspace+"."+table+"."+key); - table = "lockQ_"+table; + table = table_prepend_name+table; String selectQuery = "select * from "+keyspace+"."+table+" where key='"+key+"' LIMIT 1;"; PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString(selectQuery); @@ -156,7 +207,7 @@ public class CassaLockStore { * @throws MusicQueryException */ public void deQueueLockRef(String keyspace, String table, String key, String lockReference) throws MusicServiceException, MusicQueryException{ - table = "lockQ_"+table; + table = table_prepend_name+table; PreparedQueryObject queryObject = new PreparedQueryObject(); Long lockReferenceL = Long.parseLong(lockReference); String deleteQuery = "delete from "+keyspace+"."+table+" where key='"+key+"' AND lockReference ="+lockReferenceL+" IF EXISTS;"; @@ -166,7 +217,7 @@ public class CassaLockStore { public void updateLockAcquireTime(String keyspace, String table, String key, String lockReference) throws MusicServiceException, MusicQueryException{ - table = "lockQ_"+table; + table = table_prepend_name+table; PreparedQueryObject queryObject = new PreparedQueryObject(); Long lockReferenceL = Long.parseLong(lockReference); String updateQuery = "update "+keyspace+"."+table+" set acquireTime='"+ System.currentTimeMillis()+"' where key='"+key+"' AND lockReference = "+lockReferenceL+" IF EXISTS;"; diff --git a/src/main/java/org/onap/music/main/MusicCore.java b/src/main/java/org/onap/music/main/MusicCore.java index f085be05..b16d6d68 100644 --- a/src/main/java/org/onap/music/main/MusicCore.java +++ b/src/main/java/org/onap/music/main/MusicCore.java @@ -24,6 +24,7 @@ package org.onap.music.main; import java.io.StringWriter; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.StringTokenizer; @@ -169,12 +170,14 @@ public class MusicCore { } - public static ReturnType acquireLockWithLease(String fullyQualifiedKey, String lockReference, long leasePeriod) throws MusicLockingException, MusicQueryException, MusicServiceException { + public static ReturnType acquireLockWithLease(String fullyQualifiedKey, String lockReference, long leasePeriod) + throws MusicLockingException, MusicQueryException, MusicServiceException { evictExpiredLockHolder(fullyQualifiedKey,leasePeriod); return acquireLock(fullyQualifiedKey, lockReference); } - private static void evictExpiredLockHolder(String fullyQualifiedKey, long leasePeriod) throws MusicLockingException, MusicQueryException, MusicServiceException { + private static void evictExpiredLockHolder(String fullyQualifiedKey, long leasePeriod) + throws MusicLockingException, MusicQueryException, MusicServiceException { String[] splitString = fullyQualifiedKey.split("\\."); String keyspace = splitString[0]; @@ -193,7 +196,9 @@ public class MusicCore { } } - private static ReturnType isTopOfLockStore(String keyspace, String table, String primaryKeyValue, String lockReference) throws MusicLockingException, MusicQueryException, MusicServiceException { + private static ReturnType isTopOfLockStore(String keyspace, String table, + String primaryKeyValue, String lockReference) + throws MusicLockingException, MusicQueryException, MusicServiceException { //return failure to lock holders too early or already evicted from the lock store String topOfLockStoreS = getLockingServiceHandle().peekLockQueue(keyspace, table, primaryKeyValue).lockRef; @@ -214,7 +219,8 @@ public class MusicCore { return new ReturnType(ResultType.SUCCESS, lockReference+" is top of lock store"); } - public static ReturnType acquireLock(String fullyQualifiedKey, String lockReference) throws MusicLockingException, MusicQueryException, MusicServiceException { + public static ReturnType acquireLock(String fullyQualifiedKey, String lockReference) + throws MusicLockingException, MusicQueryException, MusicServiceException { String[] splitString = fullyQualifiedKey.split("\\."); String keyspace = splitString[0]; String table = splitString[1]; @@ -252,7 +258,43 @@ public class MusicCore { return new ReturnType(ResultType.SUCCESS, lockReference+" is the lock holder for the key"); } + /** + * Get the list of locks waiting in queue + * @param fullyQualifiedKey + * @return list of strings that are in the lock queue + * @throws MusicServiceException + * @throws MusicQueryException + * @throws MusicLockingException + */ + public static List getLockQueue(String fullyQualifiedKey) + throws MusicServiceException, MusicQueryException, MusicLockingException { + String[] splitString = fullyQualifiedKey.split("\\."); + String keyspace = splitString[0]; + String table = splitString[1]; + String primaryKeyValue = splitString[2]; + + return getLockingServiceHandle().getLockQueue(keyspace, table, primaryKeyValue); + } + + /** + * Get the list of locks waiting in queue + * @param fullyQualifiedKey + * @return list of strings that are in the lock queue + * @throws MusicServiceException + * @throws MusicQueryException + * @throws MusicLockingException + */ + public static long getLockQueueSize(String fullyQualifiedKey) + throws MusicServiceException, MusicQueryException, MusicLockingException { + String[] splitString = fullyQualifiedKey.split("\\."); + String keyspace = splitString[0]; + String table = splitString[1]; + String primaryKeyValue = splitString[2]; + return getLockingServiceHandle().getLockQueueSize(keyspace, table, primaryKeyValue); + } + + /** * @@ -263,7 +305,8 @@ public class MusicCore { * * */ - public static ResultType createTable(String keyspace, String table, PreparedQueryObject tableQueryObject, String consistency) throws MusicServiceException { + public static ResultType createTable(String keyspace, String table, + PreparedQueryObject tableQueryObject, String consistency) throws MusicServiceException { boolean result = false; try { @@ -371,7 +414,8 @@ public class MusicCore { * @return * @throws MusicServiceException */ - public static Map> marshallResults(ResultSet results) throws MusicServiceException { + public static Map> marshallResults(ResultSet results) + throws MusicServiceException { return getDSHandle().marshalData(results); } @@ -419,11 +463,13 @@ public class MusicCore { return getMusicLockState(fullyQualifiedKey); } - public static MusicLockState voluntaryReleaseLock(String fullyQualifiedKey, String lockReference) throws MusicLockingException{ + public static MusicLockState voluntaryReleaseLock(String fullyQualifiedKey, String lockReference) + throws MusicLockingException{ return destroyLockRef(fullyQualifiedKey, lockReference); } - public static MusicLockState forciblyReleaseLock(String fullyQualifiedKey, String lockReference) throws MusicLockingException, MusicServiceException, MusicQueryException{ + public static MusicLockState forciblyReleaseLock(String fullyQualifiedKey, String lockReference) + throws MusicLockingException, MusicServiceException, MusicQueryException{ String[] splitString = fullyQualifiedKey.split("\\."); String keyspace = splitString[0]; String table = splitString[1]; @@ -459,7 +505,8 @@ public class MusicCore { * @return * @throws MusicServiceException */ - public static TableMetadata returnColumnMetadata(String keyspace, String tablename) throws MusicServiceException { + public static TableMetadata returnColumnMetadata(String keyspace, String tablename) + throws MusicServiceException { return getDSHandle().returnColumnMetadata(keyspace, tablename); } @@ -542,7 +589,8 @@ public class MusicCore { * * */ - public static ResultType nonKeyRelatedPut(PreparedQueryObject queryObject, String consistency) throws MusicServiceException { + public static ResultType nonKeyRelatedPut(PreparedQueryObject queryObject, String consistency) + throws MusicServiceException { // this is mainly for some functions like keyspace creation etc which does not // really need the bells and whistles of Music locking. boolean result = false; @@ -613,7 +661,8 @@ public class MusicCore { * @throws MusicQueryException */ public static ReturnType atomicPut(String keyspaceName, String tableName, String primaryKey, - PreparedQueryObject queryObject, Condition conditionInfo) throws MusicLockingException, MusicQueryException, MusicServiceException { + PreparedQueryObject queryObject, Condition conditionInfo) + throws MusicLockingException, MusicQueryException, MusicServiceException { long start = System.currentTimeMillis(); String fullyQualifiedKey = keyspaceName + "." + tableName + "." + primaryKey; @@ -659,7 +708,8 @@ public class MusicCore { * @throws MusicQueryException */ public static ResultSet atomicGet(String keyspaceName, String tableName, String primaryKey, - PreparedQueryObject queryObject) throws MusicServiceException, MusicLockingException, MusicQueryException { + PreparedQueryObject queryObject) + throws MusicServiceException, MusicLockingException, MusicQueryException { String fullyQualifiedKey = keyspaceName + "." + tableName + "." + primaryKey; String lockReference = createLockReference(fullyQualifiedKey); long leasePeriod = MusicUtil.getDefaultLockLeasePeriod(); @@ -790,11 +840,4 @@ public class MusicCore { resultMap.put("keyspace",keyspace); return resultMap; } - - -// public static void main(String[] args) { -// String x = "axe top"; -// x = x.replaceFirst("top", "sword"); -// System.out.print(x); //returns sword pickaxe -// } } -- cgit 1.2.3-korg