diff options
author | Mohammad Salehe <salehe@cs.toronto.edu> | 2018-11-07 15:56:21 -0500 |
---|---|---|
committer | Mohammad Salehe <salehe@cs.toronto.edu> | 2018-11-20 22:42:37 -0500 |
commit | 0922e1c8a4e095668707a3973b6e8a5ee2fe3329 (patch) | |
tree | fbbf9832b79afe138a669a90af97bdc4ec0e113c /src/test | |
parent | d8574a1d02a90ed25aa1651f310261bb90098171 (diff) |
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>
Diffstat (limited to 'src/test')
3 files changed, 6 insertions, 10 deletions
diff --git a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java index 3f7fd3b7..b2c6df8a 100644 --- a/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicDataStoreTest.java @@ -29,7 +29,6 @@ import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.Mock; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; @@ -105,7 +104,7 @@ public class MusicDataStoreTest { boolean result = false; int count = 0; ResultSet output = null; - output = dataStore.executeEventualGet(testObject); + output = dataStore.executeOneConsistencyGet(testObject); System.out.println(output); ; for (Row row : output) { @@ -124,7 +123,7 @@ public class MusicDataStoreTest { boolean result = false; int count = 0; ResultSet output = null; - output = dataStore.executeCriticalGet(testObject); + output = dataStore.executeQuorumConsistencyGet(testObject); System.out.println(output); ; for (Row row : output) { diff --git a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java index 86774538..a027fd93 100644 --- a/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java +++ b/src/test/java/org/onap/music/unittests/MusicLockStoreTest.java @@ -29,7 +29,6 @@ import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.Mock; import org.onap.music.exceptions.MusicQueryException; import org.onap.music.exceptions.MusicServiceException; @@ -113,7 +112,7 @@ public class MusicLockStoreTest { boolean result = false; int count = 0; ResultSet output = null; - output = dataStore.executeEventualGet(testObject); + output = dataStore.executeOneConsistencyGet(testObject); System.out.println(output); ; for (Row row : output) { @@ -132,7 +131,7 @@ public class MusicLockStoreTest { boolean result = false; int count = 0; ResultSet output = null; - output = dataStore.executeCriticalGet(testObject); + output = dataStore.executeQuorumConsistencyGet(testObject); System.out.println(output); ; for (Row row : output) { 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; } |