Fix mac build

kuzudb · Oct 12, 2023 · 4d2a3a0 · 4d2a3a0
1 parent f72b71f
commit 4d2a3a0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 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)
+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")

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);
     }