Skip to content

Commit

Permalink
third_party: replace libmemcached Git submodule with binary package
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ligurio committed Dec 20, 2021
1 parent 6745886 commit 8884161
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 0 additions & 24 deletions cmake/BuildLibmemcached.cmake

This file was deleted.

1 change: 0 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion test/capable/capable-binary.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/capable/capable-text.test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8884161

Please sign in to comment.