naoa
null+****@clear*****
Thu Apr 14 06:55:06 JST 2016
naoa 2016-04-14 06:55:06 +0900 (Thu, 14 Apr 2016) New Revision: 1068a94967cb90815f690e8b57def24a1ba843e2 https://github.com/groonga/groonga/commit/1068a94967cb90815f690e8b57def24a1ba843e2 Merged 6f6a266: Merge pull request #529 from naoa/update-cache-related-drilldown Message: Add select cache related labeled drilldown Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+13 -1) =================================================================== --- lib/proc/proc_select.c 2016-04-13 19:02:04 +0900 (ef30987) +++ lib/proc/proc_select.c 2016-04-14 06:55:06 +0900 (9155bcf) @@ -847,7 +847,11 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, drilldown->keys_len + 1 + drilldown->sortby_len + 1 + drilldown->output_columns_len + 1 + - sizeof(int) * 2; + drilldown->label_len + 1 + + drilldown->calc_target_name_len + 1 + + drilldown->table_name_len + 1 + + sizeof(int) * 2 + + sizeof(grn_table_group_flags); } } if (cache_key_size <= GRN_CACHE_MAX_KEY_SIZE) { @@ -877,6 +881,12 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, cp += drilldown->sortby_len; *cp++ = '\0'; grn_memcpy(cp, drilldown->output_columns, drilldown->output_columns_len); cp += drilldown->output_columns_len; *cp++ = '\0'; + grn_memcpy(cp, drilldown->label, drilldown->label_len); + cp += drilldown->label_len; *cp++ = '\0'; + grn_memcpy(cp, drilldown->calc_target_name, drilldown->calc_target_name_len); + cp += drilldown->calc_target_name_len; *cp++ = '\0'; + grn_memcpy(cp, drilldown->table_name, drilldown->table_name_len); + cp += drilldown->table_name_len; *cp++ = '\0'; } } grn_memcpy(cp, match_escalation_threshold, match_escalation_threshold_len); @@ -905,6 +915,8 @@ grn_select(grn_ctx *ctx, const char *table, unsigned int table_len, cp += sizeof(int); grn_memcpy(cp, &(drilldown->limit), sizeof(int)); cp += sizeof(int); + grn_memcpy(cp, &(drilldown->calc_types), sizeof(grn_table_group_flags)); + cp += sizeof(grn_table_group_flags); } } cache_value = grn_cache_fetch(ctx, cache_obj, cache_key, cache_key_size); -------------- next part -------------- HTML����������������������������...Download
