From 4fd976522e547261d24b062d5bb21a793887c3d3 Mon Sep 17 00:00:00 2001 From: Mohammad Salehe Date: Fri, 8 Feb 2019 11:23:33 -0500 Subject: Add "ORDER BY" to top of lock queue checks Add explicit "ORDER BY" to top of lock queue check queries Change-Id: Ibb985d21283cd952e609b8fbb8d78194f5891d60 Issue-ID: MUSIC-148 Signed-off-by: Mohammad Salehe --- .../java/org/onap/music/lockingservice/cassandra/CassaLockStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java b/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java index cbc172db..6e0b61a0 100644 --- a/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java +++ b/src/main/java/org/onap/music/lockingservice/cassandra/CassaLockStore.java @@ -214,7 +214,7 @@ public class CassaLockStore { logger.info(EELFLoggerDelegate.applicationLogger, "Peek in lock table for " + keyspace+"."+table+"."+key); table = table_prepend_name+table; - String selectQuery = "select * from "+keyspace+"."+table+" where key='"+key+"' LIMIT 1;"; + String selectQuery = "SELECT * FROM "+keyspace+"."+table+" WHERE key='"+key+"' ORDER BY lockReference ASC LIMIT 1;"; PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString(selectQuery); ResultSet results = dsHandle.executeOneConsistencyGet(queryObject); @@ -238,7 +238,7 @@ public class CassaLockStore { "Checking in lock table for " + keyspace + "." + table + "." + key); table = table_prepend_name + table; String selectQuery = - "select * from " + keyspace + "." + table + " where key='" + key + "';"; + "SELECT * FROM " + keyspace + "." + table + " WHERE key='" + key + "' ORDER BY lockReference ASC;"; PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString(selectQuery); ResultSet rs = dsHandle.executeOneConsistencyGet(queryObject); -- cgit 1.2.3-korg