Merge branch 'master' of ssh://lxlogin1.lrz.de/home/hpc/pr28fa/lu32joj/dcdb

CollectAgent/collectagent.cpp

@@ -167,7 +167,7 @@ int main(void) {
 
       if (sensordataCf<0) {
           cout << "Creating sensordata column familiy...\n";
-          query = "CREATE TABLE sensordata ( sid int, ts bigint, value float, PRIMARY KEY (sid, ts)) WITH COMPACT STORAGE;";
+          query = "CREATE TABLE sensordata ( sid bigint, ts bigint, value bigint, PRIMARY KEY (sid, ts)) WITH COMPACT STORAGE;";
           cout << "Sending CQL statement: " << query;
           myClient->execute_cql3_query(res, query, Compression::NONE, ConsistencyLevel::ONE);
           cout << "  --> Success!\n";

CollectAgent/simplemqttserver.h

@@ -65,7 +65,7 @@
 /*
  * Enable verbose output of the MQTT server.
  */
-#define SimpleMQTTVerbose
+//#define SimpleMQTTVerbose
 
 #include "simplemqttservermessage.h"
 typedef void (*SimpleMQTTMessageCallback)(SimpleMQTTMessage*);

CollectAgent/simplemqttservermessage.h

@@ -64,6 +64,7 @@ public:
   ssize_t appendRawData(void* buf, size_t len);
   bool complete();
   bool isPublish();
+//  std::string getTopic();
 
   void dump();