Kouhei Sutou
null+****@clear*****
Mon Jan 19 00:12:54 JST 2015
Kouhei Sutou 2015-01-19 00:12:54 +0900 (Mon, 19 Jan 2015) New Revision: f75d5e782405dc72fa6f6043112a0252cf9a941f https://github.com/pgroonga/pgroonga/commit/f75d5e782405dc72fa6f6043112a0252cf9a941f Message: Remove unused codes Modified files: pgroonga--0.2.0.sql pgroonga.c pgroonga.h pgroonga_types.c Modified: pgroonga--0.2.0.sql (+20 -40) =================================================================== --- pgroonga--0.2.0.sql 2015-01-19 00:05:38 +0900 (db38f51) +++ pgroonga--0.2.0.sql 2015-01-19 00:12:54 +0900 (8e4ebd2) @@ -39,26 +39,16 @@ CREATE FUNCTION pgroonga.costestimate(internal) RETURNS internal AS 'MODULE_PATH CREATE FUNCTION pgroonga.options(internal) RETURNS internal AS 'MODULE_PATHNAME','pgroonga_options' LANGUAGE C; CREATE FUNCTION pgroonga.typeof(oid, integer) RETURNS integer AS 'MODULE_PATHNAME','pgroonga_typeof' LANGUAGE C; -CREATE FUNCTION pgroonga.get_text(text, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_text' LANGUAGE C; -CREATE FUNCTION pgroonga.get_bpchar(bpchar, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_bpchar' LANGUAGE C; -CREATE FUNCTION pgroonga.get_bool(bool, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_bool' LANGUAGE C; -CREATE FUNCTION pgroonga.get_int2(int2, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int2' LANGUAGE C; -CREATE FUNCTION pgroonga.get_int4(int4, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int4' LANGUAGE C; -CREATE FUNCTION pgroonga.get_int8(int8, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int8' LANGUAGE C; -CREATE FUNCTION pgroonga.get_float4(float4, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_float4' LANGUAGE C; -CREATE FUNCTION pgroonga.get_float8(float8, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_float8' LANGUAGE C; -CREATE FUNCTION pgroonga.get_timestamp(timestamp, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_timestamp' LANGUAGE C; -CREATE FUNCTION pgroonga.get_timestamptz(timestamptz, internal, internal) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_timestamptz' LANGUAGE C; -CREATE FUNCTION pgroonga.set_text(internal, internal, text) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_text' LANGUAGE C; -CREATE FUNCTION pgroonga.set_bpchar(internal, internal, bpchar) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_bpchar' LANGUAGE C; -CREATE FUNCTION pgroonga.set_bool(internal, internal, bool) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_bool' LANGUAGE C; -CREATE FUNCTION pgroonga.set_int2(internal, internal, int2) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_int2' LANGUAGE C; -CREATE FUNCTION pgroonga.set_int4(internal, internal, int4) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_int4' LANGUAGE C; -CREATE FUNCTION pgroonga.set_int8(internal, internal, int8) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_int8' LANGUAGE C; -CREATE FUNCTION pgroonga.set_float4(internal, internal, float4) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_float4' LANGUAGE C; -CREATE FUNCTION pgroonga.set_float8(internal, internal, float8) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_float8' LANGUAGE C; -CREATE FUNCTION pgroonga.set_timestamp(internal, internal, timestamp) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_timestamp' LANGUAGE C; -CREATE FUNCTION pgroonga.set_timestamptz(internal, internal, timestamptz) RETURNS void AS 'MODULE_PATHNAME','pgroonga_set_timestamptz' LANGUAGE C; +CREATE FUNCTION pgroonga.get_text(internal, internal, text) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_text' LANGUAGE C; +CREATE FUNCTION pgroonga.get_bpchar(internal, internal, bpchar) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_bpchar' LANGUAGE C; +CREATE FUNCTION pgroonga.get_bool(internal, internal, bool) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_bool' LANGUAGE C; +CREATE FUNCTION pgroonga.get_int2(internal, internal, int2) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int2' LANGUAGE C; +CREATE FUNCTION pgroonga.get_int4(internal, internal, int4) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int4' LANGUAGE C; +CREATE FUNCTION pgroonga.get_int8(internal, internal, int8) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_int8' LANGUAGE C; +CREATE FUNCTION pgroonga.get_float4(internal, internal, float4) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_float4' LANGUAGE C; +CREATE FUNCTION pgroonga.get_float8(internal, internal, float8) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_float8' LANGUAGE C; +CREATE FUNCTION pgroonga.get_timestamp(internal, internal, timestamp) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_timestamp' LANGUAGE C; +CREATE FUNCTION pgroonga.get_timestamptz(internal, internal, timestamptz) RETURNS void AS 'MODULE_PATHNAME','pgroonga_get_timestamptz' LANGUAGE C; INSERT INTO pg_catalog.pg_am VALUES( 'pgroonga', -- amname @@ -103,8 +93,7 @@ CREATE OPERATOR CLASS pgroonga.text_ops DEFAULT FOR TYPE text OPERATOR 6 <>, OPERATOR 7 %%, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_text(text, internal, internal), - FUNCTION 3 pgroonga.set_text(internal, internal, text); + FUNCTION 2 pgroonga.get_text(internal, internal, text); CREATE OPERATOR CLASS pgroonga.bpchar_ops DEFAULT FOR TYPE bpchar USING pgroonga AS @@ -116,8 +105,7 @@ CREATE OPERATOR CLASS pgroonga.bpchar_ops DEFAULT FOR TYPE bpchar OPERATOR 6 <>, OPERATOR 7 %%, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_bpchar(bpchar, internal, internal), - FUNCTION 3 pgroonga.set_bpchar(internal, internal, bpchar); + FUNCTION 2 pgroonga.get_bpchar(internal, internal, bpchar); CREATE OPERATOR CLASS pgroonga.bool_ops DEFAULT FOR TYPE bool USING pgroonga AS @@ -128,8 +116,7 @@ CREATE OPERATOR CLASS pgroonga.bool_ops DEFAULT FOR TYPE bool OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_bool(bool, internal, internal), - FUNCTION 3 pgroonga.set_bool(internal, internal, bool); + FUNCTION 2 pgroonga.get_bool(internal, internal, bool); CREATE OPERATOR CLASS pgroonga.int2_ops DEFAULT FOR TYPE int2 USING pgroonga AS @@ -140,8 +127,7 @@ CREATE OPERATOR CLASS pgroonga.int2_ops DEFAULT FOR TYPE int2 OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_int2(int2, internal, internal), - FUNCTION 3 pgroonga.set_int2(internal, internal, int2); + FUNCTION 2 pgroonga.get_int2(internal, internal, int2); CREATE OPERATOR CLASS pgroonga.int4_ops DEFAULT FOR TYPE int4 USING pgroonga AS @@ -152,8 +138,7 @@ CREATE OPERATOR CLASS pgroonga.int4_ops DEFAULT FOR TYPE int4 OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_int4(int4, internal, internal), - FUNCTION 3 pgroonga.set_int4(internal, internal, int4); + FUNCTION 2 pgroonga.get_int4(internal, internal, int4); CREATE OPERATOR CLASS pgroonga.int8_ops DEFAULT FOR TYPE int8 USING pgroonga AS @@ -164,8 +149,7 @@ CREATE OPERATOR CLASS pgroonga.int8_ops DEFAULT FOR TYPE int8 OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_int8(int8, internal, internal), - FUNCTION 3 pgroonga.set_int8(internal, internal, int8); + FUNCTION 2 pgroonga.get_int8(internal, internal, int8); CREATE OPERATOR CLASS pgroonga.float4_ops DEFAULT FOR TYPE float4 USING pgroonga AS @@ -176,8 +160,7 @@ CREATE OPERATOR CLASS pgroonga.float4_ops DEFAULT FOR TYPE float4 OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_float4(float4, internal, internal), - FUNCTION 3 pgroonga.set_float4(internal, internal, float4); + FUNCTION 2 pgroonga.get_float4(internal, internal, float4); CREATE OPERATOR CLASS pgroonga.float8_ops DEFAULT FOR TYPE float8 USING pgroonga AS @@ -188,8 +171,7 @@ CREATE OPERATOR CLASS pgroonga.float8_ops DEFAULT FOR TYPE float8 OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_float8(float8, internal, internal), - FUNCTION 3 pgroonga.set_float8(internal, internal, float8); + FUNCTION 2 pgroonga.get_float8(internal, internal, float8); CREATE OPERATOR CLASS pgroonga.timestamp_ops DEFAULT FOR TYPE timestamp USING pgroonga AS @@ -200,8 +182,7 @@ CREATE OPERATOR CLASS pgroonga.timestamp_ops DEFAULT FOR TYPE timestamp OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_timestamp(timestamp, internal, internal), - FUNCTION 3 pgroonga.set_timestamp(internal, internal, timestamp); + FUNCTION 2 pgroonga.get_timestamp(internal, internal, timestamp); CREATE OPERATOR CLASS pgroonga.timestamptz_ops DEFAULT FOR TYPE timestamptz USING pgroonga AS @@ -212,5 +193,4 @@ CREATE OPERATOR CLASS pgroonga.timestamptz_ops DEFAULT FOR TYPE timestamptz OPERATOR 5 >, OPERATOR 6 <>, FUNCTION 1 pgroonga.typeof(oid, integer), - FUNCTION 2 pgroonga.get_timestamptz(timestamptz, internal, internal), - FUNCTION 3 pgroonga.set_timestamptz(internal, internal, timestamptz); + FUNCTION 2 pgroonga.get_timestamptz(internal, internal, timestamptz); Modified: pgroonga.c (+4 -15) =================================================================== --- pgroonga.c 2015-01-19 00:05:38 +0900 (7c6c727) +++ pgroonga.c 2015-01-19 00:12:54 +0900 (0348ce1) @@ -212,27 +212,16 @@ GrnGetType(Relation index, AttrNumber n) } static void -GrnSetValue(Relation index, AttrNumber n, grn_obj *buffer, Datum value) +GrnGetValue(Relation index, AttrNumber n, grn_obj *buffer, Datum value) { FmgrInfo *function; - function = index_getprocinfo(index, n + 1, GrnSetValueProc); + function = index_getprocinfo(index, n + 1, GrnGetValueProc); FunctionCall3(function, PointerGetDatum(ctx), PointerGetDatum(buffer), value); } -static void -GrnGetValue(Relation index, AttrNumber n, Datum value, grn_obj *buffer) -{ - FmgrInfo *function; - - function = index_getprocinfo(index, n + 1, GrnGetValueProc); - FunctionCall3(function, - value, - PointerGetDatum(ctx), PointerGetDatum(buffer)); -} - static grn_obj * GrnLookup(const char *name, int errorLevel) { @@ -537,7 +526,7 @@ GrnInsert(grn_ctx *ctx, dataColumn = grn_obj_column(ctx, idsTable, name->data, strlen(name->data)); grn_obj_reinit(ctx, &buffer, GrnGetType(index, i), 0); - GrnSetValue(index, i, &buffer, values[i]); + GrnGetValue(index, i, &buffer, values[i]); grn_obj_set_value(ctx, dataColumn, id, &buffer, GRN_OBJ_SET); grn_obj_unlink(ctx, dataColumn); if (!GrnCheck("groonga: failed to set column value")) { @@ -673,7 +662,7 @@ GrnSearch(IndexScanDesc scan) grn_expr_append_op(ctx, matchTarget, GRN_OP_GET_MEMBER, 2); grn_obj_reinit(ctx, &buffer, GrnGetType(index, key->sk_attno - 1), 0); - GrnGetValue(index, key->sk_attno - 1, key->sk_argument, &buffer); + GrnGetValue(index, key->sk_attno - 1, &buffer, key->sk_argument); grn_expr_append_obj(ctx, expression, matchTarget, GRN_OP_PUSH, 1); grn_expr_append_obj(ctx, expression, &buffer, GRN_OP_PUSH, 1); Modified: pgroonga.h (+0 -12) =================================================================== --- pgroonga.h 2015-01-19 00:05:38 +0900 (23b6d34) +++ pgroonga.h 2015-01-19 00:12:54 +0900 (554b147) @@ -26,7 +26,6 @@ /* Groonga support functions */ #define GrnTypeOfProc 1 #define GrnGetValueProc 2 -#define GrnSetValueProc 3 /* file and table names */ #define GrnDatabaseBasename "grn" @@ -68,15 +67,4 @@ extern Datum PGDLLEXPORT pgroonga_get_float8(PG_FUNCTION_ARGS); extern Datum PGDLLEXPORT pgroonga_get_timestamp(PG_FUNCTION_ARGS); extern Datum PGDLLEXPORT pgroonga_get_timestamptz(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_text(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_bpchar(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_bool(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_int2(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_int4(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_int8(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_float4(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_float8(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_timestamp(PG_FUNCTION_ARGS); -extern Datum PGDLLEXPORT pgroonga_set_timestamptz(PG_FUNCTION_ARGS); - #endif /* PPGROONGA_H */ Modified: pgroonga_types.c (+12 -124) =================================================================== --- pgroonga_types.c 2015-01-19 00:05:38 +0900 (33affb0) +++ pgroonga_types.c 2015-01-19 00:12:54 +0900 (fce22e4) @@ -110,118 +110,6 @@ pgroonga_typeof(PG_FUNCTION_ARGS) Datum pgroonga_get_text(PG_FUNCTION_ARGS) { - text *var = PG_GETARG_TEXT_PP(0); - grn_ctx *ctx = (grn_ctx *)PG_GETARG_POINTER(1); - grn_obj *buffer = (grn_obj *)PG_GETARG_POINTER(2); - - GRN_TEXT_PUT(ctx, buffer, VARDATA_ANY(var), VARSIZE_ANY_EXHDR(var)); - - PG_RETURN_VOID(); -} - -Datum -pgroonga_get_bpchar(PG_FUNCTION_ARGS) -{ - BpChar *var = PG_GETARG_BPCHAR_PP(0); - grn_ctx *ctx = (grn_ctx *)PG_GETARG_POINTER(1); - grn_obj *buffer = (grn_obj *)PG_GETARG_POINTER(2); - - GRN_TEXT_PUT(ctx, buffer, VARDATA_ANY(var), pgroonga_bpchar_size(var)); - - PG_RETURN_VOID(); -} - -Datum -pgroonga_get_bool(PG_FUNCTION_ARGS) -{ - bool var = PG_GETARG_BOOL(0); - int *len = (int *) PG_GETARG_POINTER(1); - const char *ret = (var ? "true" : "false"); - - *len = strlen(ret); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_int2(PG_FUNCTION_ARGS) -{ - int16 var = PG_GETARG_INT16(0); - int *len = (int *) PG_GETARG_POINTER(1); - char *ret = (char *) palloc(8); - - *len = snprintf(ret, 8, "%d", var); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_int4(PG_FUNCTION_ARGS) -{ - int32 var = PG_GETARG_INT32(0); - int *len = (int *) PG_GETARG_POINTER(1); - char *ret = (char *) palloc(12); - - *len = snprintf(ret, 12, "%d", var); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_int8(PG_FUNCTION_ARGS) -{ - int64 var = PG_GETARG_INT64(0); - int *len = (int *) PG_GETARG_POINTER(1); - char *ret = (char *) palloc(24); - - *len = snprintf(ret, 24, INT64_FORMAT, var); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_float4(PG_FUNCTION_ARGS) -{ - float4 var = PG_GETARG_FLOAT4(0); - int *len = (int *) PG_GETARG_POINTER(1); - char *ret = (char *) palloc(32); - - *len = snprintf(ret, 32, "%f", var); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_float8(PG_FUNCTION_ARGS) -{ - float8 var = PG_GETARG_FLOAT8(0); - int *len = (int *) PG_GETARG_POINTER(1); - char *ret = (char *) palloc(32); - - *len = snprintf(ret, 32, "%f", var); - - PG_RETURN_POINTER(ret); -} - -Datum -pgroonga_get_timestamp(PG_FUNCTION_ARGS) -{ -#ifdef HAVE_INT64_TIMESTAMP - return pgroonga_get_int8(fcinfo); -#else - return pgroonga_get_float8(fcinfo); -#endif -} - -Datum -pgroonga_get_timestamptz(PG_FUNCTION_ARGS) -{ - return pgroonga_get_timestamp(fcinfo); -} - -Datum -pgroonga_set_text(PG_FUNCTION_ARGS) -{ grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); text *var = PG_GETARG_TEXT_PP(2); @@ -231,7 +119,7 @@ pgroonga_set_text(PG_FUNCTION_ARGS) } Datum -pgroonga_set_bpchar(PG_FUNCTION_ARGS) +pgroonga_get_bpchar(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -242,7 +130,7 @@ pgroonga_set_bpchar(PG_FUNCTION_ARGS) } Datum -pgroonga_set_bool(PG_FUNCTION_ARGS) +pgroonga_get_bool(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -253,7 +141,7 @@ pgroonga_set_bool(PG_FUNCTION_ARGS) } Datum -pgroonga_set_int2(PG_FUNCTION_ARGS) +pgroonga_get_int2(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -264,7 +152,7 @@ pgroonga_set_int2(PG_FUNCTION_ARGS) } Datum -pgroonga_set_int4(PG_FUNCTION_ARGS) +pgroonga_get_int4(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -275,7 +163,7 @@ pgroonga_set_int4(PG_FUNCTION_ARGS) } Datum -pgroonga_set_int8(PG_FUNCTION_ARGS) +pgroonga_get_int8(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -286,7 +174,7 @@ pgroonga_set_int8(PG_FUNCTION_ARGS) } Datum -pgroonga_set_float4(PG_FUNCTION_ARGS) +pgroonga_get_float4(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -297,7 +185,7 @@ pgroonga_set_float4(PG_FUNCTION_ARGS) } Datum -pgroonga_set_float8(PG_FUNCTION_ARGS) +pgroonga_get_float8(PG_FUNCTION_ARGS) { grn_ctx *ctx = (grn_ctx *) PG_GETARG_POINTER(0); grn_obj *obj = (grn_obj *) PG_GETARG_POINTER(1); @@ -308,17 +196,17 @@ pgroonga_set_float8(PG_FUNCTION_ARGS) } Datum -pgroonga_set_timestamp(PG_FUNCTION_ARGS) +pgroonga_get_timestamp(PG_FUNCTION_ARGS) { #ifdef HAVE_INT64_TIMESTAMP - return pgroonga_set_int8(fcinfo); + return pgroonga_get_int8(fcinfo); #else - return pgroonga_set_float8(fcinfo); + return pgroonga_get_float8(fcinfo); #endif } Datum -pgroonga_set_timestamptz(PG_FUNCTION_ARGS) +pgroonga_get_timestamptz(PG_FUNCTION_ARGS) { - return pgroonga_set_timestamp(fcinfo); + return pgroonga_get_timestamp(fcinfo); } -------------- next part -------------- HTML����������������������������...Download