Skip to content

M
MariaDB
Commit a3787358 authored by Michael Okoko's avatar Michael Okoko Committed by Sergei Petrunia
Browse files
Options

Fix garbage null values at end of json array elements 

Signed-off-by: default avatarMichael Okoko <okokomichaels@outlook.com>
parent 9954aecc
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 183 deletions
mysql-test/main/statistics_json.result
View file @ a3787358
......@@ -23,14 +23,14 @@ test t1 a 1 25 0.0000 4.0000 1.0000 10 JSON [
"3",
"5",
"7",
"10x~",
"12~",
"14P罣",
"16x",
"198",
"218",
"23"
]
"10",
"12",
"14",
"16",
"19",
"21",
"23"
]
test t1 b 1 9 0.0000 1.6400 1.0000 10 JSON [
"11",
"13",
......@@ -48,13 +48,13 @@ test t1 c 1 9 0.0000 2.0000 1.0000 10 JSON [
"13",
"15",
"18",
"2 ",
"2",
"21",
"23",
"3 ",
"5 ",
"7 "
]
"3",
"5",
"7"
]
test t1 d 1 25 0.0000 8.0000 1.0000 10 JSON [
"3",
"5",
......@@ -77,32 +77,59 @@ ANALYZE TABLE Country PERSISTENT FOR ALL;
SELECT column_name, min_value, max_value, hist_size, hist_type, histogram FROM mysql.column_stats;
column_name min_value max_value hist_size hist_type histogram
Code ABW ZWE 25 JSON [
"ARM United States Minor Outlying Islands ",
"BEL United States Minor Outlying Islands ",
"BLZ United States Minor Outlying Islands ",
"CAF United States Minor Outlying Islands ",
"COG United States Minor Outlying Islands ",
"CZE United States Minor Outlying Islands ",
"ERI United States Minor Outlying Islands ",
"FRO United States Minor Outlying Islands ",
"GMB United States Minor Outlying Islands ",
"GUY United States Minor Outlying Islands ",
"IRL United States Minor Outlying Islands ",
"KAZ United States Minor Outlying Islands ",
"LBN United States Minor Outlying Islands ",
"LVA United States Minor Outlying Islands ",
"MKD United States Minor Outlying Islands ",
"MUS United States Minor Outlying Islands ",
"NIC United States Minor Outlying Islands ",
"PAN United States Minor Outlying Islands ",
"PRT United States Minor Outlying Islands ",
"SAU United States Minor Outlying Islands ",
"SMR United States Minor Outlying Islands ",
"SYC United States Minor Outlying Islands ",
"TMP United States Minor Outlying Islands ",
"UKR United States Minor Outlying Islands ",
"VIR United States Minor Outlying Islands "
]Q(
"ARM",
"BEL",
"BLZ",
"CAF",
"COG",
"CZE",
"ERI",
"FRO",
"GMB",
"GUY",
"IRL",
"KAZ",
"LBN",
"LVA",
"MKD",
"MUS",
"NIC",
"PAN",
"PRT",
"SAU",
"SMR",
"SYC",
"TMP",
"UKR",
"VIR"
]0
Name Afghanistan Zimbabwe 25 JSON [
"Argentina",
"Barbados",
"Botswana",
"Cameroon",
"Cocos (Keeling) Islands",
"Czech Republic",
"El Salvador",
"France",
"Gibraltar",
"Guyana",
"Iran",
"Kenya",
"Libyan Arab Jamahiriya",
"Maldives",
"Micronesia, Federated States of",
"Nepal",
"Norfolk Island",
"Papua New Guinea",
"Romania",
"Samoa",
"Solomon Islands",
"Svalbard and Jan Mayen",
"Togo",
"Uganda",
"Venezuela"
]a
SurfaceArea 0.40 17075400.00 25 JSON [
"36.00",
"151.00",
......@@ -129,25 +156,25 @@ SurfaceArea 0.40 17075400.00 25 JSON [
"1104300.00",
"1648195.00",
"2724900.00"
]
]
Population 0 1277558000 25 JSON [
"1000"",
"8000O[U",
"25000",
"65000",
"94000",
"181000",
"293000",
"453000",
"817000",
"1439200",
"2542000",
"3337000",
"3869000",
"4807000",
"5496000",
"7430000",
"8861400",
"1000",
"8000",
"25000",
"65000",
"94000",
"181000",
"293000",
"453000",
"817000",
"1439200",
"2542000",
"3337000",
"3869000",
"4807000",
"5496000",
"7430000",
"8861400",
"10278100",
"11669000",
"16125000",
......@@ -156,71 +183,106 @@ Population 0 1277558000 25 JSON [
"40377000",
"61399000",
"111506000"
]
]
Capital 1 4074 25 JSON [
"62h#",
"149#",
"201#",
"553#",
"645#",
"902#",
"922#",
"1109#",
"1530#",
"1859#",
"2296#",
"2430#",
"2452#",
"2482#",
"2689#",
"2729#",
"2831#",
"2919#",
"3047#",
"3162#",
"3209#",
"3250#",
"3336#",
"3426#",
"3538#"
] ",
"Cameroon 
"62",
"149",
"201",
"553",
"645",
"902",
"922",
"1109",
"1530",
"1859",
"2296",
"2430",
"2452",
"2482",
"2689",
"2729",
"2831",
"2919",
"3047",
"3162",
"3209",
"3250",
"3336",
"3426",
"3538"
]
ID 1 4079 10 JSON [
"371r!",
"742!",
"1113!",
"1484!",
"1855"",
"2225*",
"2596*",
"2967*",
"3338*",
"3709+"
]
"371",
"742",
"1113",
"1484",
"1855",
"2225",
"2596",
"2967",
"3338",
"3709"
]
Name A Coruña (La Coruña) Århus 10 JSON [
"Berdytšiv",
"Clermont-Ferrand",
"Gatineau",
"Itapecerica da Serra",
"Kuytun",
"Milano",
"Ota",
"Roanoke",
"Split",
"Ulsan"
]
Country ABW ZWE 10 JSON [
"BRA tg",
"CHN tg",
"DZA tg",
"IDN tg",
"IND tg",
"JPN tg",
"MEX tg",
"PHL tg",
"RUS tg",
"USA tg"
] PSE tg
"BRA",
"CHN",
"DZA",
"IDN",
"IND",
"JPN",
"MEX",
"PHL",
"RUS",
"USA"
]
Population 42 10500000 10 JSON [
"96002",
"105819",
"118326",
"132318",
"152397",
"181900",
"221400",
"288173",
"398300",
"670208"
]!
"96002",
"105819",
"118326",
"132318",
"152397",
"181900",
"221400",
"288173",
"398300",
"670208"
]
Country ABW ZWE 10 JSON [
"BGD",
"CMR",
"ESP",
"GUF",
"KAZ",
"MDA",
"NAM",
"PNG",
"SVK",
"UGA"
]
Language Abhyasi [South]Mande 10 JSON [
"Bariba",
"Creole English",
"English",
"Georgiana",
"Italian",
"Lomwe",
"Moravian",
"Punjabi",
"Soga",
"Tigrinja"
]
Percentage 0.0 99.9 10 JSON [
"0.2",
"0.6",
......@@ -232,70 +294,7 @@ Percentage 0.0 99.9 10 JSON [
"17.7",
"45.5",
"87.5"
]1
Name Afghanistan Zimbabwe 25 JSON [
"Argentina ",
"Barbados ",
"Botswana ",
"Cameroon ",
"Cocos (Keeling) Islands ",
"Czech Republic ",
"El Salvador ",
"France ",
"Gibraltar ",
"Guyana ",
"Iran ",
"Kenya ",
"Libyan Arab Jamahiriya ",
"Maldives ",
"Micronesia, Federated States of ",
"Nepal ",
"Norfolk Island ",
"Papua New Guinea ",
"Romania ",
"Samoa ",
"Solomon Islands ",
"Svalbard and Jan Mayen ",
"Togo ",
"Uganda ",
"Venezuela "
]!
Name A Coruña (La Coruña) Århus 10 JSON [
"Berdytšiv PSE tg",
"Clermont-Ferrand PSE tg",
"Gatineau PSE tg",
"Itapecerica da Serra PSE tg",
"Kuytun PSE tg",
"Milano PSE tg",
"Ota PSE tg",
"Roanoke PSE tg",
"Split PSE tg",
"Ulsan PSE tg"
]A
Country ABW ZWE 10 JSON [
"BGD Portuguese L>",
"CMR Portuguese L>",
"ESP Portuguese L>",
"GUF Portuguese L>",
"KAZ Portuguese L>",
"MDA Portuguese L>",
"NAM Portuguese L>",
"PNG Portuguese L>",
"SVK Portuguese L>",
"UGA Portuguese L>"
]
Language Abhyasi [South]Mande 10 JSON [
"Bariba L>",
"Creole English L>",
"English L>",
"Georgiana L>",
"Italian L>",
"Lomwe L>",
"Moravian L>",
"Punjabi L>",
"Soga L>",
"Tigrinja L>"
]
]q
set histogram_type=@save_histogram_type;
set histogram_size=@save_histogram_size;
DROP SCHEMA world;
sql/sql_statistics.cc
View file @ a3787358
......@@ -1629,7 +1629,7 @@ std::vector<std::string> bucket_bounds;
column->store_field_value((uchar *) elem, col_length);
StringBuffer<MAX_FIELD_WIDTH> val;
column->val_str(&val);
bucket_bounds.emplace_back(val.ptr());
bucket_bounds.emplace_back(val.c_ptr());
curr_bucket++;
}
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7