mir
null+****@clear*****
Thu Oct 4 10:19:32 JST 2012
mir 2009-08-08 13:47:04 +0900 (Sat, 08 Aug 2009) New Revision: 40e8316cd56b4e5ea4d69ccfd58f39430f281e4b https://github.com/mroonga/mroonga/commit/40e8316cd56b4e5ea4d69ccfd58f39430f281e4b Log: keep up-to-date with groonga. Modified files: driver.c test/unit/test-driver.c Modified: driver.c (+2 -2) =================================================================== --- driver.c 2009-07-30 16:23:56 +0900 (4b51e64) +++ driver.c 2009-08-08 13:47:04 +0900 (dcda317) @@ -99,7 +99,7 @@ int mrn_init() if ((mrn_lexicon = grn_table_create(&ctx, MRN_LEXICON_TABLE_NAME, strlen(MRN_LEXICON_TABLE_NAME), NULL, GRN_OBJ_TABLE_PAT_KEY|GRN_OBJ_PERSISTENT, - grn_ctx_at(&ctx,GRN_DB_SHORT_TEXT), 0))) + grn_ctx_at(&ctx,GRN_DB_SHORTTEXT), 0))) { GRN_LOG(&ctx, GRN_LOG_NOTICE, "lexicon table created"); } @@ -317,7 +317,7 @@ int mrn_create(grn_ctx *ctx, mrn_info *info) table->obj = grn_table_create(ctx, table->name, table->name_size, table->path, table->flags, - table->key_type, NULL); + table->key_type, 0); if (table->obj == NULL) { GRN_LOG(ctx, GRN_LOG_ERROR, "cannot create table: name=%s, name_size=%d, path=%s, " Modified: test/unit/test-driver.c (+1 -1) =================================================================== --- test/unit/test-driver.c 2009-07-30 16:23:56 +0900 (63d799b) +++ test/unit/test-driver.c 2009-08-08 13:47:04 +0900 (4a0824b) @@ -542,7 +542,7 @@ void test_mrn_rnd_next() res1 = GRN_INT32_VALUE(record->value[0]); res2 = GRN_TEXT_VALUE(record->value[1]); cut_assert_equal_int(100, res1); - cut_assert_equal_int(12, GRN_BULK_WSIZE(record->value[1])); + cut_assert_equal_int(12, GRN_TEXT_LEN(record->value[1])); cut_assert_equal_int(0, strncmp(val2, res2, 12)); cut_assert_equal_int(0, mrn_rewind_record(ctx, record)); -------------- next part -------------- HTML����������������������������...Download