Kouhei Sutou
null+****@clear*****
Tue Jan 14 10:22:37 JST 2014
Kouhei Sutou 2014-01-14 10:22:37 +0900 (Tue, 14 Jan 2014) New Revision: d0476026dcd0a0889f3cb1f5611add8a74ba5cfb https://github.com/groonga/groonga/commit/d0476026dcd0a0889f3cb1f5611add8a74ba5cfb Message: test: remove memcached API tests We can't maintain it. Removed files: test/unit/lib/grn-test-memcached-assertions.c test/unit/lib/grn-test-memcached-assertions.h test/unit/memcached/Makefile.am test/unit/memcached/test-memcached.c Modified files: configure.ac test/unit/Makefile.am test/unit/lib/Makefile.am Modified: configure.ac (+0 -13) =================================================================== --- configure.ac 2014-01-13 20:25:35 +0900 (5ed1be9) +++ configure.ac 2014-01-14 10:22:37 +0900 (4404f31) @@ -283,7 +283,6 @@ AC_CONFIG_FILES([ test/unit/util/Makefile test/unit/core/Makefile test/unit/core/dat/Makefile - test/unit/memcached/Makefile test/unit/http/Makefile test/unit/story/Makefile test/unit/groonga-benchmark/Makefile @@ -696,18 +695,6 @@ AM_CONDITIONAL([WITH_CUTTER], [test "$cutter_use_cutter" = "yes"]) AM_CONDITIONAL([WITH_CPPCUTTER], [test "$cutter_use_cppcutter" = "yes"]) if test "$cutter_use_cutter" = "yes"; then AC_DEFINE(GRN_WITH_CUTTER, 1, [Define to 1 if you use Cutter]) - - ac_cv_have_libmemcached=no - AC_CHECK_HEADER(libmemcached/memcached.h, - [AC_SEARCH_LIBS(memcached_increment_with_initial, memcached, - [ac_cv_have_libmemcached=yes])]) - AM_CONDITIONAL([WITH_LIBMEMCACHED], - [test "$ac_cv_have_libmemcached" = "yes"]) - if test "$ac_cv_have_libmemcached" = "yes"; then - AC_DEFINE(GRN_WITH_LIBMEMCACHED, 1, [Define to 1 if you use libmemcached]) - fi -else - AM_CONDITIONAL([WITH_LIBMEMCACHED], false) fi # check for benchmark Modified: test/unit/Makefile.am (+0 -1) =================================================================== --- test/unit/Makefile.am 2014-01-13 20:25:35 +0900 (2bb685a) +++ test/unit/Makefile.am 2014-01-14 10:22:37 +0900 (1b36dd8) @@ -3,7 +3,6 @@ SUBDIRS = \ fixtures \ util \ core \ - memcached \ http \ story \ groonga-benchmark Modified: test/unit/lib/Makefile.am (+0 -10) =================================================================== --- test/unit/lib/Makefile.am 2014-01-13 20:25:35 +0900 (06720fa) +++ test/unit/lib/Makefile.am 2014-01-14 10:22:37 +0900 (96f6c70) @@ -6,10 +6,6 @@ noinst_LTLIBRARIES = \ libgrn-test-utils.la \ libgrn-test-hash-utils.la \ libgrn-test-server.la -if WITH_LIBMEMCACHED -noinst_LTLIBRARIES += \ - libgrn-test-memcached-utils.la -endif endif AM_CPPFLAGS = \ @@ -61,9 +57,3 @@ libgrn_test_server_la_SOURCES = \ grn-test-server.h libgrn_test_server_la_LIBADD = \ libgrn-test-utils.la - -libgrn_test_memcached_utils_la_SOURCES = \ - grn-test-memcached-assertions.c \ - grn-test-memcached-assertions.h -libgrn_test_memcached_utils_la_LIBADD = \ - libgrn-test-utils.la Deleted: test/unit/lib/grn-test-memcached-assertions.c (+0 -137) 100644 =================================================================== --- test/unit/lib/grn-test-memcached-assertions.c 2014-01-13 20:25:35 +0900 (4f7afcc) +++ /dev/null @@ -1,137 +0,0 @@ -/* -*- c-basic-offset: 2; coding: utf-8 -*- */ -/* - Copyright (C) 2009 Kouhei Sutou <kou �� clear-code.com> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include <gcutter.h> -#include "grn-test-memcached-assertions.h" - -static const gchar * -grn_memcached_rc_to_string(memcached_return rc) -{ - switch (rc) { - case MEMCACHED_SUCCESS: - return "MEMCACHED_SUCCESS"; - case MEMCACHED_FAILURE: - return "MEMCACHED_FAILURE"; - case MEMCACHED_HOST_LOOKUP_FAILURE: - return "MEMCACHED_HOST_LOOKUP_FAILURE"; - case MEMCACHED_CONNECTION_FAILURE: - return "MEMCACHED_CONNECTION_FAILURE"; - case MEMCACHED_CONNECTION_BIND_FAILURE: - return "MEMCACHED_CONNECTION_BIND_FAILURE"; - case MEMCACHED_WRITE_FAILURE: - return "MEMCACHED_WRITE_FAILURE"; - case MEMCACHED_READ_FAILURE: - return "MEMCACHED_READ_FAILURE"; - case MEMCACHED_UNKNOWN_READ_FAILURE: - return "MEMCACHED_UNKNOWN_READ_FAILURE"; - case MEMCACHED_PROTOCOL_ERROR: - return "MEMCACHED_PROTOCOL_ERROR"; - case MEMCACHED_CLIENT_ERROR: - return "MEMCACHED_CLIENT_ERROR"; - case MEMCACHED_SERVER_ERROR: - return "MEMCACHED_SERVER_ERROR"; - case MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE: - return "MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE"; - case MEMCACHED_DATA_EXISTS: - return "MEMCACHED_DATA_EXISTS"; - case MEMCACHED_DATA_DOES_NOT_EXIST: - return "MEMCACHED_DATA_DOES_NOT_EXIST"; - case MEMCACHED_NOTSTORED: - return "MEMCACHED_NOTSTORED"; - case MEMCACHED_STORED: - return "MEMCACHED_STORED"; - case MEMCACHED_NOTFOUND: - return "MEMCACHED_NOTFOUND"; - case MEMCACHED_MEMORY_ALLOCATION_FAILURE: - return "MEMCACHED_MEMORY_ALLOCATION_FAILURE"; - case MEMCACHED_PARTIAL_READ: - return "MEMCACHED_PARTIAL_READ"; - case MEMCACHED_SOME_ERRORS: - return "MEMCACHED_SOME_ERRORS"; - case MEMCACHED_NO_SERVERS: - return "MEMCACHED_NO_SERVERS"; - case MEMCACHED_END: - return "MEMCACHED_END"; - case MEMCACHED_DELETED: - return "MEMCACHED_DELETED"; - case MEMCACHED_VALUE: - return "MEMCACHED_VALUE"; - case MEMCACHED_STAT: - return "MEMCACHED_STAT"; - case MEMCACHED_ITEM: - return "MEMCACHED_ITEM"; - case MEMCACHED_ERRNO: - return "MEMCACHED_ERRNO"; - case MEMCACHED_FAIL_UNIX_SOCKET: - return "MEMCACHED_FAIL_UNIX_SOCKET"; - case MEMCACHED_NOT_SUPPORTED: - return "MEMCACHED_NOT_SUPPORTED"; - case MEMCACHED_NO_KEY_PROVIDED: - return "MEMCACHED_NO_KEY_PROVIDED"; - case MEMCACHED_FETCH_NOTFINISHED: - return "MEMCACHED_FETCH_NOTFINISHED"; - case MEMCACHED_TIMEOUT: - return "MEMCACHED_TIMEOUT"; - case MEMCACHED_BUFFERED: - return "MEMCACHED_BUFFERED"; - case MEMCACHED_BAD_KEY_PROVIDED: - return "MEMCACHED_BAD_KEY_PROVIDED"; - case MEMCACHED_INVALID_HOST_PROTOCOL: - return "MEMCACHED_INVALID_HOST_PROTOCOL"; - case MEMCACHED_SERVER_MARKED_DEAD: - return "MEMCACHED_SERVER_MARKED_DEAD"; - case MEMCACHED_UNKNOWN_STAT_KEY: - return "MEMCACHED_UNKNOWN_STAT_KEY"; - case MEMCACHED_E2BIG: - return "MEMCACHED_E2BIG"; - default: - return "MEMCACHED_UNKNOWN_STATUS"; - } -} - -void -grn_test_memcached_assert_helper(memcached_return rc, const gchar *expression) -{ - if (rc == MEMCACHED_SUCCESS) { - cut_test_pass(); - } else { - cut_test_fail(cut_take_printf("expected: <%s> == MEMCACHED_SUCCESS\n" - " but was: <%s>", - expression, - grn_memcached_rc_to_string(rc))); - } -} - -void -grn_test_memcached_assert_equal_rc_helper(memcached_return expected, - memcached_return actual, - const gchar *expression_expected, - const gchar *expression_actual) -{ - if (expected == actual) { - cut_test_pass(); - } else { - cut_test_fail(cut_take_printf("<%s> == <%s>\n" - "expected: <%s>\n" - " but was: <%s>", - expression_expected, - expression_actual, - grn_memcached_rc_to_string(expected), - grn_memcached_rc_to_string(actual))); - } -} Deleted: test/unit/lib/grn-test-memcached-assertions.h (+0 -50) 100644 =================================================================== --- test/unit/lib/grn-test-memcached-assertions.h 2014-01-13 20:25:35 +0900 (5f4981d) +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- c-basic-offset: 2; coding: utf-8 -*- */ -/* - Copyright (C) 2009 Kouhei Sutou <kou �� clear-code.com> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#ifndef __GRN_TEST_MEMCACHED_ASSERTIONS_H__ -#define __GRN_TEST_MEMCACHED_ASSERTIONS_H__ - -#include <libmemcached/memcached.h> - -#include "grn-test-utils.h" - -#define grn_test_memcached_assert(expression, ...) \ - cut_trace_with_info_expression( \ - cut_test_with_user_message( \ - grn_test_memcached_assert_helper((expression), #expression), \ - __VA_ARGS__), \ - grn_test_assert(expression)) - -#define grn_test_memcached_assert_equal_rc(expected, actual, ...) \ - cut_trace_with_info_expression( \ - cut_test_with_user_message( \ - grn_test_memcached_assert_equal_rc_helper((expected), (actual), \ - #expected, #actual), \ - __VA_ARGS__), \ - grn_test_assert_equal_rc(expected, actual)) - - -void grn_test_memcached_assert_helper (memcached_return rc, - const gchar *expression); -void grn_test_memcached_assert_equal_rc_helper - (memcached_return expected, - memcached_return actual, - const gchar *expression_expected, - const gchar *expression_actual); - -#endif Deleted: test/unit/memcached/Makefile.am (+0 -31) 100644 =================================================================== --- test/unit/memcached/Makefile.am 2014-01-13 20:25:35 +0900 (77f4784) +++ /dev/null @@ -1,31 +0,0 @@ -if WITH_CUTTER -if WITH_LIBMEMCACHED -# noinst_LTLIBRARIES = \ -# test-memcached.la -endif -endif - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/lib \ - $(GROONGA_INCLUDEDIR) - -AM_CFLAGS = \ - $(GCUTTER_CFLAGS) \ - -DGROONGA=\"$(abs_top_builddir)/src/groonga\" - -AM_LDFLAGS = \ - -module \ - -rpath $(libdir) \ - -avoid-version \ - -no-undefined \ - -lmemcached - -LIBS = \ - $(top_builddir)/lib/libgroonga.la \ - $(GCUTTER_LIBS) \ - $(top_builddir)/test/unit/lib/libgrn-test-utils.la \ - $(top_builddir)/test/unit/lib/libgrn-test-server.la \ - $(top_builddir)/test/unit/lib/libgrn-test-memcached-utils.la - -test_memcached_la_SOURCES = test-memcached.c Deleted: test/unit/memcached/test-memcached.c (+0 -292) 100644 =================================================================== --- test/unit/memcached/test-memcached.c 2014-01-13 20:25:35 +0900 (5351315) +++ /dev/null @@ -1,292 +0,0 @@ -/* -*- c-basic-offset: 2; coding: utf-8 -*- */ -/* - Copyright (C) 2008-2009 Tasuku SUENAGA <a �� razil.jp> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include <glib/gstdio.h> -#include "libmemcached/memcached.h" -#include <gcutter.h> /* must be included after memcached.h */ - -#include <unistd.h> - -#include "../lib/grn-assertions.h" -#include "../lib/grn-test-memcached-assertions.h" -#include "../lib/grn-test-server.h" - -/* globals */ -static gchar *val1 = NULL, *val2 = NULL; -static size_t val1_len, val2_len; -static struct memcached_st *memc = NULL; -static struct memcached_server_st *servers = NULL; - -static GrnTestServer *server; - -void -cut_setup(void) -{ - GError *error = NULL; - - memc = NULL; - servers = NULL; - - server = grn_test_server_new(); - grn_test_server_start(server, &error); - gcut_assert_error(error); - - memc = memcached_create(NULL); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); - - servers = - memcached_servers_parse(grn_test_server_get_memcached_address(server)); - grn_test_memcached_assert(memcached_server_push(memc, servers), - cut_message("memcached server connect failed.")); - - memcached_flush(memc, 0); /* flush immediately for debug daemon */ -} - -void -cut_teardown(void) -{ - if (val1) { free(val1); val1 = NULL; } - if (val2) { free(val2); val2 = NULL; } - - if (servers) { - memcached_server_list_free(servers); - } - if (memc) { - memcached_free(memc); - } - - if (server) { - g_object_unref(server); - } -} - -void -test_set_and_get(void) -{ - uint32_t flags; - memcached_return rc; - - grn_test_memcached_assert( - memcached_set(memc, "key", 3, "value", 5, 0, 0xdeadbeefU), - cut_message("memcached set failed.")); - - val1 = memcached_get(memc, "key", 3, &val1_len, &flags, &rc); - grn_test_memcached_assert(rc, cut_message("memcached get failed.")); - cut_assert_equal_string("value", val1); - cut_assert_equal_uint(0xdeadbeefU, flags); -} - -void -test_set_and_get_with_expire(void) -{ - uint32_t flags; - memcached_return rc; - const int timeout = 1; - - grn_test_memcached_assert( - memcached_set(memc, "key", 1, "value", 5, timeout, 0xdeadbeefU), - cut_message("memcached set with expiration failed.")); - - val1 = memcached_get(memc, "key", 1, &val1_len, &flags, &rc); - grn_test_memcached_assert( - rc, cut_message("memcached get with expiration failed.")); - cut_assert_equal_string("value", val1); - cut_assert_equal_uint(0xdeadbeefU, flags); - - sleep(timeout + 1); - - val2 = memcached_get(memc, "key", 1, &val2_len, &flags, &rc); - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTFOUND, rc, - cut_message("memcached get with expiration error.")); -} - -void -test_noop(void) -{ - /* TODO: implement */ - memcached_return rc = MEMCACHED_SUCCESS; - grn_test_memcached_assert(rc); -} - -void -test_memcached_add(void) -{ - uint32_t flags; - memcached_return rc; - - grn_test_memcached_assert( - memcached_add(memc, "key", 3, "value", 5, 0, 0xdeadbeefU), - cut_message("memcached add failed.")); - - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTSTORED, - memcached_add(memc, "key", 3, "new-value", 9, 0, 0xdeadbeefU), - cut_message("memcached add succeeded.")); - - val1 = memcached_get(memc, "key", 3, &val1_len, &flags, &rc); - grn_test_memcached_assert(rc, cut_message("memcached get failed.")); - cut_assert_equal_string("value", val1); - cut_assert_equal_uint(0xdeadbeefU, flags); -} - -void -test_memcached_replace(void) -{ - uint32_t flags; - memcached_return rc; - - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTSTORED, - memcached_replace(memc, "key", 3, "value", 5, 0, 0xdeadbeefU), - cut_message("memcached replace succeeded.")); - - sleep(1); - - grn_test_memcached_assert( - memcached_add(memc, "key", 3, "value", 5, 0, 0xdeadbeefU), - cut_message("memcached add failed.")); - - grn_test_memcached_assert( - memcached_replace(memc, "key", 3, "new-value", 9, 0, 0xdeadbeefU), - cut_message("memcached replace failed.")); - - val1 = memcached_get(memc, "key", 3, &val1_len, &flags, &rc); - grn_test_memcached_assert(rc, cut_message("memcached get failed.")); - cut_assert_equal_string("new-value", val1); - cut_assert_equal_uint(0xdeadbeefU, flags); -} - -void -test_memcached_flush(void) -{ - uint32_t flags; - memcached_return rc; - - grn_test_memcached_assert( - memcached_set(memc, "key", 3, "to be flushed", 13, 0, 0xdeadbeefU), - cut_message("memcached set failed.")); - - memcached_flush(memc, 0); - - val1 = memcached_get(memc, "key", 3, &val1_len, &flags, &rc); - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTFOUND, rc, - cut_message("memcached get succeeded.")); -} - -void -test_memcached_flush_with_time(void) -{ - const int sleep_time = 1; - uint32_t flags; - memcached_return rc; - - grn_test_memcached_assert( - memcached_set(memc, "key", 3, "to be flushed", 13, 0, 0xdeadbeefU), - cut_message("memcached set failed.")); - - memcached_flush(memc, sleep_time); - - val1 = memcached_get(memc, "key", 3, &val1_len, &flags, &rc); - grn_test_memcached_assert(rc, cut_message("memcached get failed.")); - cut_assert_equal_string("to be flushed", val1); - cut_assert_equal_uint(0xdeadbeefU, flags); - - sleep(sleep_time + 1); - - val2 = memcached_get(memc, "key", 3, &val2_len, &flags, &rc); - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTFOUND, rc, - cut_message("memcached get succeeded.")); -} - -void -test_memcached_cas(void) -{ - memcached_return rc; - - const char *key = "caskey"; - size_t key_len = strlen(key); - const char* keys[2] = { (char *)key, NULL }; - size_t key_lens[2] = { key_len, 0 }; - - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); - grn_test_memcached_assert( - memcached_set(memc, key, key_len, "cas test", 8, 0, 0xdeadbeefU), - cut_message("memcached set failed.")); - - { - uint64_t cas; - memcached_result_st *results; - memcached_result_st results_obj; - - results = memcached_result_create(memc, &results_obj); - grn_test_memcached_assert( - memcached_mget(memc, keys, key_lens, 1), - cut_message("memcached mget failed.")); - results = memcached_fetch_result(memc, &results_obj, &rc); - cut_assert_not_null(results, - cut_message("memcached fetch result failed.")); - - cas = memcached_result_cas(results); - cut_assert_operator(cas, !=, 0, - cut_message("memcached cas value is non-zero.")); - - grn_test_memcached_assert( - memcached_cas(memc, key, key_len, "cas changed", 12, 0, 0, cas), - cut_message("memcached cas failed.")); - - grn_test_memcached_assert_equal_rc( - MEMCACHED_NOTSTORED, - memcached_cas(memc, key, key_len, "cas changed", 12, 0, 0, cas), - cut_message("memcached cas value is same.")); - - memcached_result_free(&results_obj); - } -} - -void -test_memcached_increment(void) -{ - uint64_t intval; - - grn_test_memcached_assert( - memcached_increment_with_initial(memc, "incr", 4, 1, 30, 0, &intval)); - gcut_assert_equal_uint64(30, intval); - - grn_test_memcached_assert( - memcached_increment_with_initial(memc, "incr", 4, 3, 0, 0, &intval)); - gcut_assert_equal_uint64(33, intval); - - fflush(stderr); -} - -void -test_memcached_decrement(void) -{ - uint64_t intval; - - grn_test_memcached_assert( - memcached_increment_with_initial(memc, "decr", 4, 30, 99, 0, &intval)); - gcut_assert_equal_uint64(99, intval); - - grn_test_memcached_assert( - memcached_decrement_with_initial(memc, "decr", 4, 17, 0, 0, &intval)); - gcut_assert_equal_uint64(82, intval); -} -------------- next part -------------- HTML����������������������������...Download