Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3ab8b7f

Browse files
committed
Fix/improve bytea and boolean support in PL/Python
Before, PL/Python converted data between SQL and Python by goingthrough a C string representation. This broke for bytea in two ways:- On input (function parameters), you would get a Python string that contains bytea's particular external representation with backslashes etc., instead of a sequence of bytes, which is what you would expect in a Python environment. This problem is exacerbated by the new bytea output format.- On output (function return value), null bytes in the Python string would cause truncation before the data gets stored into a bytea datum.This is now fixed by converting directly between the PostgreSQL datumand the Python representation.The required generalized infrastructure also allows for otherimprovements in passing:- When returning a boolean value, the SQL datum is now true if and only if Python considers the value that was passed out of the PL/Python function to be true. Previously, this determination was left to the boolean data type input function. So, now returning 'foo' results in true, because Python considers it true, rather than false because PostgreSQL considers it false.- On input, we can convert the integer and float types directly to their Python equivalents without having to go through an intermediate string representation.original patch by Caleb Welton, with updates by myself
1 parent255f66e commit3ab8b7f

File tree

5 files changed

+454
-145
lines changed

5 files changed

+454
-145
lines changed

‎src/backend/utils/adt/domains.c

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
*
2727
* IDENTIFICATION
28-
* $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.8 2009/01/01 17:23:49 momjian Exp $
28+
* $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.9 2009/09/09 19:00:09 petere Exp $
2929
*
3030
*-------------------------------------------------------------------------
3131
*/
@@ -302,3 +302,40 @@ domain_recv(PG_FUNCTION_ARGS)
302302
else
303303
PG_RETURN_DATUM(value);
304304
}
305+
306+
/*
307+
* domain_check - check that a datum satisfies the constraints of a
308+
* domain. extra and mcxt can be passed if they are available from,
309+
* say, a FmgrInfo structure, or they can be NULL, in which case the
310+
* setup is repeated for each call.
311+
*/
312+
void
313+
domain_check(Datumvalue,boolisnull,OiddomainType,void**extra,MemoryContextmcxt)
314+
{
315+
DomainIOData*my_extra=NULL;
316+
317+
if (mcxt==NULL)
318+
mcxt=CurrentMemoryContext;
319+
320+
/*
321+
* We arrange to look up the needed info just once per series of calls,
322+
* assuming the domain type doesn't change underneath us.
323+
*/
324+
if (extra)
325+
my_extra= (DomainIOData*)*extra;
326+
if (my_extra==NULL)
327+
{
328+
my_extra= (DomainIOData*)MemoryContextAlloc(mcxt,
329+
sizeof(DomainIOData));
330+
domain_state_setup(my_extra,domainType, true,mcxt);
331+
if (extra)
332+
*extra= (void*)my_extra;
333+
}
334+
elseif (my_extra->domain_type!=domainType)
335+
domain_state_setup(my_extra,domainType, true,mcxt);
336+
337+
/*
338+
* Do the necessary checks to ensure it's a valid domain value.
339+
*/
340+
domain_check_input(value,isnull,my_extra);
341+
}

‎src/include/utils/builtins.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.338 2009/08/04 16:08:36 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.339 2009/09/09 19:00:09 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -137,6 +137,7 @@ extern Datum char_text(PG_FUNCTION_ARGS);
137137
/* domains.c */
138138
externDatumdomain_in(PG_FUNCTION_ARGS);
139139
externDatumdomain_recv(PG_FUNCTION_ARGS);
140+
externvoiddomain_check(Datumvalue,boolisnull,OiddomainType,void**extra,MemoryContextmcxt);
140141

141142
/* encode.c */
142143
externDatumbinary_encode(PG_FUNCTION_ARGS);

‎src/pl/plpython/expected/plpython_types.out

Lines changed: 115 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,74 @@ CONTEXT: PL/Python function "test_type_conversion_bool"
3232

3333
(1 row)
3434

35+
-- test various other ways to express Booleans in Python
36+
CREATE FUNCTION test_type_conversion_bool_other(n int) RETURNS bool AS $$
37+
# numbers
38+
if n == 0:
39+
ret = 0
40+
elif n == 1:
41+
ret = 5
42+
# strings
43+
elif n == 2:
44+
ret = ''
45+
elif n == 3:
46+
ret = 'fa' # true in Python, false in PostgreSQL
47+
# containers
48+
elif n == 4:
49+
ret = []
50+
elif n == 5:
51+
ret = [0]
52+
plpy.info(ret, not not ret)
53+
return ret
54+
$$ LANGUAGE plpythonu;
55+
SELECT * FROM test_type_conversion_bool_other(0);
56+
INFO: (0, False)
57+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
58+
test_type_conversion_bool_other
59+
---------------------------------
60+
f
61+
(1 row)
62+
63+
SELECT * FROM test_type_conversion_bool_other(1);
64+
INFO: (5, True)
65+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
66+
test_type_conversion_bool_other
67+
---------------------------------
68+
t
69+
(1 row)
70+
71+
SELECT * FROM test_type_conversion_bool_other(2);
72+
INFO: ('', False)
73+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
74+
test_type_conversion_bool_other
75+
---------------------------------
76+
f
77+
(1 row)
78+
79+
SELECT * FROM test_type_conversion_bool_other(3);
80+
INFO: ('fa', True)
81+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
82+
test_type_conversion_bool_other
83+
---------------------------------
84+
t
85+
(1 row)
86+
87+
SELECT * FROM test_type_conversion_bool_other(4);
88+
INFO: ([], False)
89+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
90+
test_type_conversion_bool_other
91+
---------------------------------
92+
f
93+
(1 row)
94+
95+
SELECT * FROM test_type_conversion_bool_other(5);
96+
INFO: ([0], True)
97+
CONTEXT: PL/Python function "test_type_conversion_bool_other"
98+
test_type_conversion_bool_other
99+
---------------------------------
100+
t
101+
(1 row)
102+
35103
CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
36104
plpy.info(x, type(x))
37105
return x
@@ -278,13 +346,21 @@ plpy.info(x, type(x))
278346
return x
279347
$$ LANGUAGE plpythonu;
280348
SELECT * FROM test_type_conversion_bytea('hello world');
281-
INFO: ('\\x68656c6c6f20776f726c64', <type 'str'>)
349+
INFO: ('hello world', <type 'str'>)
282350
CONTEXT: PL/Python function "test_type_conversion_bytea"
283351
test_type_conversion_bytea
284352
----------------------------
285353
\x68656c6c6f20776f726c64
286354
(1 row)
287355

