aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2024-04-04 12:41:55 -0400
committerAndrew Dunstan <andrew@dunslane.net>2024-04-04 12:41:55 -0400
commit88620824c2a62376e224c4b595b9fe69fb858978 (patch)
tree905c12fb21fc15cb998a01570d4b886ea3e4316a
parent1b00fe30a67774e55c5fc776096a3c96f1a147d2 (diff)
downloadpostgresql-88620824c2a62376e224c4b595b9fe69fb858978.tar.gz
postgresql-88620824c2a62376e224c4b595b9fe69fb858978.zip
Tidy up after incremental JSON parser patch
Remove junk left over from non-vpath builds. Try to remedy gettext error on some platforms.
-rw-r--r--src/common/jsonapi.c4
-rw-r--r--src/test/modules/test_json_parser/.gitignore3
-rw-r--r--src/test/modules/test_json_parser/Makefile5
3 files changed, 10 insertions, 2 deletions
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 0bc3e426b20..5f947dd6182 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -2112,9 +2112,9 @@ json_errdetail(JsonParseErrorType error, JsonLexContext *lex)
break;
case JSON_INVALID_LEXER_TYPE:
if (lex->incremental)
- return (_("Recursive descent parser cannot use incremental lexer"));
+ return _("Recursive descent parser cannot use incremental lexer");
else
- return (_("Incremental parser requires incremental lexer"));
+ return _("Incremental parser requires incremental lexer");
case JSON_NESTING_TOO_DEEP:
return (_("JSON nested too deep, maximum permitted depth is 6400"));
case JSON_ESCAPING_INVALID:
diff --git a/src/test/modules/test_json_parser/.gitignore b/src/test/modules/test_json_parser/.gitignore
new file mode 100644
index 00000000000..2c176672db7
--- /dev/null
+++ b/src/test/modules/test_json_parser/.gitignore
@@ -0,0 +1,3 @@
+tmp_check
+test_json_parser_perf
+test_json_parser_incremental
diff --git a/src/test/modules/test_json_parser/Makefile b/src/test/modules/test_json_parser/Makefile
index 04350c68dba..a717b6f7add 100644
--- a/src/test/modules/test_json_parser/Makefile
+++ b/src/test/modules/test_json_parser/Makefile
@@ -17,6 +17,8 @@ include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
endif
+.PHONY: clean
+
all: test_json_parser_incremental$(X) test_json_parser_perf$(X)
%.o: $(top_srcdir)/$(subdir)/%.c
@@ -34,3 +36,6 @@ speed-check: test_json_parser_perf$(X)
time ./test_json_parser_perf 10000 $(top_srcdir)/$(subdir)/tiny.json
@echo Incremental parser:
time ./test_json_parser_perf -i 10000 $(top_srcdir)/$(subdir)/tiny.json
+
+clean:
+ rm -rf test_json_parser_perf test_json_parser_incremental tmp_check $(OBJS)