fix some issue.

apache · Mar 5, 2025 · 8bb48d8 · 8bb48d8
1 parent 1f7db8a
commit 8bb48d8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/unit-test-python.yml b/.github/workflows/unit-test-python.yml
@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - develop
+      - iotdb
       - rc/*
     paths-ignore:
       - 'docs/**'

diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,9 @@ python/data
 python/venv/*
 python/tests/__pycache__/*
 python/tests/*.tsfile
+
 cpp/cmake-build-debug-mingw/
+cpp/third_party/googletest-release-1.12.1.zip
 
 .vscode/
 

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -68,7 +68,7 @@ elseif (CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
 endif ()
 message("CMAKE DEBUG: CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
 
-# enable asan by default.
+# disable asan by default.
 option(ENABLE_ASAN "Enable Address Sanitizer" OFF)
 
 if (NOT WIN32)

diff --git a/cpp/src/common/global.cc b/cpp/src/common/global.cc
@@ -24,7 +24,6 @@
 #endif
 #include <stdlib.h>
 
-#include "mutex/mutex.h"
 #include "utils/injection.h"
 
 namespace common {

diff --git a/cpp/src/utils/storage_utils.h b/cpp/src/utils/storage_utils.h
@@ -70,14 +70,10 @@ struct InsertResult {
 
 FORCE_INLINE std::string get_file_path_from_file_id(
     const common::FileID &file_id) {
-    // TODO prefix len + number len
-    const int len = 256;
-    char path_buf[len];
-    memset(path_buf, 0, len);
-    // TODO config
-    // snprintf(path_buf, len, "./%" PRId64 "-%d-%d.tsfile", file_id.seq_,
-    //          file_id.version_, file_id.merge_);
-    return std::string(path_buf);
+    std::ostringstream oss;
+    oss << "./" << file_id.seq_ << "-" << file_id.version_ << "-"
+        << file_id.merge_ << ".tsfile";
+    return oss.str();
 }
 
 }  // end namespace storage
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
       push:
         branches:
           - develop
+          - iotdb
           - rc/*
         paths-ignore:
           - 'docs/**'
@@ Expand Down @@