Fix the issue when changing the meta DB

miyurud · Feb 24, 2025 · da04cef · da04cef
1 parent 7f9f119
commit da04cef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/ddl/metadb.sql b/ddl/metadb.sql
@@ -93,7 +93,7 @@ INSERT INTO graph_status (idgraph_status, description) VALUES (2, 'OPERATIONAL')
 INSERT INTO graph_status (idgraph_status, description) VALUES (3, 'DELETED');
 INSERT INTO graph_status (idgraph_status, description) VALUES (4, 'NONOPERATIONAL');
 
-INSERT INTO partitioning_algorithm (idalgorithm, algorithm_name) VALUES (1, 'HASH');
-INSERT INTO partitioning_algorithm (idalgorithm, algorithm_name) VALUES (2, 'FENNEL');
-INSERT INTO partitioning_algorithm (idalgorithm, algorithm_name) VALUES (3, 'LDG');
-INSERT INTO partitioning_algorithm (idalgorithm, algorithm_name) VALUES (4, 'METIS');
+INSERT INTO partitioning_algorithm (id_algorithm, algorithm_name) VALUES (1, 'HASH');
+INSERT INTO partitioning_algorithm (id_algorithm, algorithm_name) VALUES (2, 'FENNEL');
+INSERT INTO partitioning_algorithm (id_algorithm, algorithm_name) VALUES (3, 'LDG');
+INSERT INTO partitioning_algorithm (id_algorithm, algorithm_name) VALUES (4, 'METIS');
diff --git a/src/frontend/JasmineGraphFrontEnd.cpp b/src/frontend/JasmineGraphFrontEnd.cpp
@@ -1078,10 +1078,10 @@ static void add_stream_kafka_command(int connFd, std::string &kafka_server_IP, c
             return;
         }
         // Get user response.
-        string partitionAlgo = Utils::getFrontendInput(connFd);
+        string partitionAlgoInput = Utils::getFrontendInput(connFd);
 
-        if (partitionAlgo == "1" || partitionAlgo == "2" || partitionAlgo == "3") {
-            string partition_success_msg = "Set partition technique: " + partitionAlgo;
+        if (partitionAlgoInput == "1" || partitionAlgoInput == "2" || partitionAlgoInput == "3") {
+            string partition_success_msg = "Set partition technique: " + partitionAlgoInput;
             result_wr = write(connFd, partition_success_msg.c_str(), partition_success_msg.length());
             if (result_wr < 0) {
                 frontend_logger.error("Error writing to socket");
@@ -1094,9 +1094,9 @@ static void add_stream_kafka_command(int connFd, std::string &kafka_server_IP, c
                 *loop_exit_p = true;
                 return;
             }
-            partitionAlgo = partitionAlgo;
+            partitionAlgo = partitionAlgoInput;
         } else {
-            string errorMsg = "Error: invalid partition option: "+partitionAlgo;
+            string errorMsg = "Error: invalid partition option: "+partitionAlgoInput;
             result_wr = write(connFd, errorMsg.c_str(), errorMsg.length());
             if (result_wr < 0) {
                 frontend_logger.error("Error writing to socket");
@@ -1245,8 +1245,8 @@ static void add_stream_kafka_command(int connFd, std::string &kafka_server_IP, c
         std::time_t time = chrono::system_clock::to_time_t(chrono::system_clock::now());
         string uploadStartTime = ctime(&time);
         string sqlStatement =
-            "INSERT INTO graph (idgraph,idalgorithm,name,upload_path, upload_start_time, upload_end_time,"
-            "graph_status_idgraph_status, vertexcount, centralpartitioncount, edgecount, isDirected) VALUES("+
+            "INSERT INTO graph (idgraph,id_algorithm,name,upload_path, upload_start_time, upload_end_time,"
+            "graph_status_idgraph_status, vertexcount, centralpartitioncount, edgecount, is_directed) VALUES("+
             graphId+","+partitionAlgo+",\"" +topic_name_s + "\", \"" + path + "\", \"" +uploadStartTime+ "\", \"\",\"" +
             to_string(Conts::GRAPH_STATUS::STREAMING) + "\", \"\","+ to_string(numberOfPartitions)+
             ", \"\",\"" +direction+"\")";

diff --git a/src/util/dbinterface/DBInterface.cpp b/src/util/dbinterface/DBInterface.cpp
@@ -174,7 +174,7 @@ int DBInterface::getNextGraphId() {
 }
 
 std::string DBInterface::getPartitionAlgoByGraphID(std::string graphID) {
-    std::string query = "SELECT idalgorithm FROM graph WHERE idgraph = ?;";
+    std::string query = "SELECT id_algorithm FROM graph WHERE idgraph = ?;";
     sqlite3_stmt* stmt;
 
     if (sqlite3_prepare_v2(database, query.c_str(), -1, &stmt, NULL) != SQLITE_OK) {