Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 20230610 vector #171

Merged
merged 5 commits into from
Jun 17, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ find_package(benchmark REQUIRED)
# google benchmark end
################################################

set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost REQUIRED COMPONENTS)
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
endif()

set(LIBS ${Boost_LIBRARIES} "${CMAKE_THREAD_LIBS_INIT}")
add_executable(eraft-vdb src/eraft_vdb_server.cc src/proto_parser.cc)
target_link_libraries(eraft-vdb ${LIBS})
target_include_directories(eraft-vdb PUBLIC ${eraftkv_INCLUDE_DIR})

# build eraftkv
set(eraftkv_sources)
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ FROM eraft/eraftkv:v0.0.4
# intstall google benchmark
# RUN git clone https://github.com/google/benchmark.git && git clone https://github.com/google/googletest.git benchmark/googletest && cd benchmark && cmake -E make_directory "build" && cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release ../ && cmake --build "build" --config Release --target install

RUN cd /grpc/third_party/protobuf && ./autogen.sh && ./configure && make -j8 && make install
# RUN cd /grpc/third_party/protobuf && ./autogen.sh && ./configure && make -j8 && make install

RUN ldconfig
# RUN ldconfig

RUN apt-get install -y libasio-dev telnet
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# SOFTWARE.
default: image

IMAGE_VERSION := v0.0.5
IMAGE_VERSION := v0.0.6

BUILDER_IMAGE := $(or $(BUILDER_IMAGE),eraft/eraftkv:$(IMAGE_VERSION))

Expand All @@ -37,9 +37,9 @@ gen-protocol-code:
# build eraftkv on local machine
build-dev:
chmod +x utils/build-dev.sh
docker run -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.4 /eraft/utils/build-dev.sh
docker run -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/utils/build-dev.sh

# run all unit test
tests:
chmod +x utils/run-tests.sh
docker run -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.4 /eraft/utils/run-tests.sh
docker run -it --rm -v $(realpath .):/eraft eraft/eraftkv:v0.0.6 /eraft/utils/run-tests.sh
7 changes: 0 additions & 7 deletions doc/0.大纲.md

This file was deleted.

41 changes: 0 additions & 41 deletions doc/1.白皮书目录.md

This file was deleted.

92 changes: 0 additions & 92 deletions doc/2.总体设计.md

This file was deleted.

Loading