sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-02 00:01:40 -04:00
Code Issues Projects Releases Wiki Activity

Prevent CRLF conversion of inputs in json_parser test module

Browse Source 
Do this by opening the file in PG_BINARY_R mode. This prevents us from
getting wrong byte count from stat().

Per complaint from Andres Freund

Discussion: https://postgr.es/m/20240707052030.r77hbdkid3mwksop@awork3.anarazel.de

Backpatch to rlease 17 where this code was introduced
This commit is contained in:
Andrew Dunstan 2024-07-09 17:29:48 -04:00
parent 896cd266fd
commit f7bd0a381d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/modules/test_json_parser/test_json_parser_incremental.c
View File

@ -124,7 +124,7 @@ main(int argc, char **argv)
makeJsonLexContextIncremental(&lex, PG_UTF8, need_strings); makeJsonLexContextIncremental(&lex, PG_UTF8, need_strings);
initStringInfo(&json); initStringInfo(&json);
if ((json_file = fopen(testfile, "r")) == NULL) if ((json_file = fopen(testfile, PG_BINARY_R)) == NULL)
pg_fatal("error opening input: %m"); pg_fatal("error opening input: %m");
if (fstat(fileno(json_file), &statbuf) != 0) if (fstat(fileno(json_file), &statbuf) != 0)

2
src/test/modules/test_json_parser/test_json_parser_perf.c
View File

@ -55,7 +55,7 @@ main(int argc, char **argv)
sscanf(argv[1], "%d", &iter); sscanf(argv[1], "%d", &iter);
if ((json_file = fopen(argv[2], "r")) == NULL) if ((json_file = fopen(argv[2], PG_BINARY_R)) == NULL)
pg_fatal("Could not open input file '%s': %m", argv[2]); pg_fatal("Could not open input file '%s': %m", argv[2]);
while ((n_read = fread(buff, 1, 6000, json_file)) > 0) while ((n_read = fread(buff, 1, 6000, json_file)) > 0)