Update version number and fix regression test expected output.

ossc-db · Nov 16, 2016 · 3f3cd99 · 3f3cd99
1 parent b73605a
commit 3f3cd99
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 69 deletions.
diff --git a/bin/data/adjust.awk b/bin/data/adjust.awk
@@ -1 +1,19 @@
-BEGIN {FS="/"}{if(NF>2){sub(" [a-zA-z]:.*$"," ",$1);print $1 ".../" $NF}else{sub(" on .*$", " on <TIMESTAMP>");gsub("[0-9]+\\.[0-9][0-9]", "<TIME>");print}}
+BEGIN \
+{\
+	FS="/" \
+}\
+{\
+	if (NF > 2) \
+	{\
+		gsub(" [a-zA-z]:.*$"," ",$1);\
+		print $1 ".../" $NF\
+	}\
+	else\
+	{\
+		gsub(" on .*$", " on <TIMESTAMP>");\
+		gsub("CPU [0-9]+\\.[0-9][0-9]", "CPU <TIME>");\
+		gsub("/[0-9]+\\.[0-9][0-9]", "/<TIME>");\
+		gsub("elapsed [0-9]+\\.[0-9][0-9]", "elapsed <TIME>");\
+		print\
+	}\
+}\
diff --git a/bin/expected/load_bin.out b/bin/expected/load_bin.out
@@ -42,7 +42,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin1.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data1.bin
 PARSE_BADFILE = .../bin1.prs
@@ -136,7 +136,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin2.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.bin
 PARSE_BADFILE = .../bin2.prs
@@ -251,7 +251,7 @@ NOTICE: BULK LOAD END
 	4 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin3.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.bin
 PARSE_BADFILE = .../bin3.prs
@@ -366,7 +366,7 @@ NOTICE: BULK LOAD END
 	4 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin4.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../bin3.dup
 PARSE_BADFILE = .../bin4.prs
@@ -464,7 +464,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/bin5.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../bin4.dup
 PARSE_BADFILE = .../bin5.prs
@@ -559,7 +559,7 @@ ERROR: query failed: ERROR:  integer out of range
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/bin6.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data3.bin
 PARSE_BADFILE = .../bin6.prs
@@ -621,7 +621,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/bin7.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data3.bin
 PARSE_BADFILE = .../bin7.prs
@@ -744,7 +744,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin8.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data1.bin
 PARSE_BADFILE = .../pbfile
@@ -806,7 +806,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin9.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data1.bin
 PARSE_BADFILE = .../pbfile
@@ -868,7 +868,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin10.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = stdin
 PARSE_BADFILE = .../bin5.prs
@@ -931,7 +931,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin11.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = stdin
 PARSE_BADFILE = .../bin5.prs
@@ -1019,7 +1019,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin12.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = Stdin
 PARSE_BADFILE = .../bin12.prs
@@ -1114,7 +1114,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/bin13.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = Stdin
 PARSE_BADFILE = .../bin13.prs

diff --git a/bin/expected/load_check.out b/bin/expected/load_check.out
@@ -9,7 +9,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check1.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check1.prs
@@ -74,12 +74,40 @@ SELECT * FROM target ORDER BY id;
   7 | fff        |      7
 (5 rows)
 
-\! pg_bulkload -d contrib_regression data/csv7.ctl -i data/data5.csv -l results/check2.log -P results/check2.prs -u results/check2.dup -o "PARSE_ERRORS=-1" -o CHECK_CONSTRAINTS=O
+\! pg_bulkload -d contrib_regression data/csv7.ctl -i data/data5.csv -l results/check2.log -P results/check2.prs -u results/check2.dup -o "PARSE_ERRORS=-1" -o CHECK_CONSTRAINTS=NO
 NOTICE: BULK LOAD START
