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-11461 JSON_TYPE does not recognize integer/double types.

Browse Source 
Integer/Double recognition added.
This commit is contained in:
Alexey Botchkov
2016-12-05 01:01:09 +04:00
parent 5454500562
commit 78dc7c3a6e
5 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/json_lib.h
View File

@ -172,6 +172,14 @@ enum json_value_types
}; };
enum json_num_flags
{
JSON_NUM_NEG=1, /* Number is negative. */
JSON_NUM_FRAC_PART=2, /* The fractional part is not empty. */
JSON_NUM_EXP=4, /* The number has the 'e' part. */
};
typedef struct st_json_engine_t typedef struct st_json_engine_t
{ {
json_string_t s; /* String to parse. */ json_string_t s; /* String to parse. */
@ -185,6 +193,9 @@ typedef struct st_json_engine_t
enum json_value_types value_type; /* type of the value.*/ enum json_value_types value_type; /* type of the value.*/
const uchar *value; /* Points to the value. */ const uchar *value; /* Points to the value. */
const uchar *value_begin;/* Points to where the value starts in the JSON. */ const uchar *value_begin;/* Points to where the value starts in the JSON. */
uint num_flags; /* the details of the JSON_VALUE_NUMBER, is it negative,
or if it has the fractional part.
See the enum json_num_flags. */
/* /*
In most cases the 'value' and 'value_begin' are equal. In most cases the 'value' and 'value_begin' are equal.

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

@ -215,7 +215,10 @@ json_type("true")
BOOLEAN BOOLEAN
select json_type('123'); select json_type('123');
json_type('123') json_type('123')
NUMBER INTEGER
select json_type('123.12');
json_type('123.12')
DOUBLE
select json_keys('{"a":{"c":1, "d":2}, "b":2}'); select json_keys('{"a":{"c":1, "d":2}, "b":2}');
json_keys('{"a":{"c":1, "d":2}, "b":2}') json_keys('{"a":{"c":1, "d":2}, "b":2}')
["a", "b"] ["a", "b"]

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

@ -93,6 +93,7 @@ select json_type('{"k1":123, "k2":345}');
select json_type('[123, "k2", 345]'); select json_type('[123, "k2", 345]');
select json_type("true"); select json_type("true");
select json_type('123'); select json_type('123');
select json_type('123.12');
select json_keys('{"a":{"c":1, "d":2}, "b":2}'); select json_keys('{"a":{"c":1, "d":2}, "b":2}');
select json_keys('{"a":{"c":1, "d":2}, "b":2}', "$.a"); select json_keys('{"a":{"c":1, "d":2}, "b":2}', "$.a");

2
sql/item_jsonfunc.cc
View File

@ -1310,7 +1310,7 @@ String *Item_func_json_type::val_str(String *str)
type= "STRING"; type= "STRING";
break; break;
case JSON_VALUE_NUMBER: case JSON_VALUE_NUMBER:
type= "NUMBER"; type= (je.num_flags & JSON_NUM_FRAC_PART) ? "DOUBLE" : "INTEGER";
break; break;
case JSON_VALUE_TRUE: case JSON_VALUE_TRUE:
case JSON_VALUE_FALSE: case JSON_VALUE_FALSE:

16
strings/json_lib.c
View File

@ -477,13 +477,29 @@ static int json_num_states[NS_NUM_STATES][N_NUM_CLASSES]=
}; };
static uint json_num_state_flags[NS_NUM_STATES]=
{
/*OK*/ 0,
/*GO*/ 0,
/*GO1*/ JSON_NUM_NEG,
/*ZERO*/ 0,
/*ZE1*/ 0,
/*INT*/ 0,
/*FRAC*/ JSON_NUM_FRAC_PART,
/*EX*/ JSON_NUM_EXP,
/*EX1*/ 0,
};
static int skip_num_constant(json_engine_t *j) static int skip_num_constant(json_engine_t *j)
{ {
int state= json_num_states[NS_GO][json_num_chr_map[j->s.c_next]]; int state= json_num_states[NS_GO][json_num_chr_map[j->s.c_next]];
int c_len; int c_len;
j->num_flags= 0;
for (;;) for (;;)
{ {
j->num_flags|= json_num_state_flags[state];
if ((c_len= json_next_char(&j->s)) > 0) if ((c_len= json_next_char(&j->s)) > 0)
{ {
if ((state= json_num_states[state][json_num_chr_map[j->s.c_next]]) > 0) if ((state= json_num_states[state][json_num_chr_map[j->s.c_next]]) > 0)