Naoya Murakami
null+****@clear*****
Sat Jan 28 10:40:46 JST 2017
Naoya Murakami 2017-01-28 10:40:46 +0900 (Sat, 28 Jan 2017) New Revision: 83c1188e9f61db181815e014d5f259bfc7b9ec7b https://github.com/groonga/groonga/commit/83c1188e9f61db181815e014d5f259bfc7b9ec7b Merged 80685fb: Merge pull request #634 from naoa/window-function-args Message: Support args for window function Modified files: include/groonga/window_function.h lib/window_function.c lib/window_functions.c Modified: include/groonga/window_function.h (+1 -1) =================================================================== --- include/groonga/window_function.h 2017-01-27 15:58:51 +0900 (df9be41) +++ include/groonga/window_function.h 2017-01-28 10:40:46 +0900 (1473b01) @@ -47,7 +47,7 @@ typedef struct _grn_window_definition { typedef grn_rc grn_window_function_func(grn_ctx *ctx, grn_obj *output_column, grn_window *window, - grn_obj *args, + grn_obj **args, int n_args); GRN_API grn_obj *grn_window_function_create(grn_ctx *ctx, Modified: lib/window_function.c (+2 -2) =================================================================== --- lib/window_function.c 2017-01-27 15:58:51 +0900 (41e04bd) +++ lib/window_function.c 2017-01-28 10:40:46 +0900 (49157ad) @@ -285,7 +285,7 @@ grn_expr_call_window_function(grn_ctx *ctx, proc = (grn_proc *)(expr->codes[0].value); GRN_PTR_INIT(&args, GRN_OBJ_VECTOR, GRN_ID_NIL); - n = expr->codes_curr - 2; + n = expr->codes_curr - 1; for (i = 1; i < n; i++) { /* TODO: Check op. */ GRN_PTR_PUT(ctx, &args, expr->codes[i].value); @@ -293,7 +293,7 @@ grn_expr_call_window_function(grn_ctx *ctx, rc = proc->callbacks.window_function(ctx, output_column, window, - (grn_obj *)GRN_BULK_HEAD(&args), + (grn_obj **)GRN_BULK_HEAD(&args), GRN_BULK_VSIZE(&args) / sizeof(grn_obj *)); GRN_OBJ_FIN(ctx, &args); Modified: lib/window_functions.c (+1 -1) =================================================================== --- lib/window_functions.c 2017-01-27 15:58:51 +0900 (dcf7e1c) +++ lib/window_functions.c 2017-01-28 10:40:46 +0900 (39126bd) @@ -23,7 +23,7 @@ static grn_rc window_function_record_number(grn_ctx *ctx, grn_obj *output_column, grn_window *window, - grn_obj *args, + grn_obj **args, int n_args) { grn_id id; -------------- next part -------------- HTML����������������������������...Download