356+
SELECT * FROM test_type_conversion_bytea(E'null\\000byte');
357+
INFO: ('null\x00byte', <type 'str'>)
358+
CONTEXT: PL/Python function "test_type_conversion_bytea"
359+
test_type_conversion_bytea
360+
----------------------------
361+
\x6e756c6c0062797465
362+
(1 row)
363+
288364
SELECT * FROM test_type_conversion_bytea(null);
289365
INFO: (None, <type 'NoneType'>)
290366
CONTEXT: PL/Python function "test_type_conversion_bytea"
@@ -304,17 +380,31 @@ try:
304380
except ValueError, e:
305381
return 'FAILED: ' + str(e)
306382
$$ LANGUAGE plpythonu;
307-
/* This will currently fail because the bytea datum is presented to
308-
Python as a string in bytea-encoding, which Python doesn't understand. */
309383
SELECT test_type_unmarshal(x) FROM test_type_marshal() x;
310-
test_type_unmarshal
311-
--------------------------
312-
FAILED: bad marshal data
384+
test_type_unmarshal
385+
---------------------
386+
hello world
313387
(1 row)
314388

315389
--
316390
-- Domains
317391
--
392+
CREATE DOMAIN booltrue AS bool CHECK (VALUE IS TRUE OR VALUE IS NULL);
393+
CREATE FUNCTION test_type_conversion_booltrue(x booltrue, y bool) RETURNS booltrue AS $$
394+
return y
395+
$$ LANGUAGE plpythonu;
396+
SELECT * FROM test_type_conversion_booltrue(true, true);
397+
test_type_conversion_booltrue
398+
-------------------------------
399+
t
400+
(1 row)
401+
402+
SELECT * FROM test_type_conversion_booltrue(false, true);
403+
ERROR: value for domain booltrue violates check constraint "booltrue_check"
404+
SELECT * FROM test_type_conversion_booltrue(true, false);
405+
ERROR: value for domain booltrue violates check constraint "booltrue_check"
406+
CONTEXT: while creating return value
407+
PL/Python function "test_type_conversion_booltrue"
318408
CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
319409
CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
320410
plpy.info(x, type(x))
@@ -342,13 +432,29 @@ CONTEXT: PL/Python function "test_type_conversion_uint2"
342432
1
343433
(1 row)
344434

435+
CREATE DOMAIN nnint AS int CHECK (VALUE IS NOT NULL);
436+
CREATE FUNCTION test_type_conversion_nnint(x nnint, y int) RETURNS nnint AS $$
437+
return y
438+
$$ LANGUAGE plpythonu;
439+
SELECT * FROM test_type_conversion_nnint(10, 20);
440+
test_type_conversion_nnint
441+
----------------------------
442+
20
443+
(1 row)
444+
445+
SELECT * FROM test_type_conversion_nnint(null, 20);
446+
ERROR: value for domain nnint violates check constraint "nnint_check"
447+
SELECT * FROM test_type_conversion_nnint(10, null);
448+
ERROR: value for domain nnint violates check constraint "nnint_check"
449+
CONTEXT: while creating return value
450+
PL/Python function "test_type_conversion_nnint"
345451
CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
346452
CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
347453
plpy.info(x, type(x))
348454
return y
349455
$$ LANGUAGE plpythonu;
350456
SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
351-
INFO: ('\\x68656c6c6f20776f6c64', <type 'str'>)
457+
INFO: ('hello wold', <type 'str'>)
352458
CONTEXT: PL/Python function "test_type_conversion_bytea10"
353459
test_type_conversion_bytea10
354460
------------------------------
@@ -358,15 +464,15 @@ CONTEXT: PL/Python function "test_type_conversion_bytea10"
358464
SELECT * FROM test_type_conversion_bytea10('hello world', 'hello wold');
359465
ERROR: value for domain bytea10 violates check constraint "bytea10_check"
360466
SELECT * FROM test_type_conversion_bytea10('hello word', 'hello world');
361-
INFO: ('\\x68656c6c6f20776f7264', <type 'str'>)
467+
INFO: ('hello word', <type 'str'>)
362468
CONTEXT: PL/Python function "test_type_conversion_bytea10"
363469
ERROR: value for domain bytea10 violates check constraint "bytea10_check"
364470
CONTEXT: while creating return value
365471
PL/Python function "test_type_conversion_bytea10"
366472
SELECT * FROM test_type_conversion_bytea10(null, 'hello word');
367473
ERROR: value for domain bytea10 violates check constraint "bytea10_check"
368474
SELECT * FROM test_type_conversion_bytea10('hello word', null);
369-
INFO: ('\\x68656c6c6f20776f7264', <type 'str'>)
475+
INFO: ('hello word', <type 'str'>)
370476
CONTEXT: PL/Python function "test_type_conversion_bytea10"
371477
ERROR: value for domain bytea10 violates check constraint "bytea10_check"
372478
CONTEXT: while creating return value

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp