feat(shannon):rpd status added

Shannon-Data · Jan 10, 2025 · eb50b04 · eb50b04
1 parent b81d79d
commit eb50b04
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/storage/rapid_engine/handler/ha_shannon_rapid.cc b/storage/rapid_engine/handler/ha_shannon_rapid.cc
@@ -149,7 +149,7 @@ int ha_rapid::open(const char *name, int, uint open_flags, const dd::Table *tabl
   }
   thr_lock_data_init(&share->lock, &m_lock, nullptr);
 
-  assert(!m_data_table);
+  assert(!m_data_table.get());
   m_data_table.reset(new ShannonBase::Imcs::DataTable(table));
   m_data_table->open();
   return 0;

diff --git a/storage/rapid_engine/imcs/chunk.cpp b/storage/rapid_engine/imcs/chunk.cpp
@@ -384,7 +384,6 @@ row_id_t Chunk::prows() { return m_header->m_prows; }
 row_id_t Chunk::rows(Rapid_load_context *context) {
   // in furture, we get the rows with visibility check. Now, just return the prows.
   return m_header->m_prows;
-  ;
 }
 
 }  // namespace Imcs

diff --git a/storage/rapid_engine/imcs/data_table.cpp b/storage/rapid_engine/imcs/data_table.cpp
@@ -53,16 +53,20 @@ DataTable::DataTable(TABLE *source_table) : m_data_source(source_table) { ut_a(m
 
 DataTable::~DataTable() {}
 
-int DataTable::open() { return 0; }
+int DataTable::open() {
+  m_rowid.store(0);
+  return 0;
+}
 
-int DataTable::close() { return 0; }
+int DataTable::close() {
+  m_rowid.store(0);
+  return 0;
+}
 
 int DataTable::init() {
-  if (!m_initialized.load()) {
-    m_initialized.store(true);
-    scan_init();
-  }
-
+  assert(!m_initialized.load());
+  m_initialized.store(true);
+  scan_init();
   return 0;
 }
 

diff --git a/storage/rapid_engine/populate/populate.cpp b/storage/rapid_engine/populate/populate.cpp
@@ -197,8 +197,13 @@ void Populator::end_change_populate_threads() {
 void Populator::rapid_print_thread_info(FILE *file) { /* in: output stream */
   fprintf(file,
           "rapid log pop thread : %s \n"
-          "rapid log pop thread loops: " ULINTPF "\n",
-          ShannonBase::Populate::sys_pop_started ? "running" : "stopped", ShannonBase::Populate::sys_rapid_loop_count);
+          "rapid log pop thread loops: " ULINTPF
+          "\n"
+          "rapid log data remaining size: " ULINTPF
+          " KB\n"
+          "rapid log data remaining line: " ULINTPF "\n",
+          ShannonBase::Populate::sys_pop_started ? "running" : "stopped", ShannonBase::Populate::sys_rapid_loop_count,
+          ShannonBase::Populate::sys_pop_data_sz / 1024, ShannonBase::Populate::sys_pop_buff.size());
 }
 
 bool Populator::check_population_status(std::string &table_name) { return false; }