Improve timestamp and query handling

Add timeSlot parameter to CassaDataStore.executePut
to prevent inconsistent timestamps

Rename CassaDataStore.executeEventualGet and
CassaDataStore.executeCriticalPut to reflect
their real functionality

Use simple bound statement instead of
prepared queries to improve performance

Change-Id: I439c5279f1c8e645740a9650ab8807c5ffa1725a
Issue-ID: MUSIC-148
Signed-off-by: Mohammad Salehe <salehe@cs.toronto.edu>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/test/java/org/onap/music/unittests/TestMusicCore.java b/src/test/java/org/onap/music/unittests/TestMusicCore.java
index 01d2ffb6..f7b9c0d0 100644
--- a/src/test/java/org/onap/music/unittests/TestMusicCore.java
+++ b/src/test/java/org/onap/music/unittests/TestMusicCore.java
@@ -3,8 +3,6 @@ package org.onap.music.unittests;
 import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.junit.AfterClass;
@@ -68,7 +66,7 @@ public class TestMusicCore {
         queryObject = new PreparedQueryObject();
         String systemQuery = "SELECT keyspace_name FROM system_schema.keyspaces where keyspace_name='"+keyspace.toLowerCase()+"';";
         queryObject.appendQueryString(systemQuery);
-        ResultSet rs = dataStore.executeEventualGet(queryObject);     
+        ResultSet rs = dataStore.executeOneConsistencyGet(queryObject);
         assert rs.all().size()> 0;
     }
     
@@ -84,7 +82,7 @@ public class TestMusicCore {
         queryObject = new PreparedQueryObject();
         String systemQuery = "SELECT table_name FROM system_schema.tables where keyspace_name='"+keyspace.toLowerCase()+"' and table_name='"+table.toLowerCase()+"';";
         queryObject.appendQueryString(systemQuery);
-        ResultSet rs = dataStore.executeEventualGet(queryObject);
+        ResultSet rs = dataStore.executeOneConsistencyGet(queryObject);
         assert rs.all().size()> 0;
     }