From c1c3c56eb2ee8fb1fd46e062c94902f17043cc9f Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Wed, 16 Jan 2019 17:28:47 +0900 Subject: [PATCH] Catch up with the latest master Some refactoring of header files and commits afb0d0712f and 1db5667bac of core hit this. Catch up with them. --- expected/ut-S.out | 16 ++++++++-------- pg_hint_plan.c | 3 +++ pg_stat_statements.c | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/expected/ut-S.out b/expected/ut-S.out index 6f1342f..e8dae59 100644 --- a/expected/ut-S.out +++ b/expected/ut-S.out @@ -1888,7 +1888,7 @@ error hint: Filter: (ctid = '(1,1)'::tid) -> Bitmap Index Scan on t4_pkey Index Cond: (c1 = b1t2.c1) - InitPlan 2 (returns $4) + InitPlan 2 (returns $5) -> Aggregate -> Nested Loop Join Filter: (b2t1.c1 = b2t4.c1) @@ -1908,7 +1908,7 @@ error hint: -> Index Scan using t4_pkey on t4 b2t4 Index Cond: (c1 = b2t2.c1) Filter: (ctid = '(1,1)'::tid) - InitPlan 3 (returns $7) + InitPlan 3 (returns $8) -> Aggregate -> Nested Loop Join Filter: (b3t1.c1 = b3t2.c1) @@ -1937,7 +1937,7 @@ error hint: -> Nested Loop Join Filter: (bmt1.c1 = bmt4.c1) -> Seq Scan on t1 bmt1 - Filter: ((c1 <> $7) AND (ctid = '(1,1)'::tid)) + Filter: ((c1 <> $8) AND (ctid = '(1,1)'::tid)) -> Tid Scan on t4 bmt4 TID Cond: (ctid = '(1,1)'::tid) -> Index Scan using t2_pkey on t2 bmt2 @@ -2078,18 +2078,18 @@ error hint: Filter: (ctid = '(1,1)'::tid) -> Bitmap Index Scan on t4_pkey Index Cond: (c1 = b1t2.c1) - InitPlan 3 (returns $3) + InitPlan 3 (returns $4) -> Result - InitPlan 2 (returns $2) + InitPlan 2 (returns $3) -> Limit -> Bitmap Heap Scan on t1 b2t1 Recheck Cond: ((c1 IS NOT NULL) AND (c1 = 1)) Filter: (ctid = '(1,1)'::tid) -> Bitmap Index Scan on t1_pkey Index Cond: ((c1 IS NOT NULL) AND (c1 = 1)) - InitPlan 5 (returns $5) + InitPlan 5 (returns $6) -> Result - InitPlan 4 (returns $4) + InitPlan 4 (returns $5) -> Limit -> Index Scan Backward using t1_pkey on t1 b3t1 Index Cond: (c1 IS NOT NULL) @@ -2103,7 +2103,7 @@ error hint: -> Nested Loop Join Filter: (bmt1.c1 = bmt4.c1) -> Seq Scan on t1 bmt1 - Filter: ((c1 <> $5) AND (ctid = '(1,1)'::tid)) + Filter: ((c1 <> $6) AND (ctid = '(1,1)'::tid)) -> Tid Scan on t4 bmt4 TID Cond: (ctid = '(1,1)'::tid) -> Index Scan using t2_pkey on t2 bmt2 diff --git a/pg_hint_plan.c b/pg_hint_plan.c index 15fc8a1..0c5f886 100644 --- a/pg_hint_plan.c +++ b/pg_hint_plan.c @@ -10,6 +10,8 @@ #include #include "postgres.h" +#include "access/genam.h" +#include "access/heapam.h" #include "catalog/pg_collation.h" #include "catalog/pg_index.h" #include "commands/prepare.h" @@ -18,6 +20,7 @@ #include "nodes/nodeFuncs.h" #include "nodes/params.h" #include "nodes/relation.h" +#include "optimizer/appendinfo.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/geqo.h" diff --git a/pg_stat_statements.c b/pg_stat_statements.c index 8f74903..6566d3b 100644 --- a/pg_stat_statements.c +++ b/pg_stat_statements.c @@ -825,8 +825,8 @@ fill_in_constant_lengths(pgssJumbleState *jstate, const char *query, /* initialize the flex scanner --- should match raw_parser() */ yyscanner = scanner_init(query, &yyextra, - ScanKeywords, - NumScanKeywords); + &ScanKeywords, + ScanKeywordTokens); /* we don't want to re-emit any escape string warnings */ yyextra.escape_string_warning = false; -- 2.11.0