diff options
Diffstat (limited to 'storage/mroonga/vendor/groonga/src/suggest')
5 files changed, 18 insertions, 17 deletions
diff --git a/storage/mroonga/vendor/groonga/src/suggest/CMakeLists.txt b/storage/mroonga/vendor/groonga/src/suggest/CMakeLists.txt index c0c7a9c9964..83ae26b8ce5 100644 --- a/storage/mroonga/vendor/groonga/src/suggest/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/src/suggest/CMakeLists.txt @@ -15,7 +15,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../lib - ${MRUBY_INCLUDE_DIRS}) + ${MRUBY_INCLUDE_DIRS} + ${MESSAGE_PACK_INCLUDE_DIRS}) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/create_dataset_sources.am GROONGA_SUGGEST_CREATE_DATASET_SOURCES) diff --git a/storage/mroonga/vendor/groonga/src/suggest/Makefile.am b/storage/mroonga/vendor/groonga/src/suggest/Makefile.am index cecf4001e9a..91260016fa8 100644 --- a/storage/mroonga/vendor/groonga/src/suggest/Makefile.am +++ b/storage/mroonga/vendor/groonga/src/suggest/Makefile.am @@ -2,7 +2,6 @@ bin_PROGRAMS = NONEXISTENT_CXX_SOURCE = nonexistent.cpp -if !PLATFORM_WIN32 bin_PROGRAMS += \ groonga-suggest-create-dataset @@ -13,8 +12,6 @@ bin_PROGRAMS += \ noinst_LTLIBRARIES = libutil.la endif -endif - EXTRA_DIST = \ CMakeLists.txt diff --git a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_create_dataset.c b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_create_dataset.c index d566d24b96a..7220ca88ec5 100644 --- a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_create_dataset.c +++ b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_create_dataset.c @@ -1,5 +1,5 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2013 Brazil +/* Copyright(C) 2010-2015 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -15,14 +15,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* For grn_str_getopt() */ +#include <grn_str.h> + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <groonga.h> -/* For grn_str_getopt() */ -#include <grn_str.h> - typedef enum { MODE_NONE, MODE_USAGE @@ -151,26 +151,29 @@ main(int argc, char **argv) grn_obj text; GRN_TEXT_INIT(&text, 0); #define SEND(string) send_command(ctx, &text, string, dataset_name) - SEND("register suggest/suggest"); + SEND("plugin_register suggest/suggest"); SEND("table_create event_type TABLE_HASH_KEY ShortText"); { grn_obj query; GRN_TEXT_INIT(&query, 0); GRN_TEXT_PUTS(ctx, &query, - "table_create bigram TABLE_PAT_KEY|KEY_NORMALIZE ShortText " + "table_create bigram TABLE_PAT_KEY ShortText " "--default_tokenizer "); if (default_tokenizer) { GRN_TEXT_PUTS(ctx, &query, default_tokenizer); } else { GRN_TEXT_PUTS(ctx, &query, DEFAULT_DEFAULT_TOKENIZER); } + GRN_TEXT_PUTS(ctx, &query, " --normalizer NormalizerAuto"); GRN_TEXT_PUTC(ctx, &query, '\0'); SEND(GRN_TEXT_VALUE(&query)); GRN_OBJ_FIN(ctx, &query); } - SEND("table_create kana TABLE_PAT_KEY|KEY_NORMALIZE ShortText"); - SEND("table_create item_${DATASET} TABLE_PAT_KEY|KEY_NORMALIZE " - "ShortText --default_tokenizer TokenDelimit"); + SEND("table_create kana TABLE_PAT_KEY ShortText " + "--normalizer NormalizerAuto"); + SEND("table_create item_${DATASET} TABLE_PAT_KEY " + "ShortText --default_tokenizer TokenDelimit " + "--normalizer NormalizerAuto"); SEND("column_create bigram item_${DATASET}_key " "COLUMN_INDEX|WITH_POSITION item_${DATASET} _key"); SEND("column_create item_${DATASET} kana COLUMN_VECTOR kana"); diff --git a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_httpd.c b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_httpd.c index f3127288c73..d42ead2c907 100644 --- a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_httpd.c +++ b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_httpd.c @@ -212,7 +212,7 @@ log_send(struct evkeyvalq *output_headers, struct evbuffer *res_buf, zmq_msg_t msg; if (!zmq_msg_init_size(&msg, sbuf.size)) { memcpy((void *)zmq_msg_data(&msg), sbuf.data, sbuf.size); - if (zmq_msg_send(&msg, thd->zmq_sock, 0)) { + if (zmq_msg_send(&msg, thd->zmq_sock, 0) == -1) { print_error("zmq_msg_send() error"); } zmq_msg_close(&msg); @@ -512,7 +512,7 @@ recv_handler(grn_ctx *ctx, void *zmq_recv_sock, msgpack_zone *mempool, grn_obj * if (zmq_msg_init(&msg)) { print_error("cannot init zmq message."); } else { - if (zmq_msg_recv(&msg, zmq_recv_sock, 0)) { + if (zmq_msg_recv(&msg, zmq_recv_sock, 0) == -1) { print_error("cannot recv zmq message."); } else { msgpack_object obj; diff --git a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_learner.c b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_learner.c index 03d889f5b01..74465beffdd 100644 --- a/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_learner.c +++ b/storage/mroonga/vendor/groonga/src/suggest/groonga_suggest_learner.c @@ -207,7 +207,7 @@ zmq_send_to_httpd(void *zmq_send_sock, void *data, size_t size) zmq_msg_t msg; if (!zmq_msg_init_size(&msg, size)) { memcpy((void *)zmq_msg_data(&msg), data, size); - if (zmq_msg_send(&msg, zmq_send_sock, 0)) { + if (zmq_msg_send(&msg, zmq_send_sock, 0) == -1) { print_error("zmq_send() error"); return -1; } @@ -481,7 +481,7 @@ recv_event_loop(msgpack_zone *mempool, void *zmq_sock, grn_ctx *ctx) if (zmq_msg_init(&msg)) { print_error("cannot init zmq message."); } else { - if (zmq_msg_recv(&msg, zmq_sock, 0)) { + if (zmq_msg_recv(&msg, zmq_sock, 0) == -1) { print_error("cannot recv zmq message."); } else { msgpack_object obj; |