firtst release
Revision | c1c3c56eb2ee8fb1fd46e062c94902f17043cc9f (tree) |
---|---|
Time | 2019-01-17 12:52:56 |
Author | Kyotaro Horiguchi <horiguchi.kyotaro@lab....> |
Commiter | Kyotaro Horiguchi |
Catch up with the latest master
Some refactoring of header files and commits afb0d0712f and 1db5667bac
of core hit this. Catch up with them.
@@ -1888,7 +1888,7 @@ error hint: | ||
1888 | 1888 | Filter: (ctid = '(1,1)'::tid) |
1889 | 1889 | -> Bitmap Index Scan on t4_pkey |
1890 | 1890 | Index Cond: (c1 = b1t2.c1) |
1891 | - InitPlan 2 (returns $4) | |
1891 | + InitPlan 2 (returns $5) | |
1892 | 1892 | -> Aggregate |
1893 | 1893 | -> Nested Loop |
1894 | 1894 | Join Filter: (b2t1.c1 = b2t4.c1) |
@@ -1908,7 +1908,7 @@ error hint: | ||
1908 | 1908 | -> Index Scan using t4_pkey on t4 b2t4 |
1909 | 1909 | Index Cond: (c1 = b2t2.c1) |
1910 | 1910 | Filter: (ctid = '(1,1)'::tid) |
1911 | - InitPlan 3 (returns $7) | |
1911 | + InitPlan 3 (returns $8) | |
1912 | 1912 | -> Aggregate |
1913 | 1913 | -> Nested Loop |
1914 | 1914 | Join Filter: (b3t1.c1 = b3t2.c1) |
@@ -1937,7 +1937,7 @@ error hint: | ||
1937 | 1937 | -> Nested Loop |
1938 | 1938 | Join Filter: (bmt1.c1 = bmt4.c1) |
1939 | 1939 | -> Seq Scan on t1 bmt1 |
1940 | - Filter: ((c1 <> $7) AND (ctid = '(1,1)'::tid)) | |
1940 | + Filter: ((c1 <> $8) AND (ctid = '(1,1)'::tid)) | |
1941 | 1941 | -> Tid Scan on t4 bmt4 |
1942 | 1942 | TID Cond: (ctid = '(1,1)'::tid) |
1943 | 1943 | -> Index Scan using t2_pkey on t2 bmt2 |
@@ -2078,18 +2078,18 @@ error hint: | ||
2078 | 2078 | Filter: (ctid = '(1,1)'::tid) |
2079 | 2079 | -> Bitmap Index Scan on t4_pkey |
2080 | 2080 | Index Cond: (c1 = b1t2.c1) |
2081 | - InitPlan 3 (returns $3) | |
2081 | + InitPlan 3 (returns $4) | |
2082 | 2082 | -> Result |
2083 | - InitPlan 2 (returns $2) | |
2083 | + InitPlan 2 (returns $3) | |
2084 | 2084 | -> Limit |
2085 | 2085 | -> Bitmap Heap Scan on t1 b2t1 |
2086 | 2086 | Recheck Cond: ((c1 IS NOT NULL) AND (c1 = 1)) |
2087 | 2087 | Filter: (ctid = '(1,1)'::tid) |
2088 | 2088 | -> Bitmap Index Scan on t1_pkey |
2089 | 2089 | Index Cond: ((c1 IS NOT NULL) AND (c1 = 1)) |
2090 | - InitPlan 5 (returns $5) | |
2090 | + InitPlan 5 (returns $6) | |
2091 | 2091 | -> Result |
2092 | - InitPlan 4 (returns $4) | |
2092 | + InitPlan 4 (returns $5) | |
2093 | 2093 | -> Limit |
2094 | 2094 | -> Index Scan Backward using t1_pkey on t1 b3t1 |
2095 | 2095 | Index Cond: (c1 IS NOT NULL) |
@@ -2103,7 +2103,7 @@ error hint: | ||
2103 | 2103 | -> Nested Loop |
2104 | 2104 | Join Filter: (bmt1.c1 = bmt4.c1) |
2105 | 2105 | -> Seq Scan on t1 bmt1 |
2106 | - Filter: ((c1 <> $5) AND (ctid = '(1,1)'::tid)) | |
2106 | + Filter: ((c1 <> $6) AND (ctid = '(1,1)'::tid)) | |
2107 | 2107 | -> Tid Scan on t4 bmt4 |
2108 | 2108 | TID Cond: (ctid = '(1,1)'::tid) |
2109 | 2109 | -> Index Scan using t2_pkey on t2 bmt2 |
@@ -10,6 +10,8 @@ | ||
10 | 10 | #include <string.h> |
11 | 11 | |
12 | 12 | #include "postgres.h" |
13 | +#include "access/genam.h" | |
14 | +#include "access/heapam.h" | |
13 | 15 | #include "catalog/pg_collation.h" |
14 | 16 | #include "catalog/pg_index.h" |
15 | 17 | #include "commands/prepare.h" |
@@ -18,6 +20,7 @@ | ||
18 | 20 | #include "nodes/nodeFuncs.h" |
19 | 21 | #include "nodes/params.h" |
20 | 22 | #include "nodes/relation.h" |
23 | +#include "optimizer/appendinfo.h" | |
21 | 24 | #include "optimizer/clauses.h" |
22 | 25 | #include "optimizer/cost.h" |
23 | 26 | #include "optimizer/geqo.h" |
@@ -825,8 +825,8 @@ fill_in_constant_lengths(pgssJumbleState *jstate, const char *query, | ||
825 | 825 | /* initialize the flex scanner --- should match raw_parser() */ |
826 | 826 | yyscanner = scanner_init(query, |
827 | 827 | &yyextra, |
828 | - ScanKeywords, | |
829 | - NumScanKeywords); | |
828 | + &ScanKeywords, | |
829 | + ScanKeywordTokens); | |
830 | 830 | |
831 | 831 | /* we don't want to re-emit any escape string warnings */ |
832 | 832 | yyextra.escape_string_warning = false; |