Merge branch 'develop' into fix_large_page_read_and_bitmap_index

.github/workflows/unit-test-cpp-py.yml

@@ -78,7 +78,7 @@ jobs:
       - name: Build and test with Maven
         shell: bash
         run: |
-          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} -P with-cpp clean verify
+          ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} -P with-cpp,with-python clean verify
 
       - name: Upload whl Artifact
         uses: actions/upload-artifact@v4

.gitignore

@@ -33,6 +33,8 @@ python/tsfile/*.h
 python/tsfile/*.cpp
 python/data
 python/venv/*
+python/tests/__pycache__/*
+python/tests/*.tsfile
 cpp/cmake-build-debug-mingw/
 
 .vscode/

cpp/src/common/schema.h

@@ -169,7 +169,6 @@ struct MeasurementSchemaGroup {
  */
 class TableSchema {
    public:
-
     TableSchema() = default;
 
     /**
@@ -184,7 +183,8 @@ class TableSchema {
      * in the table.
      */
     TableSchema(const std::string &table_name,
-                const std::vector<common::ColumnSchema> &column_schemas):table_name_(table_name) {
+                const std::vector<common::ColumnSchema> &column_schemas)
+        : table_name_(table_name) {
         to_lowercase_inplace(table_name_);
         for (const common::ColumnSchema &column_schema : column_schemas) {
             column_schemas_.emplace_back(std::make_shared<MeasurementSchema>(
@@ -225,6 +225,22 @@ class TableSchema {
           column_schemas_(std::move(other.column_schemas_)),
           column_categories_(std::move(other.column_categories_)) {}
 
+
+    TableSchema(const TableSchema &other) noexcept
+        : table_name_(other.table_name_),
+          column_categories_(other.column_categories_) {
+        for (const auto &column_schema : other.column_schemas_) {
+            // Just call default construction
+            column_schemas_.emplace_back(
+                std::make_shared<MeasurementSchema>(*column_schema));
+        }
+        int idx = 0;
+        for (const auto &measurement_schema : column_schemas_) {
+            column_pos_index_.insert(
+                std::make_pair(measurement_schema->measurement_name_, idx++));
+        }
+    }
+
     int serialize_to(common::ByteStream &out) {
         int ret = common::E_OK;
         if (RET_FAIL(common::SerializationUtil::write_var_uint(
@@ -280,9 +296,7 @@ class TableSchema {
         return ret;
     }
 
-    int32_t get_columns_num() const {
-        return column_schemas_.size();
-    }
+    int32_t get_columns_num() const { return column_schemas_.size(); }
 
     int find_column_index(const std::string &column_name) {
         std::string lower_case_column_name = to_lower(column_name);

cpp/src/common/tablet.cc

@@ -30,6 +30,7 @@ namespace storage {
 int Tablet::init() {
     ASSERT(timestamps_ == nullptr);
     timestamps_ = (int64_t *)malloc(sizeof(int64_t) * max_row_num_);
+    cur_row_size_ = 0;
 
     size_t schema_count = schema_vec_->size();
     std::pair<std::map<std::string, int>::iterator, bool> ins_res;
@@ -137,6 +138,7 @@ int Tablet::add_timestamp(uint32_t row_index, int64_t timestamp) {
     }
     timestamps_[row_index] = timestamp;
     cur_row_size_ = std::max(row_index + 1, cur_row_size_);
+
     return E_OK;
 }
 
@@ -257,6 +259,12 @@ int Tablet::add_value(uint32_t row_index, uint32_t schema_index,
     return ret;
 }
 
+template <>
+int Tablet::add_value(uint32_t row_index, uint32_t schema_index,
+                      const char *val) {
+    return add_value(row_index, schema_index, String(val));
+}
+
 template <typename T>
 int Tablet::add_value(uint32_t row_index, const std::string &measurement_name,
                       T val) {
@@ -271,10 +279,9 @@ int Tablet::add_value(uint32_t row_index, const std::string &measurement_name,
     return ret;
 }
 
-template<>
-int Tablet::add_value(uint32_t row_index,
-                               const std::string &measurement_name,
-                               const char *val) {
+template <>
+int Tablet::add_value(uint32_t row_index, const std::string &measurement_name,
+                      const char *val) {
     return add_value(row_index, measurement_name, String(val));
 }
 
@@ -304,7 +311,6 @@ template int Tablet::add_value(uint32_t row_index,
 template int Tablet::add_value(uint32_t row_index,
                                const std::string &measurement_name, String val);
 
-
 void Tablet::set_column_categories(
     const std::vector<ColumnCategory> &column_categories) {
     column_categories_ = column_categories;