diff options
author | Mohammad Salehe <salehe@cs.toronto.edu> | 2018-11-07 16:05:22 -0500 |
---|---|---|
committer | Mohammad Salehe <salehe@cs.toronto.edu> | 2018-12-21 01:04:37 -0500 |
commit | 9b709f3d33e23710aeae261198806d6a068c5a3b (patch) | |
tree | 0cbb9ea2ecca6ba49bffcee6e44d1625592f1cdb /src/main/java/org/onap | |
parent | d7c26306f0daaa7645f88f1bbb1f1d5cca88ac6c (diff) |
Implement first comparison point tests
Implement ComparisonPoints1 benchmarks to
test 4 different put scenarios:
- Music Entry Consistency
- Music Eventual
- Music Sequential Consistent (Using LWT)
- Pure Consistent (Using LWT)
Change-Id: Id9052a0b14686be93189021e19f2dc293188c52b
Issue-ID: MUSIC-148
Signed-off-by: Mohammad Salehe <salehe@cs.toronto.edu>
Diffstat (limited to 'src/main/java/org/onap')
-rw-r--r-- | src/main/java/org/onap/music/main/VotingAppJar.java | 115 | ||||
-rw-r--r-- | src/main/java/org/onap/music/service/impl/MusicCassaCore.java | 3 |
2 files changed, 1 insertions, 117 deletions
diff --git a/src/main/java/org/onap/music/main/VotingAppJar.java b/src/main/java/org/onap/music/main/VotingAppJar.java deleted file mode 100644 index 1c475639..00000000 --- a/src/main/java/org/onap/music/main/VotingAppJar.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.onap.music.main; - -import java.util.HashMap; -import java.util.Map; - -import org.onap.music.datastore.PreparedQueryObject; -import org.onap.music.exceptions.MusicLockingException; -import org.onap.music.exceptions.MusicQueryException; -import org.onap.music.exceptions.MusicServiceException; -import org.onap.music.main.MusicCore; - -import com.datastax.driver.core.ResultSet; -import com.datastax.driver.core.Row; - -/** - * - */ -public class VotingAppJar -{ - String keyspaceName; - String tableName; - - public VotingAppJar() throws MusicServiceException { - keyspaceName = "VotingAppForMusic"; - tableName = "votevount"; - - createVotingKeyspace(); - System.out.println("Created keyspaces"); - createVotingTable(); - System.out.println("Created tables"); - - createEntryForCandidate("Popeye"); - createEntryForCandidate("Judy"); - createEntryForCandidate("Flash"); - createEntryForCandidate("Mickey"); - System.out.println("Created candidates"); - } - - private void createVotingKeyspace() throws MusicServiceException { - - Map<String,Object> replicationInfo = new HashMap<String, Object>(); - replicationInfo.put("'class'", "'SimpleStrategy'"); - replicationInfo.put("'replication_factor'", 1); - - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE KEYSPACE " + keyspaceName + " WITH REPLICATION = " + replicationInfo.toString().replaceAll("=", ":")); - - try { - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); - } catch (MusicServiceException e) { - if (e.getMessage().equals("Keyspace votingappformusic already exists")) { - // ignore - } else { - throw(e); - } - } - } - - private void createVotingTable() throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "CREATE TABLE " + keyspaceName + "." + tableName + " (name text PRIMARY KEY, count varint);"); - - try { - MusicCore.createTable(keyspaceName, tableName, queryObject, "eventual"); - } catch (MusicServiceException e) { - if (e.getMessage().equals("Table votingappformusic.votevount already exists")) { - //ignore - } else { - throw(e); - } - } - } - - private void createEntryForCandidate(String candidateName) throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, count) " - + "VALUES ('"+candidateName+"', 0);"); - - MusicCore.nonKeyRelatedPut(queryObject, "eventual"); - } - - public void vote() throws MusicLockingException, MusicQueryException, MusicServiceException { - updateVoteCount("Popeye",5); - updateVoteCount("Judy",7); - updateVoteCount("Mickey",8); - updateVoteCount("Flash",2); - } - - private void updateVoteCount(String candidateName, int numVotes) throws MusicLockingException, MusicQueryException, MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString( - "INSERT INTO " + keyspaceName + "." + tableName + " (name, count) " - + "VALUES ('"+candidateName+"', "+numVotes+");"); - MusicCore.atomicPut(keyspaceName, tableName, candidateName, queryObject, null); - } - - private void readAllVotes() throws MusicServiceException { - PreparedQueryObject queryObject = new PreparedQueryObject(); - queryObject.appendQueryString("SELECT * FROM " + keyspaceName + "." + tableName); - ResultSet rs = MusicCore.get(queryObject); - for(Row candidate : rs.all()) { - System.out.println(candidate.getString("name") + " - " + candidate.getVarint("count")); - } - } - - public static void main( String[] args ) throws Exception { - VotingAppJar vHandle = new VotingAppJar(); - vHandle.vote(); - vHandle.readAllVotes(); - } - -} diff --git a/src/main/java/org/onap/music/service/impl/MusicCassaCore.java b/src/main/java/org/onap/music/service/impl/MusicCassaCore.java index fcf02807..f897c181 100644 --- a/src/main/java/org/onap/music/service/impl/MusicCassaCore.java +++ b/src/main/java/org/onap/music/service/impl/MusicCassaCore.java @@ -243,8 +243,7 @@ public class MusicCassaCore implements MusicCoreService { String tabQuery = "CREATE TABLE IF NOT EXISTS "+keyspace+"."+table + " ( key text,PRIMARY KEY (key) );"; - System.out.println(tabQuery); - PreparedQueryObject queryObject = new PreparedQueryObject(); + PreparedQueryObject queryObject = new PreparedQueryObject(); queryObject.appendQueryString(tabQuery); result = false; |