milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix macos code checker (#36817) 

https://github.com/milvus-io/milvus/issues/36829

---------

Signed-off-by: sunby <sunbingyi1992@gmail.com>
pull/36790/head
Bingyi Sun 2024-10-14 11:11:51 +08:00 committed by GitHub
parent d230b91bd1
commit 3a09b438c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/core/src/common/ChunkTarget.cpp
View File

@ -11,12 +11,13 @@
#include <common/ChunkTarget.h>
#include <algorithm>
#include <cstdint>
#include <cstring>
#include "common/EasyAssert.h"
#include <sys/mman.h>
#include <unistd.h>
const auto PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
const uint32_t SYS_PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
namespace milvus {
void
MemChunkTarget::write(const void* data, size_t size, bool append) {
@ -94,7 +95,8 @@ std::pair<char*, size_t>
MmapChunkTarget::get() {
// Write padding to align with the page size, ensuring the offset_ aligns with the page size.
auto padding_size =
(size_ / PAGE_SIZE + (size_ % PAGE_SIZE != 0)) * PAGE_SIZE - size_;
(size_ / SYS_PAGE_SIZE + (size_ % SYS_PAGE_SIZE != 0)) * SYS_PAGE_SIZE -
size_;
char padding[padding_size];
memset(padding, 0, sizeof(padding));
write(padding, padding_size);

6
internal/core/src/mmap/ChunkedColumn.h
View File

@ -123,7 +123,7 @@ class ChunkedColumnBase : public ColumnBase {
chunks_.push_back(chunk);
}
virtual uint64_t
virtual size_t
DataByteSize() const override {
auto size = 0;
for (auto& chunk : chunks_) {
@ -353,8 +353,8 @@ class ChunkedVariableColumn : public ChunkedColumnBase {
{chunks_[start_chunk_id]->Data(),
std::dynamic_pointer_cast<StringChunk>(chunks_[start_chunk_id])
->Offsets(),
start_offset_in_chunk,
start_offset_in_chunk + len});
static_cast<int>(start_offset_in_chunk),
static_cast<int>(start_offset_in_chunk + len)});
start_offset_in_chunk = 0;
length -= len;