From 888416165c7c915d696ea3e6d68dbff7ac8a2ea7 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Mon, 20 Dec 2021 16:55:38 +0300 Subject: [PATCH] third_party: replace libmemcached Git submodule with binary package libmemcached is a project that provides a library with implemenation of memcached protocol and a number of tools for working with memcached servers. memcached uses memcapable [1] that checks memcached server implemenation for conformance with memcached protocol. libmemcached available as binary packages on Ubuntu (memcapable is in libmemcached-tools, see [2]) and no reasons to keep libmemcached as a Git submodule and spend time on it's compilation and maintenance. 1. https://docs.libmemcached.org/bin/memcapable.html 2. https://packages.ubuntu.com/focal/libmemcached-tools Closes #90 --- .github/workflows/testing.yaml | 2 +- .gitmodules | 4 ---- CMakeLists.txt | 2 -- cmake/BuildLibmemcached.cmake | 24 ------------------------ test/CMakeLists.txt | 1 - test/capable/capable-binary.test.py | 2 +- test/capable/capable-text.test.py | 2 +- 7 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 cmake/BuildLibmemcached.cmake diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index b6fe0ad..b006d46 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -29,7 +29,7 @@ jobs: tarantool-version: ${{ matrix.tarantool-version }} - name: Install build requirements - run: sudo apt-get -y install libsasl2-dev + run: sudo apt-get -y install libsasl2-dev libmemcached-tools - run: cmake . diff --git a/.gitmodules b/.gitmodules index 5c7e60e..6d2f082 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "third_party/libmemcached"] - path = third_party/libmemcached - url = https://github.com/tarantool/libmemcached.git - branch = libmemcached-1.2-devel-bigbes [submodule "test-run"] path = test-run url = https://github.com/tarantool/test-run.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 5475673..578eecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,9 +55,7 @@ if(NOT SMALL_FOUND) endif() include_directories(${SMALL_INCLUDE_DIRS}) -include(cmake/BuildLibmemcached.cmake) include(cmake/BuildMemtier.cmake) -libmemcached_build() memtier_build() include_directories(${CMAKE_SOURCE_DIR}/third_party) diff --git a/cmake/BuildLibmemcached.cmake b/cmake/BuildLibmemcached.cmake deleted file mode 100644 index 0738129..0000000 --- a/cmake/BuildLibmemcached.cmake +++ /dev/null @@ -1,24 +0,0 @@ -macro (libmemcached_build) - set(libmemcached_src ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libmemcached) - add_custom_target(libmemcached_cfg ./bootstrap.sh autoreconf - COMMAND ./configure --enable-jobserver=no --enable-memaslap - --enable-static --enable-shared=off - WORKING_DIRECTORY ${libmemcached_src} - ) - add_custom_target(libmemcached_make - COMMAND make libmemcached/csl/parser.h clients/memcapable - clients/memslap clients/memaslap - DEPENDS libmemcached_cfg - WORKING_DIRECTORY ${libmemcached_src} - ) - add_custom_target(libmemcached_copy - COMMAND ${CMAKE_COMMAND} -E copy ${libmemcached_src}/clients/memcapable - ${CMAKE_CURRENT_BINARY_DIR}/test/capable/memcapable - COMMAND ${CMAKE_COMMAND} -E copy ${libmemcached_src}/clients/memaslap - ${CMAKE_CURRENT_BINARY_DIR}/test/bench/memaslap - COMMAND ${CMAKE_COMMAND} -E copy ${libmemcached_src}/clients/memslap - ${CMAKE_CURRENT_BINARY_DIR}/test/bench/memslap - DEPENDS libmemcached_make - ) - add_custom_target(libmemcached DEPENDS libmemcached_copy) -endmacro(libmemcached_build) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 923b972..c0b101d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -4,4 +4,3 @@ add_dependencies(test-memcached internalso) add_custom_target(test-memcached-capable COMMAND ${CMAKE_SOURCE_DIR}/test/test-run.py --suite capable) -add_dependencies(test-memcached-capable libmemcached) diff --git a/test/capable/capable-binary.test.py b/test/capable/capable-binary.test.py index 25e2c76..4eb7cd6 100644 --- a/test/capable/capable-binary.test.py +++ b/test/capable/capable-binary.test.py @@ -17,7 +17,7 @@ mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port) mc.flush() -cmd = shlex.split('capable/memcapable -b -p %s -h %s -v' % +cmd = shlex.split('memccapable -b -p %s -h %s -v' % (iproto.py_con.port, '127.0.0.1')) task = Popen(cmd, stdout=PIPE, stderr=STDOUT) diff --git a/test/capable/capable-text.test.py b/test/capable/capable-text.test.py index fa36d9d..72a6a24 100644 --- a/test/capable/capable-text.test.py +++ b/test/capable/capable-text.test.py @@ -17,7 +17,7 @@ mc = MemcachedBinaryConnection("127.0.0.1", iproto.py_con.port) mc.flush() -cmd = shlex.split('capable/memcapable -a -p %s -h %s -v' % +cmd = shlex.split('memccapable -a -p %s -h %s -v' % (iproto.py_con.port, '127.0.0.1')) task = Popen(cmd, stdout=PIPE, stderr=STDOUT)