Merge pull request Juniper#180 from Juniper/arvindv-development2

changing the replication factor to 2 for ContrailAnalytics keyspace.
caiorasec · Jan 16, 2014 · 0293e1b · 0293e1b
2 parents bc3f489 + c7e41de
commit 0293e1b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/src/analytics/db_handler.cc b/src/analytics/db_handler.cc
@@ -169,7 +169,7 @@ bool DbHandler::Initialize(int instance) {
         return false;
     }
 
-    if (!dbif_->Db_AddSetTablespace(g_viz_constants.COLLECTOR_KEYSPACE)) {
+    if (!dbif_->Db_AddSetTablespace(g_viz_constants.COLLECTOR_KEYSPACE,"2")) {
         LOG(ERROR, __func__ << ": Create/Set KEYSPACE: " <<
             g_viz_constants.COLLECTOR_KEYSPACE << " FAILED");
         return false;

diff --git a/src/analytics/test/cdb_if_mock.h b/src/analytics/test/cdb_if_mock.h
@@ -12,9 +12,9 @@ class CdbIfMock : public CdbIf {
 
     MOCK_METHOD0(Db_Init, bool());
     MOCK_METHOD0(Db_Uninit, void());
-    MOCK_METHOD1(Db_AddTablespace, bool(const std::string&));
+    MOCK_METHOD1(Db_AddTablespace, bool(const std::string&,const std::string&));
     MOCK_METHOD1(Db_SetTablespace, bool(const std::string&));
-    MOCK_METHOD1(Db_AddSetTablespace, bool(const std::string&));
+    MOCK_METHOD1(Db_AddSetTablespace, bool(const std::string&,const std::string& = "1"));
     MOCK_METHOD1(Db_FindTablespace, bool(const std::string&));
 
     MOCK_METHOD2(Db_GetColumnFamilies, void(const std::string, std::vector<std::string>&));

diff --git a/src/gendb/cdb_if.cc b/src/gendb/cdb_if.cc
@@ -171,13 +171,13 @@ void CdbIf::Db_Uninit(bool shutdown) {
     }
 }
 
-bool CdbIf::Db_AddTablespace(const std::string& tablespace) {
+bool CdbIf::Db_AddTablespace(const std::string& tablespace,const std::string& replication_factor) {
     if (!Db_FindTablespace(tablespace)) {
         KsDef ks_def;
         ks_def.__set_name(tablespace);
         ks_def.__set_strategy_class("SimpleStrategy");
         std::map<std::string, std::string> strat_options;
-        strat_options.insert(std::pair<std::string, std::string>("replication_factor", "1"));
+        strat_options.insert(std::pair<std::string, std::string>("replication_factor", replication_factor));
         ks_def.__set_strategy_options(strat_options);
 
         try {
@@ -235,8 +235,8 @@ bool CdbIf::Db_SetTablespace(const std::string& tablespace) {
     return true;
 }
 
-bool CdbIf::Db_AddSetTablespace(const std::string& tablespace) {
-    if (!Db_AddTablespace(tablespace)) {
+bool CdbIf::Db_AddSetTablespace(const std::string& tablespace,const std::string& replication_factor) {
+    if (!Db_AddTablespace(tablespace,replication_factor)) {
         return false;
     }
     if (!Db_SetTablespace(tablespace)) {

diff --git a/src/gendb/cdb_if.h b/src/gendb/cdb_if.h
@@ -69,9 +69,9 @@ class CdbIf : public GenDbIf {
         virtual bool Db_Init(std::string task_id, int task_instance);
         virtual void Db_Uninit(bool shutdown);
         virtual void Db_SetInitDone(bool);
-        virtual bool Db_AddTablespace(const std::string& tablespace);
+        virtual bool Db_AddTablespace(const std::string& tablespace,const std::string& replication_factor);
         virtual bool Db_SetTablespace(const std::string& tablespace);
-        virtual bool Db_AddSetTablespace(const std::string& tablespace);
+        virtual bool Db_AddSetTablespace(const std::string& tablespace,const std::string& replication_factor = "1");
         virtual bool Db_FindTablespace(const std::string& tablespace);
         /* api to add a column family in the current table space */
         virtual bool NewDb_AddColumnfamily(const GenDb::NewCf& cf);

diff --git a/src/gendb/gendb_if.h b/src/gendb/gendb_if.h
@@ -119,11 +119,11 @@ class GenDbIf {
         virtual void Db_Uninit(bool shutdown) = 0;
         virtual void Db_SetInitDone(bool init_done) = 0;
         /* api to create a table space */
-        virtual bool Db_AddTablespace(const std::string& tablespace) = 0;
+        virtual bool Db_AddTablespace(const std::string& tablespace,const std::string& replication_factor) = 0;
         /* api to set the current table space */
         virtual bool Db_SetTablespace(const std::string& tablespace) = 0;
         /* api to set the current table space */
-        virtual bool Db_AddSetTablespace(const std::string& tablespace) = 0;
+        virtual bool Db_AddSetTablespace(const std::string& tablespace,const std::string& replication_factor="1") = 0;
         /* api to add a column family in the current table space */
         virtual bool Db_FindTablespace(const std::string& tablespace) = 0;
 

diff --git a/src/query_engine/test/query_test.cc b/src/query_engine/test/query_test.cc
@@ -52,7 +52,7 @@ void CdbIfMock::initialize_tables()
 
 bool CdbIfMock::Db_Init() {return true;}
 
-bool CdbIfMock::Db_AddSetTablespace(const std::string& tablespace)
+bool CdbIfMock::Db_AddSetTablespace(const std::string& tablespace, const std::string& replication_factor)
 { 
     QE_ASSERT(tablespace == g_viz_constants.COLLECTOR_KEYSPACE);
     return true;

diff --git a/src/query_engine/test/query_test.h b/src/query_engine/test/query_test.h
@@ -28,7 +28,7 @@ class CdbIfMock : public CdbIf {
     ~CdbIfMock() { MessageTable.clear();}
 
     bool Db_Init();
-    bool Db_AddSetTablespace(const std::string& tablespace);
+    bool Db_AddSetTablespace(const std::string& tablespace,const std::string& replication_factor = "1");
     bool Db_GetRangeSlices(std::vector<GenDb::Column>&,const GenDb::Cf&, const GenDb::ColumnRange&, const GenDb::RowKeyRange&);
     bool Db_GetMultiRow(std::map<std::string, std::vector<GenDb::ColElement> >& ret,
                 const std::string& cfname, const std::vector<std::string>& key);