Skip to content

Commit be38150

Browse files
author
James William Pye
committed
Checkin partial work for org change.
1 parent a4f8bd8 commit be38150

16 files changed

+359
-86
lines changed

‎GNUmakefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ DATA := python--$(project_version).sql
99

1010
OBJS = src/extension.o \
1111
src/pl.o src/do.o src/stateful.o \
12+
src/fdw.o \
1213
src/python.o src/postgres.o \
1314
src/module.o \
1415
src/errordata.o src/triggerdata.o \
@@ -26,7 +27,7 @@ src/type/numeric.o \
2627
src/type/timewise.o \
2728
src/type/bitwise.o
2829

29-
REGRESS = init io srf function trigger xact error domain enum ifmod array composite spi polymorphic materialize_cursor lo bytea pytypes timewise stateful type typmod do preload tupledesc corners environment oid cache
30+
REGRESS = init io srf function trigger xact error domain enum ifmod array composite spi polymorphic materialize_cursor lo bytea pytypes timewise stateful type typmod do preload tupledesc corners environment oid cache fdw
3031

3132
# PGXS built by the configure script
3233
include build/cache/postgres.mk

‎build/probes/inline_code_blocks.c

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#include "postgres.h"
22
#include "fmgr.h"
3-
//#include "access/htup.h"
4-
//#include "access/tupdesc.h"
5-
//#include "access/transam.h"
6-
//#include "catalog/pg_proc.h"
7-
//#include "catalog/pg_type.h"
83
#include "storage/itemptr.h"
94
#include "nodes/parsenodes.h"
105

