Fixing initialization to just create a table on the cloud side.

diff --git a/version2/src/C/Init.C b/version2/src/C/Init.C
index 55cd2c627afe29755085a604354503951666e8a1..7a8649ceed3ef6f2e8b4d4eac8e5af801e3d4403 100644 (file)
--- a/version2/src/C/Init.C
+++ b/version2/src/C/Init.C
@@ -9,9 +9,6 @@
 int main(int numargs, char ** args) {
        TimingSingleton * timer = TimingSingleton_getInstance();
 
-       bool foundError = false;
-       Vector<TransactionStatus *> * transStatusList = new Vector<TransactionStatus *>();
-
        // Setup the 2 clients
        IoTString *baseurl = new IoTString("http://dc-6.calit2.uci.edu/test.iotcloud/");
        IoTString * password = new IoTString("reallysecret");
@@ -23,36 +20,6 @@ int main(int numargs, char ** args) {
        baseurl->releaseRef();
        password->releaseRef();
 
-       // Make the Keys
-       printf("Setting up keys\n");
-       for (int i = 0; i < NUMBER_OF_SENSORS; i++) {
-               printf("%d\n",i);
-               char buffer[80];
-               sprintf(buffer, "sensor%d", i);
-               IoTString *ia = new IoTString(buffer);
-               t1->createNewKey(ia, MACHINE_ID);
-               ia->releaseRef();
-       }
-
-       t1->update();
-       printf("Updating table\n");
-
-       for (uint i = 0; i < transStatusList->size(); i++) {
-               TransactionStatus * status = transStatusList->get(i);
-               if (status->getStatus() != TransactionStatus_StatusCommitted) {
-                       foundError = true;
-                       printf("Status error\n");
-               }
-               delete status;
-       }
-       
-       if (foundError) {
-               printf("Found Errors...\n");
-       } else {
-               printf("No Errors Found...\n");
-       }
-
-       delete transStatusList;
        delete t1;
 }
 

diff --git a/version2/src/C/Read.C b/version2/src/C/Read.C
index eff53aaac5d1a0cfdd219ab1717cacacb5d401a1..c0071ca5c0b82d9d708290d3f74f5827826934ad 100644 (file)
--- a/version2/src/C/Read.C
+++ b/version2/src/C/Read.C
@@ -25,7 +25,7 @@ int main(int numargs, char ** args) {
 
        printf("Checking Key-Values...\n");
        char buffer[80];
-       sprintf(buffer, "sensor0");
+       sprintf(buffer, "humid0");
        IoTString * iKeyA = new IoTString(buffer);
        IoTString *testValA1 = t1->getCommitted(iKeyA);
        
@@ -37,9 +37,23 @@ int main(int numargs, char ** args) {
                testValA1->print();
                printf("\n\n");
        }
+       sprintf(buffer, "tempF0");
+       IoTString * iKeyB = new IoTString(buffer);
+       IoTString * testValB1 = t1->getCommitted(iKeyB);
+       
+       if (testValA1 == NULL) {
+               printf("\n\nKEY-VALUE B is NULL!\n\n");
+               foundError = true;
+       } else {
+               printf("Printing value... ");
+               testValB1->print();
+               printf("\n\n");
+       }
 
        iKeyA->releaseRef();
        testValA1->releaseRef();
+       iKeyB->releaseRef();
+       testValB1->releaseRef();
 
        for (uint i = 0; i < transStatusList->size(); i++) {
                TransactionStatus * status = transStatusList->get(i);

diff --git a/version2/src/C/Update.C b/version2/src/C/Update.C
index 805cc8b104d0cbc907cfc75bdac5bb14f68a706d..a3613e2b499a7027fd1ecbfaaa36a1b44b14f095 100644 (file)
--- a/version2/src/C/Update.C
+++ b/version2/src/C/Update.C
@@ -4,7 +4,7 @@
 #include "TransactionStatus.h"
 
 #define NUMBER_OF_SENSORS 1
-#define MACHINE_ID 260
+#define MACHINE_ID 15512
 
 int main(int numargs, char ** args) {
        TimingSingleton * timer = TimingSingleton_getInstance();
@@ -22,20 +22,32 @@ int main(int numargs, char ** args) {
        baseurl->releaseRef();
        password->releaseRef();
 
-       /*char keyBuffer[80];
+       char keyBuffer[80];
        char dataBuffer[80];
 
-       sprintf(keyBuffer, "sensor0");
+       sprintf(keyBuffer, "tempF0");
        IoTString * iKeyA = new IoTString(keyBuffer);
-       sprintf(dataBuffer, "data1");
+       sprintf(dataBuffer, "data4");
        IoTString * iValueA = new IoTString(dataBuffer);
+       t1->createNewKey(iKeyA, MACHINE_ID);
        t1->startTransaction();
        t1->put(iKeyA, iValueA);
-       transStatusList->add(t1->commitTransaction());*/
+       transStatusList->add(t1->commitTransaction());
+       
+       sprintf(keyBuffer, "humid0");
+       IoTString * iKeyB = new IoTString(keyBuffer);
+       sprintf(dataBuffer, "data6");
+       IoTString * iValueB = new IoTString(dataBuffer);
+       t1->createNewKey(iKeyB, MACHINE_ID);
+       t1->startTransaction();
+       t1->put(iKeyB, iValueB);
+       transStatusList->add(t1->commitTransaction());
        t1->update();
        
-       //iKeyA->releaseRef();
-       //iValueA->releaseRef();
+       iKeyB->releaseRef();
+       iValueB->releaseRef();
+       iKeyA->releaseRef();
+       iValueA->releaseRef();
 
        for (uint i = 0; i < transStatusList->size(); i++) {
                TransactionStatus * status = transStatusList->get(i);

diff --git a/version2/src/java/simple_test/Read.java b/version2/src/java/simple_test/Read.java
index 71140b837bdfa049f1e42f1376912e3190959936..295fa6bd7b0a7f41fe68c5d1c495d73c98dbed00 100644 (file)
--- a/version2/src/java/simple_test/Read.java
+++ b/version2/src/java/simple_test/Read.java
@@ -14,7 +14,7 @@ class Read {
                for(IoTString key : keySet) {
                        System.out.print("Key: " + key.toString() + " -> ");
                IoTString val = t1.getCommitted(key);
-                       System.out.println("Value: " + val.toString());         
+                       System.out.println("Value: " + val.toString());
                }
     }
 }