-ERROR: query failed: ERROR:  invalid input syntax for type boolean: "O"
+ERROR: query failed: ERROR:  could not create unique index "target_pkey"
+DETAIL:  Key (id)=(1) is duplicated.
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/check2.log
-awk: data/adjust.awk:1: fatal: cannot open file `results/check2.log' for reading (No such file or directory)
+
+pg_bulkload 3.1.12 on <TIMESTAMP>
+
+INPUT = .../data5.csv
+PARSE_BADFILE = .../check2.prs
+LOGFILE = .../check2.log
+LIMIT = INFINITE
+PARSE_ERRORS = INFINITE
+CHECK_CONSTRAINTS = NO
+TYPE = CSV
+SKIP = 0
+DELIMITER = ,
+QUOTE = "\""
+ESCAPE = "\""
+NULL = 
+OUTPUT = public.target
+MULTI_PROCESS = YES
+VERBOSE = NO
+WRITER = DIRECT
+DUPLICATE_BADFILE = .../check2.dup
+DUPLICATE_ERRORS = 0
+ON_DUPLICATE_KEEP = NEW
+TRUNCATE = YES
+
+Parse error Record 1: Input Record 3: Rejected - column 2. null value in column "str" violates not-null constraint
+Parse error Record 2: Input Record 6: Rejected - column 1. null value in column "id" violates not-null constraint
+Parse error Record 3: Input Record 9: Rejected - column 1. null value in column "id" violates not-null constraint
+could not create unique index "target_pkey"
 SET enable_seqscan = on;
 SET enable_indexscan = off;
 SET enable_bitmapscan = off;
@@ -117,7 +145,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check3.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check3.prs
@@ -192,7 +220,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/check4.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data5.csv
 PARSE_BADFILE = .../check4.prs

diff --git a/bin/expected/load_csv.out b/bin/expected/load_csv.out
@@ -14,7 +14,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/csv1.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data1.csv
 PARSE_BADFILE = .../csv1.prs
@@ -85,7 +85,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/csv1-2.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data1.csv
 PARSE_BADFILE = .../csv1-2.prs
@@ -151,7 +151,7 @@ ERROR: query failed: ERROR:  Maximum duplicate error count exceeded
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/csv2.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.csv
 PARSE_BADFILE = .../csv2.prs
@@ -214,7 +214,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/csv3.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.csv
 PARSE_BADFILE = .../csv3.prs
@@ -298,7 +298,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/csv4.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.csv
 PARSE_BADFILE = .../csv4.prs
@@ -351,7 +351,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/csv5.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data2.csv
 PARSE_BADFILE = .../csv5.prs
@@ -433,7 +433,7 @@ ERROR: query failed: ERROR:  integer out of range
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/csv6.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data3.csv
 PARSE_BADFILE = .../csv6.prs
@@ -483,7 +483,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/csv7.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data3.csv
 PARSE_BADFILE = .../csv7.prs

diff --git a/bin/expected/load_encoding_1.out b/bin/expected/load_encoding_1.out
@@ -10,7 +10,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/encoding1.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.csv
 PARSE_BADFILE = .../encoding1.prs
@@ -83,7 +83,7 @@ NOTICE: BULK LOAD START
 ERROR: query failed: ERROR:  invalid encoding for parameter "ENCODING": "UTF0"
 DETAIL: query was: SELECT * FROM pg_bulkload($1)
 \! awk -f data/adjust.awk results/encoding2.log
-awk: data/adjust.awk:1: fatal: cannot open file `results/encoding2.log' for reading (No such file or directory)
+awk: data/adjust.awk:4: fatal: cannot open file `results/encoding2.log' for reading (No such file or directory)
 SET enable_seqscan = on;
 SET enable_indexscan = off;
 SET enable_bitmapscan = off;
@@ -129,7 +129,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/encoding3.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.csv
 PARSE_BADFILE = .../encoding3.prs
@@ -199,7 +199,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/encoding4.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.csv
 PARSE_BADFILE = .../encoding4.prs
@@ -272,7 +272,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/encoding5.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.csv
 PARSE_BADFILE = .../encoding5.prs
@@ -350,7 +350,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/encoding6.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.csv
 PARSE_BADFILE = .../encoding6.prs

diff --git a/bin/expected/load_filter_2.out b/bin/expected/load_filter_2.out
@@ -143,7 +143,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter1.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter1.prs
@@ -217,7 +217,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter2.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter2.prs
@@ -291,7 +291,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter3.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data6.csv
 PARSE_BADFILE = .../filter3.prs
@@ -359,7 +359,7 @@ NOTICE: BULK LOAD END
 	0 Rows replaced with new rows.
 \! awk -f data/adjust.awk results/filter4.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data7.csv
 PARSE_BADFILE = .../filter4.prs
@@ -431,7 +431,7 @@ NOTICE: BULK LOAD END
 WARNING: some rows were not loaded due to errors.
 \! awk -f data/adjust.awk results/filter5.log
 
-pg_bulkload 3.1.9 on <TIMESTAMP>
+pg_bulkload 3.1.12 on <TIMESTAMP>
 
 INPUT = .../data4.bin
 PARSE_BADFILE = .../filter5.prs