‎build/tools/pgxn.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"abstract": project.abstract,
1212
"description": "",
1313
"version": project.version,
14-
"maintainer": [project.author],
14+
"maintainer": [project.meaculpa],
1515
"license": "bsd",
1616
"provides": {
1717
"python": {

‎configure

+1-6
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@ echo >&2 `(python3 -c 'import sys; print(sys.version.replace("\n",""))')`
5656
python3 build/tools/config.py >build/cache/python.mk
5757

5858
project_version=`python3 -c 'import sys; sys.path.append("./src"); import project; print(project.version)'`
59-
if test $system = 'pg_8_4' -o $system = 'pg_8_3'
60-
then
61-
cp src/install_no_inline.sql python--$project_version.sql
62-
else
63-
cp src/install_inline.sql python--$project_version.sql
64-
fi
59+
cp src/install.sql python--$project_version.sql
6560

6661
cat >python.control <<EOF
6762
default_version='$project_version'

‎src/fdw.c

+223
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
/*
2+
* FDW Support
3+
*/
4+
#include <setjmp.h>
5+
6+
#define PY_SSIZE_T_CLEAN
7+
#include <Python.h>
8+
#include <compile.h>
9+
#include <structmember.h>
10+
11+
#include "postgres.h"
12+
#include "fmgr.h"
13+
#include "funcapi.h"
14+
#include "libpq/libpq-be.h"
15+
#include "libpq/pqsignal.h"
16+
#include "miscadmin.h"
17+
#include "access/htup.h"
18+
#include "access/heapam.h"
19+
#include "access/xact.h"
20+
#include "access/transam.h"
21+
#include "catalog/namespace.h"
22+
#include "catalog/pg_class.h"
23+
#include "catalog/pg_database.h"
24+
#include "catalog/pg_proc.h"
25+
#include "catalog/pg_type.h"
26+
#include "catalog/pg_foreign_data_wrapper.h"
27+
#include "catalog/pg_foreign_server.h"
28+
#include "catalog/pg_foreign_table.h"
29+
#include "catalog/pg_user_mapping.h"
30+
#include "catalog/indexing.h"
31+
#include "storage/block.h"
32+
#include "storage/off.h"
33+
#include "storage/ipc.h"
34+
#include "commands/explain.h"
35+
#include "executor/spi.h"
36+
#include "nodes/memnodes.h"
37+
#include "tcop/tcopprot.h"
38+
#include "utils/memutils.h"
39+
#include "utils/array.h"
40+
#include "utils/datum.h"
41+
#include "utils/elog.h"
42+
#include "utils/builtins.h"
43+
#include "utils/hsearch.h"
44+
#include "utils/syscache.h"
45+
#include "utils/relcache.h"
46+
#include "utils/typcache.h"
47+
#include "mb/pg_wchar.h"
48+
49+
#include "foreign/foreign.h"
50+
#include "foreign/fdwapi.h"
51+
52+
#include "pypg/python.h"
53+
#include "pypg/postgres.h"
54+
#include "pypg/extension.h"
55+
#include "pypg/pl.h"
56+
#include "pypg/fdw.h"
57+
#include "pypg/errordata.h"
58+
#include "pypg/errcodes.h"
59+
#include "pypg/error.h"
60+
#include "pypg/type/type.h"
61+
#include "pypg/type/object.h"
62+
#include "pypg/type/record.h"
63+
#include "pypg/type/array.h"
64+
#include "pypg/type/bitwise.h"
65+
#include "pypg/type/numeric.h"
66+
#include "pypg/type/string.h"
67+
#include "pypg/type/system.h"
68+
#include "pypg/type/timewise.h"
69+
#include "pypg/tupledesc.h"
70+
#include "pypg/statement.h"
71+
#include "pypg/cursor.h"
72+
#include "pypg/module.h"
73+
74+
static void
75+
size(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid)
76+
{
77+
78+
}
79+
80+
static void
81+
paths(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid)
82+
{
83+
84+
}
85+
86+
static ForeignScan *
87+
init(
88+
PlannerInfo *root,
89+
RelOptInfo *baserel,
90+
Oid foreigntableid,
91+
ForeignPath *best_path,
92+
List *tlist, List *scan_clauses)
93+
{
94+
return(NULL);
95+
}
96+
97+
static void
98+
explain(ForeignScanState *node, ExplainState *es)
99+
{
100+
;
101+
}
102+
103+
static void
104+
begin(ForeignScanState *node, int eflags)
105+
{
106+
;
107+
}
108+
109+
static TupleTableSlot *
110+
iterate(ForeignScanState *node)
111+
{
112+
return(NULL);
113+
}
114+
115+
static void
116+
restart(ForeignScanState *node)
117+
{
118+
119+
}
120+
121+
static void
122+
end(ForeignScanState *node)
123+
{
124+
;
125+
}
126+
127+
#if PG_VERSION_NUM >= 902000
128+
static int
129+
sample(
130+
Relation relation, int elevel,
131+
HeapTuple *rows, int targrows,
132+
double *totalrows, double *totaldeadrows)
133+
{
134+
*totaldeadrows = 0;
135+
136+
return(0);
137+
}
138+
139+
static bool
140+
analyze(Relation relation, AcquireSampleRowsFunc *func, BlockNumber *totalpages)
141+
{
142+
*func = sample;
143+
return(true);
144+
}
145+
#endif
146+
147+
PG_FUNCTION_INFO_V1(fdw_validator);
148+
Datum
149+
fdw_validator(PG_FUNCTION_ARGS)
150+
{
151+
Datum options;
152+
Oid catalog = PG_GETARG_OID(1);
153+
154+
if (ext_state == init_pending)
155+
ext_entry();
156+
157+
/*
158+
* XXX: pass onto the implementation's validator.
159+
*/
160+
161+
options = PG_GETARG_DATUM(0);
162+
163+
switch (catalog)
164+
{
165+
case ForeignDataWrapperRelationId:
166+
break;
167+
case ForeignServerRelationId:
168+
break;
169+
case UserMappingRelationId:
170+
break;
171+
case ForeignTableRelationId:
172+
break;
173+
}
174+
175+
PG_RETURN_BOOL(1);
176+
}
177+
178+
/*
179+
* fdw_handler - initialize the fdw structure
180+
*/
181+
PG_FUNCTION_INFO_V1(fdw_handler);
182+
Datum
183+
fdw_handler(PG_FUNCTION_ARGS)
184+
{
185+
struct FDWR *fdwr;
186+
187+
if (ext_state == init_pending)
188+
ext_entry();
189+
190+
fdwr = palloc0(sizeof(struct FDWR));
191+
/*
192+
* Set to ext_xact_count when the pointer here is actually valid.
193+
*
194+
* Ultimately identifies whether or not the Python object
195+
* can be referenced.
196+
*/
197+
fdwr->ext_xact = 0;
198+
fdwr->implementation = NULL;
199+
200+
/*
201+
* Would use makeNode, but Python is going to store some
202+
* handler data here.
203+
*
204+
* Notably, a reference to the implementation.
205+
* However, there's no access to the actual FDW object here;
206+
* so leave it empty for the time being.
207+
*/
208+
nodeTag(fdwr) = T_FdwRoutine;
209+
210+
fdwr->node.PlanForeignScan = init;
211+
fdwr->node.ExplainForeignScan = explain;
212+
fdwr->node.BeginForeignScan = begin;
213+
fdwr->node.IterateForeignScan = iterate;
214+
fdwr->node.ReScanForeignScan = restart;
215+
fdwr->node.EndForeignScan = end;
216+
#if PG_VERSION_NUM >= 902000
217+
fdwr->node.AnalyzeForeignTable = analyze;
218+
fdwr->node.GetForeignRelSize = size;
219+
fdwr->node.GetForeignPaths = paths;
220+
#endif
221+
222+
PG_RETURN_POINTER(fdwr);
223+
}

‎src/include/pypg/extension.h

-7
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ typedef enum {
4141
*/
4242
xact_failed = 1,
4343

44-
/*
45-
* Execution is occurring in a Foreign Data Wrapper.
46-
*
47-
* This state prohibits database calls.
48-
*/
49-
fdw_exec = 2,
50-
5144
/*
5245
* An unnatural state used to indicate two things:
5346
* 1. on_proc_exit handler has been called

‎src/include/pypg/fdw.h

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* fdw prototypes
3+
*/
4+
#ifndef PyPg_fdw_H
5+
#define PyPg_fdw_H 0
6+
#ifdef __cplusplus
7+
extern "C" {
8+
#endif
9+
10+
/*
11+
* Not allocated or referenced by Python code.
12+
*/
13+
struct FDWR {
14+
FdwRoutine node;
15+
/*
16+
* The actual FDW implementation.
17+
*/
18+
PyObj implementation;
19+
/* ext_xact when assigned to TransactionScope */
20+
unsigned long ext_xact;
21+
};
22+
23+
Datum fdw_validator(PG_FUNCTION_ARGS);
24+
Datum fdw_handler(PG_FUNCTION_ARGS);
25+
26+
#ifdef __cplusplus
27+
}
28+
#endif
29+
#endif /* !PyPg_fdw_H */

‎src/install.sql

+16-29
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,25 @@
1-
BEGIN;
2-
CREATE SCHEMA __python__;
3-
SET search_path = __python__;
1+
-- PL Support
42

53
CREATE FUNCTION
6-
"handler"()
7-
RETURNS LANGUAGE_HANDLER LANGUAGE C AS 'python', 'pl_handler';
4+
"pl_handler" ()
5+
RETURNS LANGUAGE_HANDLER LANGUAGE C AS 'python';
86

97
CREATE FUNCTION
10-
"validator"(oid)
11-
RETURNS VOID LANGUAGE C AS 'python', 'pl_validator';
12-
COMMIT;
8+
"pl_validator" (OID)
9+
RETURNS VOID LANGUAGE C AS 'python';
1310

14-
BEGIN;
15-
SET search_path = __python__;
16-
-- It's okay if this fails on versions before 9.0.
1711
CREATE FUNCTION
18-
"inline"(INTERNAL)
19-
RETURNS VOID LANGUAGE C AS 'python', 'pl_inline';
12+
"pl_inline" (INTERNAL)
13+
RETURNS VOID LANGUAGE C AS 'python';
2014

21-
CREATE LANGUAGE python HANDLER "handler" INLINE "inline" VALIDATOR "validator";
22-
COMMIT;
15+
CREATE LANGUAGE python HANDLER "pl_handler" INLINE "pl_inline" VALIDATOR "pl_validator";
2316

24-
-- This should not fail if the one above does.
25-
CREATE LANGUAGE python HANDLER "handler" VALIDATOR "validator";
17+
-- FDW Support
2618

27-
-- Finish with an explicit check.
28-
BEGIN;
29-
CREATE OR REPLACE FUNCTION test_python() RETURNS text LANGUAGE 'python' AS
30-
$$
31-
import Postgres
32-
import sys
33-
def main():
34-
return "Python " + sys.version + "\n\nLanguage installed successfully."
35-
$$;
36-
SELECT test_python();
37-
-- Don't want these changes.
38-
ABORT;
19+
CREATE OR REPLACE FUNCTION
20+
"fdw_handler" ()
21+
RETURNS FDW_HANDLER LANGUAGE C AS 'python';
22+
23+
CREATE FUNCTION
24+
"fdw_validator" (TEXT[], OID)
25+
RETURNS BOOL LANGUAGE C AS 'python';

‎src/install_inline.sql

-13
This file was deleted.

‎src/install_no_inline.sql

-9
This file was deleted.

0 commit comments

Comments
 (0)