diff options
| author | Stefan Boberg <[email protected]> | 2021-05-13 12:01:18 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-05-13 12:01:18 +0200 |
| commit | 0b8280d4fcbf3a65997c3cc86cf14f5f7c44b7fe (patch) | |
| tree | 5ce29b79d0636e8e127c68c9fb9928b67759d1ac /zenserver | |
| parent | clang-format (diff) | |
| download | zen-0b8280d4fcbf3a65997c3cc86cf14f5f7c44b7fe.tar.xz zen-0b8280d4fcbf3a65997c3cc86cf14f5f7c44b7fe.zip | |
Made SharedBuffer/UniqueBuffer share guts with IoBuffer
This enables way more efficient marshaling of compact binary objects and attachments
Diffstat (limited to 'zenserver')
| -rw-r--r-- | zenserver/projectstore.cpp | 3 | ||||
| -rw-r--r-- | zenserver/projectstore.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index cd85e6d22..cb6be69e8 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -1062,8 +1062,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects) if (IoBuffer Data = IoBufferBuilder::MakeFromFile(AttachmentPath.native().c_str())) { - // TODO: this should use the IoBuffer directly to avoid mapping the chunk into memory - return SharedBuffer::Clone(MemoryView(Data.Data(), Data.Size())); + return SharedBuffer(std::move(Data)); } else { diff --git a/zenserver/projectstore.h b/zenserver/projectstore.h index 0b41b837b..38c53ea6e 100644 --- a/zenserver/projectstore.h +++ b/zenserver/projectstore.h @@ -87,7 +87,7 @@ public: const std::string& OplogId() const { return m_OplogId; } - const std::wstring& TempDir() const { return m_TempPath.native(); } + const std::wstring& TempDir() const { return m_TempPath.native(); } const std::filesystem::path& TempPath() const { return m_TempPath; } spdlog::logger& Log() { return m_OuterProject->Log(); } |