Kouhei Sutou
null+****@clear*****
Fri Oct 28 14:42:34 JST 2016
Kouhei Sutou 2016-10-28 14:42:34 +0900 (Fri, 28 Oct 2016) New Revision: 52cb6fca6e2c65fdfaaee85d5039c2a8f3d6a821 https://github.com/pgroonga/pgroonga/commit/52cb6fca6e2c65fdfaaee85d5039c2a8f3d6a821 Message: Support name size Modified files: src/pgrn_groonga.c src/pgrn_groonga.h Modified: src/pgrn_groonga.c (+29 -3) =================================================================== --- src/pgrn_groonga.c 2016-10-28 10:18:15 +0900 (2649118) +++ src/pgrn_groonga.c 2016-10-28 14:42:34 +0900 (80dd222) @@ -173,12 +173,24 @@ PGrnCreateTable(const char *name, grn_table_flags flags, grn_obj *type) { - grn_obj *table; unsigned int nameSize = 0; if (name) - { nameSize = strlen(name); + + return PGrnCreateTableWithSize(name, nameSize, flags, type); +} + +grn_obj * +PGrnCreateTableWithSize(const char *name, + size_t nameSize, + grn_table_flags flags, + grn_obj *type) +{ + grn_obj *table; + + if (name) + { flags |= GRN_OBJ_PERSISTENT; } @@ -198,10 +210,24 @@ PGrnCreateColumn(grn_obj *table, grn_column_flags flags, grn_obj *type) { + return PGrnCreateColumnWithSize(table, + name, + strlen(name), + flags, + type); +} + +grn_obj * +PGrnCreateColumnWithSize(grn_obj *table, + const char *name, + size_t nameSize, + grn_column_flags flags, + grn_obj *type) +{ grn_obj *column; column = grn_column_create(ctx, table, - name, strlen(name), NULL, + name, nameSize, NULL, GRN_OBJ_PERSISTENT | flags, type); PGrnCheck("pgroonga: failed to create column"); Modified: src/pgrn_groonga.h (+9 -0) =================================================================== --- src/pgrn_groonga.h 2016-10-28 10:18:15 +0900 (2b0ae32) +++ src/pgrn_groonga.h 2016-10-28 14:42:34 +0900 (e1c27d4) @@ -35,10 +35,19 @@ grn_obj *PGrnLookupIndexColumn(Relation index, grn_obj *PGrnCreateTable(const char *name, grn_table_flags flags, grn_obj *type); +grn_obj *PGrnCreateTableWithSize(const char *name, + size_t nameSize, + grn_table_flags flags, + grn_obj *type); grn_obj *PGrnCreateColumn(grn_obj *table, const char*name, grn_column_flags flags, grn_obj *type); +grn_obj *PGrnCreateColumnWithSize(grn_obj *table, + const char*name, + size_t nameSize, + grn_column_flags flags, + grn_obj *type); void PGrnIndexColumnSetSource(grn_obj *indexColumn, grn_obj *source); -------------- next part -------------- HTML����������������������������...Download