Fix build error with codespace

gpwill · gpwill · commit ed904847f436 · 2025-06-10T07:11:48.000Z
diff --git a/libspectrum/CMakeLists.txt b/libspectrum/CMakeLists.txt
@@ -27,10 +27,22 @@ SET(SPECTRUM_PB_GENERATE_DIR ${CMAKE_BINARY_DIR}/libspectrum/generated/protobuf)
 
 FILE(MAKE_DIRECTORY ${SPECTRUM_PB_GENERATE_DIR})
 
+FOREACH(warning
+    "unused-parameter"
+    "unused-result"
+    )
+  MY_CHECK_CXX_COMPILER_WARNING("${warning}" HAS_WARN_FLAG)
+  IF(HAS_WARN_FLAG)
+    STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+    STRING_APPEND(CMAKE_C_FLAGS " ${HAS_WARN_FLAG}")
+  ENDIF()
+ENDFOREACH()
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/libspectrum/include
   ${SPECTRUM_PB_GENERATE_DIR}
+  ${RAPIDJSON_INCLUDE_DIR}
 )
 
 MYSQL_PROTOBUF_GENERATE_CPP_LIBRARY(
diff --git a/libspectrum/README.txt b/libspectrum/README.txt
@@ -1,3 +1,8 @@
+# Build
+cmake .. -DCMAKE_INSTALL_PREFIX=/home/codespace/mysql-spectrum -DWITH_DEBUG=1 -DDOWNLOAD_BOOST=1 -DWITH_BOOST=/home/codespace/boost
+make
+make install
+
 # Initialize storage server
 ./spectrum-storage-init
 
diff --git a/libspectrum/include/spectrum.h b/libspectrum/include/spectrum.h
@@ -154,12 +154,12 @@ extern spectrum::StorageNode::Stub* get_storage_primary_client();
 
 extern my_xid next_xid();
 
-extern void spectrum_print_row(char* method, TABLE* table);
-extern void spectrum_print_row(char* method, TABLE* table, uchar* record);
+extern void spectrum_print_row(const char* method, TABLE* table);
+extern void spectrum_print_row(const char* method, TABLE* table, const uchar* record);
 extern void spectrum_row_fill_fields(TABLE* table, ::spectrum::Row *spectrum_row);
-extern void spectrum_row_fill_fields(TABLE* table, uchar* record, ::spectrum::Row *spectrum_row);
-extern void spectrum_row_extract_fields(TABLE *table, ::spectrum::Row *spectrum_row);
-extern void spectrum_row_extract_fields(TABLE *table, uchar* record, ::spectrum::Row *spectrum_row);
+extern void spectrum_row_fill_fields(TABLE* table, const uchar* record, ::spectrum::Row *spectrum_row);
+extern void spectrum_row_extract_fields(TABLE *table, const ::spectrum::Row *spectrum_row);
+extern void spectrum_row_extract_fields(TABLE *table, uchar* record, const ::spectrum::Row *spectrum_row);
 extern void spectrum_thread_fill(THD *thd, spectrum::Thread *spectrum_thread);
 
 extern TABLE *spectrum_open_table(THD *thd, const char *db_name, const char *table_name, thr_lock_type lock_type, thr_locked_row_action lock_action);
diff --git a/libspectrum/include/spectrum_config.h b/libspectrum/include/spectrum_config.h
@@ -23,6 +23,8 @@
 
 #define MAX_NODE_ID_LENGTH 256
 
+#include <string>
+
 enum node_role_enum {
    COMPUTE,
    STORAGE_PRIMARY,
diff --git a/libspectrum/src/spectrum_common.cc b/libspectrum/src/spectrum_common.cc
@@ -112,11 +112,18 @@ void spectrum_thread_fill(THD *thd, spectrum::Thread *spectrum_thread) {
   spectrum_thread_fill_system_variables(thd, spectrum_thread);
 }
 
-void spectrum_print_row(char* method, TABLE* table) {
+void spectrum_repoint_field_to_record(TABLE *table, const uchar *old_rec, const uchar *new_rec) {
+  Field **fields = table->field;
+  ptrdiff_t ptrdiff = new_rec - old_rec;
+  for (uint i = 0; i < table->s->fields; i++)
+    fields[i]->move_field_offset(ptrdiff);
+}
+
+void spectrum_print_row(const char* method, TABLE* table) {
   spectrum_print_row(method, table, table->record[0]);
 }
 
-void spectrum_print_row(char* method, TABLE* table, uchar* record) {
+void spectrum_print_row(const char* method, TABLE* table, const uchar* record) {
   std::string row;
   char value_buffer[1024];
   String value(value_buffer, sizeof(value_buffer), &my_charset_bin);
@@ -130,7 +137,7 @@ void spectrum_print_row(char* method, TABLE* table, uchar* record) {
 
   temp_read_set = table->read_set;
   table->read_set = nullptr;
-  repoint_field_to_record(table, table->record[0], record);
+  spectrum_repoint_field_to_record(table, table->record[0], record);
 
   for (Field **field = table->field; *field; field++) {
     row += (*field)->field_name;
@@ -148,19 +155,19 @@ void spectrum_print_row(char* method, TABLE* table, uchar* record) {
   }
   sql_print_information("%s[%s:%s:%d]: %s", method, table->s->db.str, table->s->table_name.str, hander_id, row.c_str());
 
-  repoint_field_to_record(table, record, table->record[0]);
+  spectrum_repoint_field_to_record(table, record, table->record[0]);
   table->read_set = temp_read_set;
 }
 
 void spectrum_row_fill_fields(TABLE* table, spectrum::Row *spectrum_row) {
   spectrum_row_fill_fields(table, table->record[0], spectrum_row);
 }
 
-void spectrum_row_fill_fields(TABLE* table, uchar* record, spectrum::Row *spectrum_row) {
+void spectrum_row_fill_fields(TABLE* table, const uchar* record, spectrum::Row *spectrum_row) {
   char value_buffer[1024];
   String value(value_buffer, sizeof(value_buffer), &my_charset_bin);
 
-  repoint_field_to_record(table, table->record[0], record);
+  spectrum_repoint_field_to_record(table, table->record[0], record);
 
   for (Field **field = table->field; *field; field++) {
     spectrum::Field *spectrum_field = spectrum_row->add_fields();
@@ -174,19 +181,19 @@ void spectrum_row_fill_fields(TABLE* table, uchar* record, spectrum::Row *spectr
     }
   }
 
-  repoint_field_to_record(table, record, table->record[0]);
+  spectrum_repoint_field_to_record(table, record, table->record[0]);
 }
 
-void spectrum_row_extract_fields(TABLE *table, spectrum::Row *spectrum_row) {
+void spectrum_row_extract_fields(TABLE *table, const spectrum::Row *spectrum_row) {
   spectrum_row_extract_fields(table, table->record[0], spectrum_row);
 }
 
-void spectrum_row_extract_fields(TABLE *table, uchar* record, spectrum::Row *spectrum_row) {
+void spectrum_row_extract_fields(TABLE *table, uchar* record, const spectrum::Row *spectrum_row) {
   MY_BITMAP *temp_write_set;
 
   temp_write_set = table->write_set;
   table->write_set = nullptr;
-  repoint_field_to_record(table, table->record[0], record);
+  spectrum_repoint_field_to_record(table, table->record[0], record);
 
   memset(record, 0, table->s->null_bytes);
   for (int i = 0; i < spectrum_row->fields().size(); i++) {
@@ -204,7 +211,7 @@ void spectrum_row_extract_fields(TABLE *table, uchar* record, spectrum::Row *spe
   }
 
   table->write_set = temp_write_set;
-  repoint_field_to_record(table, record, table->record[0]);
+  spectrum_repoint_field_to_record(table, record, table->record[0]);
 }
 
 TABLE *spectrum_open_table(
diff --git a/libspectrum/src/spectrum_compute.cc b/libspectrum/src/spectrum_compute.cc
@@ -159,7 +159,9 @@ int spectrum_compute_delete_table(THD *thd, const dd::Table *table_def, const ch
   }
 
   const dd::Schema *schema_def = nullptr;
-  thd->dd_client()->acquire(table_def->schema_id(), &schema_def);
+  if (thd->dd_client()->acquire(table_def->schema_id(), &schema_def)) {
+    assert(false);
+  }
   if (!schema_def) {
     assert(false);
   }
@@ -524,7 +526,7 @@ int spectrum_compute_write_row(THD *thd, TABLE *table, uchar *record) {
     sql_print_error("spectrum_write_row[%d:%s:%s:%d]: error=%s", thd->spectrum_thread_id, table->s->db.str, table->s->table_name.str, table->file, status.error_message().c_str());
     assert(false);
   }
-  spectrum_row_extract_fields(table, (spectrum::Row *)&response.row());
+  spectrum_row_extract_fields(table, &response.row());
   spectrum_print_row("spectrum_write_row_new", table);
 
   table->file->insert_id_for_cur_row = response.insert_id();
@@ -544,7 +546,7 @@ int spectrum_compute_update_row(THD *thd, TABLE *table, const uchar *old_record,
   assert(old_record == table->record[1]);
 
   spectrum_print_row("spectrum_update_row_new", table, new_record);
-  spectrum_print_row("spectrum_update_row_old", table, (uchar *)old_record);
+  spectrum_print_row("spectrum_update_row_old", table, old_record);
 
   spectrum::Thread *spectrum_thread = request.mutable_thread();
   spectrum_thread_fill(thd, spectrum_thread);
@@ -576,11 +578,11 @@ int spectrum_compute_delete_row(THD *thd, TABLE *table, const uchar *record) {
     return 0;
   }
 
-  spectrum_print_row("spectrum_delete_row", table, (uchar *)record);
+  spectrum_print_row("spectrum_delete_row", table, record);
 
   spectrum::Thread *spectrum_thread = request.mutable_thread();
   spectrum_thread_fill(thd, spectrum_thread);
-  spectrum_row_fill_fields(table, (uchar *)record, request.mutable_row());
+  spectrum_row_fill_fields(table, record, request.mutable_row());
   request.set_database(table->s->db.str);
   request.set_table(table->s->table_name.str);
   request.set_handler((uint64)table->file);
diff --git a/libspectrum/src/spectrum_config.cc b/libspectrum/src/spectrum_config.cc
@@ -42,6 +42,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 *****************************************************************************/
 
 #include <vector>
+#include <cstring>
+#include <cstdlib>
 
 #include "spectrum_config.h"
 
diff --git a/libspectrum/src/spectrum_log.cc b/libspectrum/src/spectrum_log.cc
@@ -109,7 +109,7 @@ commit_id_t next_commit_id() {
   return max_commit_id;
 }
 
-commit_id_t update_max_commit_id(commit_id_t commit_id) {
+void update_max_commit_id(commit_id_t commit_id) {
   mysql_mutex_lock(&max_commit_id_lock);
   if (commit_id > max_commit_id) {
     max_commit_id = commit_id;
@@ -127,7 +127,7 @@ my_xid next_xid() {
   return max_xid;
 }
 
-my_xid update_max_xid(my_xid xid) {
+void update_max_xid(my_xid xid) {
   mysql_mutex_lock(&max_xid_lock);
   if (xid > max_xid) {
     max_xid = xid;
@@ -287,7 +287,7 @@ int spectrum_log_read_events_by_xid(TABLE *event_table, my_xid xid, spectrum::Ev
   event_table->file->ha_index_init(0, true);
   error = event_table->file->ha_index_read_map(
         event_table->record[0], key, 1, HA_READ_KEY_EXACT);
-  while(!error && xid == event_table->field[0]->val_int()) {
+  while(!error && xid == (my_xid)event_table->field[0]->val_int()) {
     spectrum_print_row("spectrum_log_read_events_by_xid", event_table);
     spectrum_log_build_event(event_table, events->add_event());
     error = event_table->file->ha_index_next(event_table->record[0]);
@@ -791,7 +791,6 @@ int spectrum_log_commit(THD *thd, bool all, bool real_trans) {
   my_xid xid = storage_thd_context->xid();
   event_id_t event_id = storage_thd_context->next_event_id();
   commit_id_t commit_id = storage_thd_context->commit_id();
-  bool commit_locked = false;
 
   sql_print_information("spectrum_log_commit: all=%d, real_trans=%d, xid=%d, commit_id=%d", all, real_trans, xid, commit_id);
 
@@ -821,7 +820,6 @@ int spectrum_log_rollback(THD *thd, bool all, bool real_trans) {
   my_xid xid = storage_thd_context->xid();
   event_id_t event_id = storage_thd_context->next_event_id();
   commit_id_t commit_id = storage_thd_context->commit_id();
-  bool commit_locked = false;
 
   sql_print_information("spectrum_log_rollback: all=%d, real_trans=%d, xid=%d, commit_id=%d", all, real_trans, xid, commit_id);
 
diff --git a/libspectrum/src/spectrum_storage.cc b/libspectrum/src/spectrum_storage.cc
diff --git a/plugin/spectrum/CMakeLists.txt b/plugin/spectrum/CMakeLists.txt
