public class Test {
- public static final int NUMBER_OF_TESTS = 20000; //66
+ public static final int NUMBER_OF_TESTS = 10000;
public static void main(String[] args) {
if (args[0].equals("2")) {
}
}
-
-
static void test5() {
Table t1 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
t1.rebuild();
// }
}
- static Thread buildThreadTest4(String prefix, Table t) {
- return new Thread() {
- public void run() {
- for (int i = 0; i < (NUMBER_OF_TESTS * 3); i++) {
-
- int num = i % NUMBER_OF_TESTS;
- String key = prefix + num;
- String value = prefix + (num + 2000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
-
- t.startTransaction();
- t.addKV(iKey, iValue);
- t.commitTransaction();
- }
- }
- };
- }
+ // static Thread buildThreadTest4(String prefix, Table t) {
+ // return new Thread() {
+ // public void run() {
+ // for (int i = 0; i < (NUMBER_OF_TESTS * 3); i++) {
+
+ // int num = i % NUMBER_OF_TESTS;
+ // String key = prefix + num;
+ // String value = prefix + (num + 2000);
+ // IoTString iKey = new IoTString(key);
+ // IoTString iValue = new IoTString(value);
+
+ // t.startTransaction();
+ // t.addKV(iKey, iValue);
+ // t.commitTransaction();
+ // }
+ // }
+ // };
+ // }
static void test4() {
+
+ long startTime = 0;
+ long endTime = 0;
+
+ // Setup the 2 clients
Table t1 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
+ t1.initTable();
Table t2 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 351);
- t1.rebuild();
- t2.rebuild();
-
- Thread thr1 = buildThreadTest4("b", t1);
- Thread thr2 = buildThreadTest4("a", t2);
- thr1.start();
- thr2.start();
- try {
- thr1.join();
- thr2.join();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- t1.update();
t2.update();
- // t1.update();
- // Print the results
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
+
+ // Make the Keys
+ System.out.println("Setting up keys");
+ startTime = System.currentTimeMillis();
+ for (int i = 0; i < 4; i++) {
String a = "a" + i;
String b = "b" + i;
+ String c = "c" + i;
+ String d = "d" + i;
IoTString ia = new IoTString(a);
IoTString ib = new IoTString(b);
-
- System.out.println(ib + " -> " + t1.getCommitted(ib));
- System.out.println(ia + " -> " + t2.getCommitted(ia));
- System.out.println();
+ IoTString ic = new IoTString(c);
+ IoTString id = new IoTString(d);
+ t1.createNewKey(ia, 321);
+ t1.createNewKey(ib, 351);
+ t2.createNewKey(ic, 321);
+ t2.createNewKey(id, 351);
}
- }
+ endTime = System.currentTimeMillis();
- static void test3() {
- Table t1 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
- Table t2 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 351);
- t1.rebuild();
- t2.rebuild();
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- String key = "a" + i;
- String value = "a" + (i + 1000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Key: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 4)) );
+ System.out.println();
- t1.startTransaction();
- t1.addKV(iKey, iValue);
- t1.commitTransaction();
+
+ // Do Updates for the keys
+ System.out.println("Setting Key-Values...");
+ startTime = System.currentTimeMillis();
+ for (int t = 0; t < NUMBER_OF_TESTS; t++) {
+ for (int i = 0; i < 4; i++) {
+ String keyA = "a" + i;
+ String keyB = "b" + i;
+ String keyC = "c" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueB = "b" + i;
+ String valueC = "c" + i;
+ String valueD = "d" + i;
+
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueB = new IoTString(valueB);
+ IoTString iValueC = new IoTString(valueC);
+ IoTString iValueD = new IoTString(valueD);
+
+ t1.startTransaction();
+ t1.addKV(iKeyA, iValueA);
+ t1.commitTransaction();
+
+ t1.startTransaction();
+ t1.addKV(iKeyB, iValueB);
+ t1.commitTransaction();
+
+ t2.startTransaction();
+ t2.addKV(iKeyC, iValueC);
+ t2.commitTransaction();
+
+ t2.startTransaction();
+ t2.addKV(iKeyD, iValueD);
+ t2.commitTransaction();
+ }
}
+ endTime = System.currentTimeMillis();
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- String key = "b" + i;
- String value = "b" + (i + 1000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Update: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 8)) );
+ System.out.println();
- t2.startTransaction();
- t2.addKV(iKey, iValue);
- t2.commitTransaction();
- }
- // Make sure t1 sees the new updates from t2
+ System.out.println("Updating Clients...");
+ t1.update();
+ t2.update();
t1.update();
+ t2.update();
- // Print the results
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- String a = "a" + i;
- String b = "b" + i;
- IoTString ia = new IoTString(a);
- IoTString ib = new IoTString(b);
+ boolean foundError = false;
+
+ System.out.println("Checking Key-Values...");
+ for (int i = 0; i < 4; i++) {
+
+ String keyA = "a" + i;
+ String keyB = "b" + i;
+ String keyC = "c" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueB = "b" + i;
+ String valueC = "c" + i;
+ String valueD = "d" + i;
+
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueB = new IoTString(valueB);
+ IoTString iValueC = new IoTString(valueC);
+ IoTString iValueD = new IoTString(valueD);
+
+
+ IoTString testValA1 = t1.getCommitted(iKeyA);
+ IoTString testValB1 = t1.getCommitted(iKeyB);
+ IoTString testValC1 = t1.getCommitted(iKeyC);
+ IoTString testValD1 = t1.getCommitted(iKeyD);
+
+ IoTString testValA2 = t2.getCommitted(iKeyA);
+ IoTString testValB2 = t2.getCommitted(iKeyB);
+ IoTString testValC2 = t2.getCommitted(iKeyC);
+ IoTString testValD2 = t2.getCommitted(iKeyD);
+
+ if ((testValA1 == null) || (testValA1.equals(iValueA) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyA);
+ foundError = true;
+ }
+
+ if ((testValB1 == null) || (testValB1.equals(iValueB) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyB);
+ foundError = true;
+ }
- System.out.println(ib + " -> " + t1.getCommitted(ib));
- System.out.println(ia + " -> " + t2.getCommitted(ia));
- System.out.println();
+ if ((testValC1 == null) || (testValC1.equals(iValueC) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyC);
+ foundError = true;
+ }
+
+ if ((testValD1 == null) || (testValD1.equals(iValueD) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyD);
+ foundError = true;
+ }
+
+
+ if ((testValA2 == null) || (testValA2.equals(iValueA) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyA + " " + testValA2);
+ foundError = true;
+ }
+
+ if ((testValB2 == null) || (testValB2.equals(iValueB) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyB + " " + testValB2);
+ foundError = true;
+ }
+
+ if ((testValC2 == null) || (testValC2.equals(iValueC) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyC + " " + testValC2);
+ foundError = true;
+ }
+
+ if ((testValD2 == null) || (testValD2.equals(iValueD) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyD + " " + testValD2);
+ foundError = true;
+ }
}
+
+ if (foundError) {
+ System.out.println("Found Errors...");
+ } else {
+ System.out.println("No Errors Found...");
+ }
+
+ System.out.println();
+ System.out.println();
+ System.out.println();
+ System.out.println();
+ t1.printSlots();
+ System.out.println();
+ t2.printSlots();
}
- static void test2() {
+ static void test3() {
+
+ long startTime = 0;
+ long endTime = 0;
+
+ // Setup the 2 clients
Table t1 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
t1.initTable();
Table t2 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 351);
// Make the Keys
System.out.println("Setting up keys");
+ startTime = System.currentTimeMillis();
for (int i = 0; i < NUMBER_OF_TESTS; i++) {
String a = "a" + i;
String b = "b" + i;
+ String c = "c" + i;
+ String d = "d" + i;
IoTString ia = new IoTString(a);
IoTString ib = new IoTString(b);
+ IoTString ic = new IoTString(c);
+ IoTString id = new IoTString(d);
t1.createNewKey(ia, 321);
- t1.createNewKey(ib, 321);
+ t1.createNewKey(ib, 351);
+ t2.createNewKey(ic, 321);
+ t2.createNewKey(id, 351);
}
+ endTime = System.currentTimeMillis();
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold);
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold);
- // System.out.println();
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Key: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 4)) );
+ System.out.println();
+
// Do Updates for the keys
- System.out.println("Writing Keys a...");
+ System.out.println("Setting Key-Values...");
+ startTime = System.currentTimeMillis();
for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- System.out.println(i);
-
- String key = "a" + i;
- String value = "a" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ String keyB = "b" + i;
+ String valueB = "b" + i;
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iValueB = new IoTString(valueB);
t1.startTransaction();
- t1.addKV(iKey, iValue);
+ t1.addKV(iKeyB, iValueB);
t1.commitTransaction();
}
- // Do Updates for the keys
- System.out.println("Writing Keys a...");
for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- System.out.println(i);
+ String keyC = "c" + i;
+ String valueC = "c" + i;
- String key = "a" + i;
- String value = "a" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iValueC = new IoTString(valueC);
- t1.startTransaction();
- t1.addKV(iKey, iValue);
- t1.commitTransaction();
+ t2.startTransaction();
+ t2.addKV(iKeyC, iValueC);
+ t2.commitTransaction();
}
-
- t2.update();
- System.out.println("Writing Keys b...");
for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- System.out.println(i);
+ String keyA = "a" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueD = "d" + i;
- String key = "b" + i;
- String value = "b" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueD = new IoTString(valueD);
+ t1.startTransaction();
+ t1.addKV(iKeyA, iValueA);
+ t1.commitTransaction();
t2.startTransaction();
- t2.addKV(iKey, iValue);
+ t2.addKV(iKeyD, iValueD);
t2.commitTransaction();
}
- // Do Updates for the keys
- System.out.println("Writing Keys a...");
- for (int i = 0; i < NUMBER_OF_TESTS; i += 2) {
- System.out.println(i);
- String key = "a" + i;
- String value = "a" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
- t1.startTransaction();
- t1.addKV(iKey, iValue);
- t1.commitTransaction();
- }
+
+ endTime = System.currentTimeMillis();
+
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Update: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 4)) );
+ System.out.println();
+ System.out.println("Updating Clients...");
+ t1.update();
+ t2.update();
t1.update();
t2.update();
- System.out.println("Checking a keys...");
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
-
- String key = "a" + i;
- String value = "a" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ boolean foundError = false;
- IoTString testVal = t1.getCommitted(iKey);
+ System.out.println("Checking Key-Values...");
+ for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- if ((testVal == null) || (testVal.equals(iValue) == false)) {
- System.out.println("Key val incorrect: " + key);
+ String keyA = "a" + i;
+ String keyB = "b" + i;
+ String keyC = "c" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueB = "b" + i;
+ String valueC = "c" + i;
+ String valueD = "d" + i;
+
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueB = new IoTString(valueB);
+ IoTString iValueC = new IoTString(valueC);
+ IoTString iValueD = new IoTString(valueD);
+
+
+ IoTString testValA1 = t1.getCommitted(iKeyA);
+ IoTString testValB1 = t1.getCommitted(iKeyB);
+ IoTString testValC1 = t1.getCommitted(iKeyC);
+ IoTString testValD1 = t1.getCommitted(iKeyD);
+
+ IoTString testValA2 = t2.getCommitted(iKeyA);
+ IoTString testValB2 = t2.getCommitted(iKeyB);
+ IoTString testValC2 = t2.getCommitted(iKeyC);
+ IoTString testValD2 = t2.getCommitted(iKeyD);
+
+ if ((testValA1 == null) || (testValA1.equals(iValueA) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyA);
+ foundError = true;
}
- key = "b" + i;
- value = "b" + (i + 10000);
- iKey = new IoTString(key);
- iValue = new IoTString(value);
-
- testVal = t1.getCommitted(iKey);
-
- if ((testVal == null) || (testVal.equals(iValue) == false)) {
- System.out.println("Key val incorrect: " + key);
+ if ((testValB1 == null) || (testValB1.equals(iValueB) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyB);
+ foundError = true;
}
- }
- System.out.println("Checking b keys...");
- for (int i = 0; i < NUMBER_OF_TESTS; i++) {
+ if ((testValC1 == null) || (testValC1.equals(iValueC) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyC);
+ foundError = true;
+ }
- String key = "a" + i;
- String value = "a" + (i + 10000);
- IoTString iKey = new IoTString(key);
- IoTString iValue = new IoTString(value);
+ if ((testValD1 == null) || (testValD1.equals(iValueD) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyD);
+ foundError = true;
+ }
- IoTString testVal = t2.getCommitted(iKey);
- if ((testVal == null) || (testVal.equals(iValue) == false)) {
- System.out.println("Key val incorrect: " + key);
+ if ((testValA2 == null) || (testValA2.equals(iValueA) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyA + " " + testValA2);
+ foundError = true;
}
- key = "b" + i;
- value = "b" + (i + 10000);
- iKey = new IoTString(key);
- iValue = new IoTString(value);
+ if ((testValB2 == null) || (testValB2.equals(iValueB) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyB + " " + testValB2);
+ foundError = true;
+ }
- testVal = t2.getCommitted(iKey);
+ if ((testValC2 == null) || (testValC2.equals(iValueC) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyC + " " + testValC2);
+ foundError = true;
+ }
- if ((testVal == null) || (testVal.equals(iValue) == false)) {
- System.out.println("Key val incorrect: " + key);
+ if ((testValD2 == null) || (testValD2.equals(iValueD) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyD + " " + testValD2);
+ foundError = true;
}
}
+ if (foundError) {
+ System.out.println("Found Errors...");
+ } else {
+ System.out.println("No Errors Found...");
+ }
-
-
- System.out.println();
System.out.println();
- System.out.println("Update");
- // Make sure t1 sees the new updates from t2
- t1.update();
- t2.update();
- t1.update();
System.out.println();
System.out.println();
System.out.println();
+ t1.printSlots();
System.out.println();
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
+ t2.printSlots();
+ }
+
+ static void test2() {
+
+ long startTime = 0;
+ long endTime = 0;
+
+ // Setup the 2 clients
+ Table t1 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
+ t1.initTable();
+ Table t2 = new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 351);
t2.update();
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
- System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
+ // t1.rebuild();
+ // t2.rebuild();
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold + " commits: " + t1.commitedTable.size() + " uncommits: " + t1.uncommittedTransactionsList.size());
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold + " commits: " + t2.commitedTable.size() + " uncommits: " + t2.uncommittedTransactionsList.size() );
- System.out.println();
- t1.printSlots();
- System.out.println();
- System.out.println();
- System.out.println();
- System.out.println();
- t2.printSlots();
+
+ // Make the Keys
+ System.out.println("Setting up keys");
+ startTime = System.currentTimeMillis();
+ for (int i = 0; i < NUMBER_OF_TESTS; i++) {
+ String a = "a" + i;
+ String b = "b" + i;
+ String c = "c" + i;
+ String d = "d" + i;
+ IoTString ia = new IoTString(a);
+ IoTString ib = new IoTString(b);
+ IoTString ic = new IoTString(c);
+ IoTString id = new IoTString(d);
+ t1.createNewKey(ia, 321);
+ t1.createNewKey(ib, 351);
+ t2.createNewKey(ic, 321);
+ t2.createNewKey(id, 351);
+ }
+ endTime = System.currentTimeMillis();
+
+
+
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Key: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 4)) );
System.out.println();
+ // Do Updates for the keys
+ System.out.println("Setting Key-Values...");
+ startTime = System.currentTimeMillis();
+ for (int i = 0; i < NUMBER_OF_TESTS; i++) {
+ String keyA = "a" + i;
+ String keyB = "b" + i;
+ String keyC = "c" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueB = "b" + i;
+ String valueC = "c" + i;
+ String valueD = "d" + i;
+
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueB = new IoTString(valueB);
+ IoTString iValueC = new IoTString(valueC);
+ IoTString iValueD = new IoTString(valueD);
+
+ t1.startTransaction();
+ t1.addKV(iKeyA, iValueA);
+ t1.commitTransaction();
- // // Do Updates for the keys
- // System.out.println("Writing Keys a (actual)");
- // for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- // String key = "a" + i;
- // String value = "a" + i;
- // IoTString iKey = new IoTString(key);
- // IoTString iValue = new IoTString(value);
-
- // t1.startTransaction();
- // t1.addKV(iKey, iValue);
- // t1.commitTransaction();
- // }
+ t1.startTransaction();
+ t1.addKV(iKeyB, iValueB);
+ t1.commitTransaction();
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold + " commits: " + t1.commitedTable.size() + " uncommits: " + t1.uncommittedTransactionsList.size());
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold + " commits: " + t2.commitedTable.size() + " uncommits: " + t2.uncommittedTransactionsList.size());
- // System.out.println();
+ t2.startTransaction();
+ t2.addKV(iKeyC, iValueC);
+ t2.commitTransaction();
+ t2.startTransaction();
+ t2.addKV(iKeyD, iValueD);
+ t2.commitTransaction();
+ }
+ endTime = System.currentTimeMillis();
+ System.out.println("Time Taken: " + (double) ((endTime - startTime) / 1000.0) );
+ System.out.println("Time Taken Per Update: " + (double) (((endTime - startTime) / 1000.0) / (NUMBER_OF_TESTS * 4)) );
+ System.out.println();
- // System.out.println("Writing Keys b (actual)");
- // for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- // String key = "b" + i;
- // String value = "b" + i;
- // IoTString iKey = new IoTString(key);
- // IoTString iValue = new IoTString(value);
-
- // t2.startTransaction();
- // t2.addKV(iKey, iValue);
- // t2.commitTransaction();
- // }
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold + " commits: " + t1.commitedTable.size() + " uncommits: " + t1.uncommittedTransactionsList.size() );
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold + " commits: " + t2.commitedTable.size() + " uncommits: " + t2.uncommittedTransactionsList.size() );
- // System.out.println();
+ System.out.println("Updating Clients...");
+ t1.update();
+ t2.update();
+ t1.update();
+ t2.update();
+ boolean foundError = false;
- // // Do Updates for the keys
- // System.out.println("Writing Keys a (actual)");
- // for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- // String key = "a" + i;
- // String value = "a" + i;
- // IoTString iKey = new IoTString(key);
- // IoTString iValue = new IoTString(value);
-
- // t1.startTransaction();
- // t1.addKV(iKey, iValue);
- // t1.commitTransaction();
- // }
+ System.out.println("Checking Key-Values...");
+ for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold + " commits: " + t1.commitedTable.size() + " uncommits: " + t1.uncommittedTransactionsList.size());
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold + " commits: " + t2.commitedTable.size() + " uncommits: " + t2.uncommittedTransactionsList.size());
- // System.out.println();
+ String keyA = "a" + i;
+ String keyB = "b" + i;
+ String keyC = "c" + i;
+ String keyD = "d" + i;
+ String valueA = "a" + i;
+ String valueB = "b" + i;
+ String valueC = "c" + i;
+ String valueD = "d" + i;
+
+ IoTString iKeyA = new IoTString(keyA);
+ IoTString iKeyB = new IoTString(keyB);
+ IoTString iKeyC = new IoTString(keyC);
+ IoTString iKeyD = new IoTString(keyD);
+ IoTString iValueA = new IoTString(valueA);
+ IoTString iValueB = new IoTString(valueB);
+ IoTString iValueC = new IoTString(valueC);
+ IoTString iValueD = new IoTString(valueD);
+
+
+ IoTString testValA1 = t1.getCommitted(iKeyA);
+ IoTString testValB1 = t1.getCommitted(iKeyB);
+ IoTString testValC1 = t1.getCommitted(iKeyC);
+ IoTString testValD1 = t1.getCommitted(iKeyD);
+
+ IoTString testValA2 = t2.getCommitted(iKeyA);
+ IoTString testValB2 = t2.getCommitted(iKeyB);
+ IoTString testValC2 = t2.getCommitted(iKeyC);
+ IoTString testValD2 = t2.getCommitted(iKeyD);
+
+ if ((testValA1 == null) || (testValA1.equals(iValueA) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyA);
+ foundError = true;
+ }
+ if ((testValB1 == null) || (testValB1.equals(iValueB) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyB);
+ foundError = true;
+ }
+ if ((testValC1 == null) || (testValC1.equals(iValueC) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyC);
+ foundError = true;
+ }
- // System.out.println("Writing Keys b (actual)");
- // for (int i = 0; i < NUMBER_OF_TESTS; i++) {
- // String key = "b" + i;
- // String value = "b" + i;
- // IoTString iKey = new IoTString(key);
- // IoTString iValue = new IoTString(value);
-
- // t2.startTransaction();
- // t2.addKV(iKey, iValue);
- // t2.commitTransaction();
- // }
+ if ((testValD1 == null) || (testValD1.equals(iValueD) == false)) {
+ System.out.println("Key-Value t1 incorrect: " + keyD);
+ foundError = true;
+ }
- // System.out.println("=========t1 live" + t1.liveslotcount + " thresh: " + t1.resizethreshold + " commits: " + t1.commitedTable.size() + " uncommits: " + t1.uncommittedTransactionsList.size() );
- // System.out.println("=========t2 live" + t2.liveslotcount + " thresh: " + t2.resizethreshold + " commits: " + t2.commitedTable.size() + " uncommits: " + t2.uncommittedTransactionsList.size() );
- // System.out.println();
- // t1.printSlots();
- // System.out.println();
- // t2.printSlots();
+ if ((testValA2 == null) || (testValA2.equals(iValueA) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyA + " " + testValA2);
+ foundError = true;
+ }
+ if ((testValB2 == null) || (testValB2.equals(iValueB) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyB + " " + testValB2);
+ foundError = true;
+ }
+ if ((testValC2 == null) || (testValC2.equals(iValueC) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyC + " " + testValC2);
+ foundError = true;
+ }
- // Make sure t1 sees the new updates from t2
- // t1.update();
+ if ((testValD2 == null) || (testValD2.equals(iValueD) == false)) {
+ System.out.println("Key-Value t2 incorrect: " + keyD + " " + testValD2);
+ foundError = true;
+ }
+ }
- // // Print the results
- // for (int i = NUMBER_OF_TESTS - 10; i < NUMBER_OF_TESTS; i++) {
- // String a = "a" + i;
- // String b = "b" + i;
- // IoTString ia = new IoTString(a);
- // IoTString ib = new IoTString(b);
+ if (foundError) {
+ System.out.println("Found Errors...");
+ } else {
+ System.out.println("No Errors Found...");
+ }
- // System.out.println(ib + " -> " + t1.getCommitted(ib));
- // System.out.println(ia + " -> " + t2.getCommitted(ia));
- // System.out.println();
- // }
+ System.out.println();
+ System.out.println();
+ System.out.println();
+ System.out.println();
+ t1.printSlots();
+ System.out.println();
+ t2.printSlots();
}
}
projects / iotcloud.git / blobdiff