database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-11471 JSON_ARRAY_APPEND returns incorrect results.

Browse Source 
Item_func_json_array_append::val_str fixed.
This commit is contained in:
Alexey Botchkov
2016-12-05 08:43:15 +04:00
parent abb80d25f4
commit fe6d0a0719
3 changed files with 93 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_json.result
View File

@ -55,6 +55,9 @@ json_array_append('["a", "b"]', '$', FALSE)
select json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2); select json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2);
json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2) json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2)
{"k1":1, "k2":["a", "b", 2]} {"k1":1, "k2":["a", "b", 2]}
select json_array_append('["a", ["b", "c"], "d"]', '$[0]', 2);
json_array_append('["a", ["b", "c"], "d"]', '$[0]', 2)
[["a", 2], ["b", "c"], "d"]
select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x'); select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x');
json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x') json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x')
["a", "x", {"b": [1, 2]}, [3, 4]] ["a", "x", {"b": [1, 2]}, [3, 4]]

1
mysql-test/t/func_json.test
View File

@ -21,6 +21,7 @@ select json_array(1, "text", false, null);
select json_array_append('["a", "b"]', '$', FALSE); select json_array_append('["a", "b"]', '$', FALSE);
select json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2); select json_array_append('{"k1":1, "k2":["a", "b"]}', '$.k2', 2);
select json_array_append('["a", ["b", "c"], "d"]', '$[0]', 2);
select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x'); select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[1]', 'x');
select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[2]', 'x'); select json_array_insert('["a", {"b": [1, 2]}, [3, 4]]', '$[2]', 'x');

117
sql/item_jsonfunc.cc
View File

@ -994,32 +994,69 @@ String *Item_func_json_array_append::val_str(String *str)
if (json_read_value(&je)) if (json_read_value(&je))
goto error; goto error;
if (je.value_type != JSON_VALUE_ARRAY)
{
/* Must be an array. */
goto error;
}
if (json_skip_level(&je))
goto error;
str->length(0); str->length(0);
str->set_charset(js->charset()); str->set_charset(js->charset());
if (str->reserve(js->length() + 8, 1024)) if (str->reserve(js->length() + 8, 1024))
goto error; /* Out of memory. */ goto error; /* Out of memory. */
ar_end= je.s.c_str - je.sav_c_len;
str_rest_len= js->length() - (ar_end - (const uchar *) js->ptr());
str->q_append(js->ptr(), ar_end-(const uchar *) js->ptr());
str->append(", ", 2);
if (append_json_value(str, args[n_arg+1], &tmp_val))
goto error; /* Out of memory. */
if (str->reserve(str_rest_len, 1024)) if (je.value_type == JSON_VALUE_ARRAY)
goto error; /* Out of memory. */ {
str->q_append((const char *) ar_end, str_rest_len); if (json_skip_level(&je))
goto error;
ar_end= je.s.c_str - je.sav_c_len;
str_rest_len= js->length() - (ar_end - (const uchar *) js->ptr());
str->q_append(js->ptr(), ar_end-(const uchar *) js->ptr());
str->append(", ", 2);
if (append_json_value(str, args[n_arg+1], &tmp_val))
goto error; /* Out of memory. */
if (str->reserve(str_rest_len, 1024))
goto error; /* Out of memory. */
str->q_append((const char *) ar_end, str_rest_len);
}
else
{
const uchar *c_from, *c_to;
/* Wrap as an array. */
str->q_append(js->ptr(), (const char *) je.value_begin - js->ptr());
c_from= je.value_begin;
if (je.value_type == JSON_VALUE_OBJECT)
{
if (json_skip_level(&je))
goto error;
c_to= je.s.c_str;
}
else
c_to= je.value_end;
if (str->append("[", 1) ||
str->append((const char *) c_from, c_to - c_from) ||
str->append(", ", 2) ||
append_json_value(str, args[n_arg+1], &tmp_val) ||
str->append("]", 1) ||
str->append((const char *) je.s.c_str,
js->end() - (const char *) je.s.c_str))
goto error;
}
{
/* Swap str and js. */
if (str == &tmp_js)
{
str= js;
js= &tmp_js;
}
else
{
js= str;
str= &tmp_js;
}
}
} }
return str; return js;
error: error:
null_value= 1; null_value= 1;
@ -1123,9 +1160,17 @@ String *Item_func_json_array_insert::val_str(String *str)
goto error; /* Out of memory. */ goto error; /* Out of memory. */
{ {
String *tmp_str= str; /* Swap str and js. */
str= &tmp_js; if (str == &tmp_js)
js= tmp_str; {
str= js;
js= &tmp_js;
}
else
{
js= str;
str= &tmp_js;
}
} }
} }
@ -1539,9 +1584,17 @@ v_found:
goto error; /* Out of memory. */ goto error; /* Out of memory. */
continue_point: continue_point:
{ {
String *tmp= str; /* Swap str and js. */
str= &tmp_js; if (str == &tmp_js)
js= tmp; {
str= js;
js= &tmp_js;
}
else
{
js= str;
str= &tmp_js;
}
} }
} }
@ -1701,9 +1754,17 @@ v_found:
goto error; /* Out of memory. */ goto error; /* Out of memory. */
{ {
String *tmp= str; /* Swap str and js. */
str= &tmp_js; if (str == &tmp_js)
js= tmp; {
str= js;
js= &tmp_js;
}
else
{
js= str;
str= &tmp_js;
}
} }
} }