mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2022-10-12 11:29:32 +03:00
commit 977c385df3
46 changed files with 2936 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/mroonga/vendor/groonga/lib/alloc.c vendored
View file

@ -828,8 +828,8 @@ grn_free_default(grn_ctx *ctx, void *ptr,
if (ptr) {
GRN_ADD_ALLOC_COUNT(-1);
} else {
GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (%p) (%s:%d) <%d>",
ptr, file, line, alloc_count);
GRN_LOG(ctx, GRN_LOG_ALERT, "free fail (%s:%d) <%d>",
file, line, alloc_count);
}
}
}

82
storage/mroonga/vendor/groonga/lib/db.c vendored
View file

@ -3591,53 +3591,51 @@ grn_obj_search_column_index_by_key(grn_ctx *ctx, grn_obj *obj,
if (need_cast) {
GRN_OBJ_INIT(&casted_query, GRN_BULK, 0, key_type);
rc = grn_obj_cast(ctx, query, &casted_query, GRN_FALSE);
if (rc == GRN_SUCCESS) {
key = GRN_BULK_HEAD(&casted_query);
key_len = GRN_BULK_VSIZE(&casted_query);
}
} else {
rc = GRN_SUCCESS;
key = GRN_BULK_HEAD(query);
key_len = GRN_BULK_VSIZE(query);
if (rc != GRN_SUCCESS)
goto fail;
query = &casted_query;
}
if (rc == GRN_SUCCESS) {
if (grn_logger_pass(ctx, GRN_REPORT_INDEX_LOG_LEVEL)) {
const char *tag;
if (optarg) {
switch (optarg->mode) {
case GRN_OP_MATCH :
tag = "[key][match]";
break;
case GRN_OP_EXACT :
tag = "[key][exact]";
break;
case GRN_OP_NEAR :
tag = "[key][near]";
break;
case GRN_OP_NEAR2 :
tag = "[key][near2]";
break;
case GRN_OP_SIMILAR :
tag = "[key][similar]";
break;
case GRN_OP_REGEXP :
tag = "[key][regexp]";
break;
case GRN_OP_FUZZY :
tag = "[key][fuzzy]";
break;
default :
tag = "[key][unknown]";
break;
}
} else {
key = GRN_BULK_HEAD(query);
key_len = GRN_BULK_VSIZE(query);
if (grn_logger_pass(ctx, GRN_REPORT_INDEX_LOG_LEVEL)) {
const char *tag;
if (optarg) {
switch (optarg->mode) {
case GRN_OP_MATCH :
tag = "[key][match]";
break;
case GRN_OP_EXACT :
tag = "[key][exact]";
break;
case GRN_OP_NEAR :
tag = "[key][near]";
break;
case GRN_OP_NEAR2 :
tag = "[key][near2]";
break;
case GRN_OP_SIMILAR :
tag = "[key][similar]";
break;
case GRN_OP_REGEXP :
tag = "[key][regexp]";
break;
case GRN_OP_FUZZY :
tag = "[key][fuzzy]";
break;
default :
tag = "[key][unknown]";
break;
}
grn_obj_search_index_report(ctx, tag, obj);
} else {
tag = "[key][exact]";
}
rc = grn_ii_sel(ctx, (grn_ii *)obj, key, key_len,
(grn_hash *)res, op, optarg);
grn_obj_search_index_report(ctx, tag, obj);
}
rc = grn_ii_sel(ctx, (grn_ii *)obj, key, key_len,
(grn_hash *)res, op, optarg);
fail:
if (need_cast) {
GRN_OBJ_FIN(ctx, &casted_query);
}