Merge pull request #2204 from kuzudb/fix-mac-build

Fix mac build
kuzudb · Oct 13, 2023 · a755f57 · a755f57
2 parents f18499f + 34b6f5b
commit a755f57
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,8 +8,10 @@ set(CMAKE_FIND_PACKAGE_RESOLVE_SYMLINKS TRUE)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+if(NOT APPLE)
+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+    set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
+endif()
 
 # Detect OS and architecture, copied from DuckDB
 set(OS_NAME "unknown")
@@ -156,10 +158,18 @@ endfunction()
 function(add_kuzu_api_test TEST_NAME)
     set(SRCS ${ARGN})
     add_executable(${TEST_NAME} ${SRCS})
-    target_link_libraries(${TEST_NAME} PRIVATE api_graph_test api_test_helper)
+    if(APPLE)
+        target_link_libraries(${TEST_NAME} PRIVATE test_helper test_runner graph_test)
+    else()
+        target_link_libraries(${TEST_NAME} PRIVATE api_graph_test api_test_helper)
+    endif()
     target_include_directories(${TEST_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/test/include)
     include(GoogleTest)
-    gtest_discover_tests(${TEST_NAME})
+    if(APPLE)
+        gtest_discover_tests(${TEST_NAME} DISCOVERY_TIMEOUT 600 DISCOVERY_MODE PRE_TEST)
+    else()
+        gtest_discover_tests(${TEST_NAME})
+    endif()
 endfunction()
 
 add_definitions(-DKUZU_ROOT_DIRECTORY="${PROJECT_SOURCE_DIR}")

diff --git a/src/processor/operator/persistent/reader/csv/driver.cpp b/src/processor/operator/persistent/reader/csv/driver.cpp
@@ -251,7 +251,7 @@ static bool tryCastStringToStruct(const char* input, uint64_t len, ValueVector*
         skipWhitespace(++input, end);
 
         copyStringToVector(StructVector::getFieldVector(vector, fieldIdx).get(), rowToAdd,
-            std::string_view{valStart, valEnd}, csvReaderConfig);
+            std::string_view{valStart, (size_t)(valEnd - valStart)}, csvReaderConfig);
     }
     return true;
 }

diff --git a/src/storage/store/column_chunk.cpp b/src/storage/store/column_chunk.cpp
@@ -143,7 +143,7 @@ void ColumnChunk::initializeBuffer(offset_t capacity_) {
     bufferSize = getBufferSize();
     buffer = std::make_unique<uint8_t[]>(bufferSize);
     if (nullChunk) {
-        static_cast<ColumnChunk*>(nullChunk.get())->initializeBuffer(capacity);
+        nullChunk->initializeBuffer(capacity_);
     }
 }
 
@@ -250,16 +250,19 @@ void ColumnChunk::write(const Value& val, uint64_t posToWrite) {
 }
 
 void ColumnChunk::resize(uint64_t newCapacity) {
-    capacity = newCapacity;
-    auto numBytesAfterResize = getBufferSize();
-    assert(numBytesAfterResize > bufferSize);
-    auto resizedBuffer = std::make_unique<uint8_t[]>(numBytesAfterResize);
-    if (dataType.getPhysicalType() == common::PhysicalTypeID::BOOL) {
-        memset(resizedBuffer.get(), 0 /* non null */, numBytesAfterResize);
-    }
-    memcpy(resizedBuffer.get(), buffer.get(), bufferSize);
-    bufferSize = numBytesAfterResize;
-    buffer = std::move(resizedBuffer);
+    if (numBytesPerValue != 0) {
+        // Avoid resizing struct/serial columns.
+        capacity = newCapacity;
+        auto numBytesAfterResize = getBufferSize();
+        assert(numBytesAfterResize > bufferSize);
+        auto resizedBuffer = std::make_unique<uint8_t[]>(numBytesAfterResize);
+        if (dataType.getPhysicalType() == common::PhysicalTypeID::BOOL) {
+            memset(resizedBuffer.get(), 0 /* non null */, numBytesAfterResize);
+        }
+        memcpy(resizedBuffer.get(), buffer.get(), bufferSize);
+        bufferSize = numBytesAfterResize;
+        buffer = std::move(resizedBuffer);
+    }
     if (nullChunk) {
         nullChunk->resize(newCapacity);
     }