hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开放line类型

Browse Source
This commit is contained in:
l00584793
2020-10-16 16:25:47 +08:00
committed by @luo_zihao5524
parent 4dea7292eb
commit 14513c5dad
16 changed files with 332 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/backend/parser/parse_type.cpp
View File

@ -215,7 +215,7 @@ Type typenameType(ParseState* pstate, const TypeName* typname, int32* typmod_p)
errmsg("type \"%s\" does not exist", TypeNameToString(typname)),
parser_errposition(pstate, typname->location)));
}
if (!((Form_pg_type)GETSTRUCT(tup))->typisdefined) {
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
@ -512,7 +512,7 @@ Type typeidType(Oid id)
/* given type (as type struct), return the type OID */
Oid typeTypeId(Type tp)
{
if (tp == NULL) { /* probably useless */
if (tp == NULL) { /* probably useless */
ereport(ERROR, (errcode(ERRCODE_UNRECOGNIZED_NODE_TYPE), errmsg("typeTypeId() called with NULL type struct")));
}
return HeapTupleGetOid(tp);
@ -825,8 +825,6 @@ bool IsTypeInBlacklist(Oid typoid)
bool isblack = false;
switch (typoid) {
case LINEOID:
// case XMLOID:
case PGNODETREEOID:
isblack = true;
break;

138
src/common/backend/utils/adt/geo_ops.cpp
View File

@ -212,7 +212,7 @@ static int pair_encode(float8 x, float8 y, char* str)
if (ndig < 1) {
ndig = 1;
}
int rc = sprintf_s(str, P_MAXLEN, "%.*g,%.*g", ndig, x, ndig, y);
securec_check_ss(rc, "\0", "\0");
@ -222,8 +222,8 @@ static int pair_encode(float8 x, float8 y, char* str)
static int path_decode(int opentype, int npts, char* str, int* isopen, char** ss, Point* p)
{
int depth = 0;
char *s = NULL;
char *cp = NULL;
char* s = NULL;
char* cp = NULL;
int i;
s = str;
@ -845,17 +845,10 @@ Datum box_diagonal(PG_FUNCTION_ARGS)
** there are few relops.
**
***********************************************************************/
#define LINE_NOT_SUPPORT() \
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("type \"line\" not yet implemented")));
Datum line_in(PG_FUNCTION_ARGS)
{
#ifdef ENABLE_LINE_TYPE
char* str = PG_GETARG_CSTRING(0);
#endif
LINE* line = NULL;
#ifdef ENABLE_LINE_TYPE
/* when fixed, modify "not implemented", catalog/pg_type.h and SGML */
LSEG lseg;
int isopen;
@ -867,58 +860,20 @@ Datum line_in(PG_FUNCTION_ARGS)
}
line = (LINE*)palloc(sizeof(LINE));
line_construct_pts(line, &lseg.p[0], &lseg.p[1]);
#else
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("type \"line\" not yet implemented")));
line = NULL;
#endif
PG_RETURN_LINE_P(line);
}
Datum line_out(PG_FUNCTION_ARGS)
{
#ifdef ENABLE_LINE_TYPE
LINE* line = PG_GETARG_LINE_P(0);
#endif
char* result = NULL;
const char* astr = DatumGetCString(DirectFunctionCall1(float8out, Float8GetDatum(line->A)));
const char* bstr = DatumGetCString(DirectFunctionCall1(float8out, Float8GetDatum(line->B)));
const char* cstr = DatumGetCString(DirectFunctionCall1(float8out, Float8GetDatum(line->C)));
StringInfoData buffer;
#ifdef ENABLE_LINE_TYPE
/* when fixed, modify "not implemented", catalog/pg_type.h and SGML */
LSEG lseg;
if (FPzero(line->B)) { /* vertical */
/* use "x = C" */
result->A = -1;
result->B = 0;
result->C = pt1->x;
#ifdef GEODEBUG
printf("line_out- line is vertical\n");
#endif
#ifdef NOT_USED
result->m = DBL_MAX;
#endif
} else if (FPzero(line->A)) { /* horizontal */
/* use "x = C" */
result->A = 0;
result->B = -1;
result->C = pt1->y;
#ifdef GEODEBUG
printf("line_out- line is horizontal\n");
#endif
#ifdef NOT_USED
result->m = 0.0;
#endif
}
return path_encode(TRUE, 2, (Point*)&(ls->p[0]));
#else
ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("type \"line\" not yet implemented")));
result = NULL;
#endif
PG_RETURN_CSTRING(result);
initStringInfo(&buffer);
appendStringInfo(&buffer, "{%s,%s,%s}", astr, bstr, cstr);
PG_RETURN_CSTRING(buffer.data);
}
/*
@ -1020,8 +975,6 @@ static void line_construct_pts(LINE* line, Point* pt1, Point* pt2)
*/
Datum line_construct_pp(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
Point* pt1 = PG_GETARG_POINT_P(0);
Point* pt2 = PG_GETARG_POINT_P(1);
LINE* result = (LINE*)palloc(sizeof(LINE));
@ -1036,8 +989,6 @@ Datum line_construct_pp(PG_FUNCTION_ARGS)
Datum line_intersect(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
@ -1046,8 +997,6 @@ Datum line_intersect(PG_FUNCTION_ARGS)
Datum line_parallel(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
@ -1062,8 +1011,6 @@ Datum line_parallel(PG_FUNCTION_ARGS)
Datum line_perp(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
@ -1085,8 +1032,6 @@ Datum line_perp(PG_FUNCTION_ARGS)
Datum line_vertical(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* line = PG_GETARG_LINE_P(0);
PG_RETURN_BOOL(FPzero(line->B));
@ -1094,8 +1039,6 @@ Datum line_vertical(PG_FUNCTION_ARGS)
Datum line_horizontal(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* line = PG_GETARG_LINE_P(0);
PG_RETURN_BOOL(FPzero(line->A));
@ -1103,8 +1046,6 @@ Datum line_horizontal(PG_FUNCTION_ARGS)
Datum line_eq(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
double k;
@ -1131,8 +1072,6 @@ Datum line_eq(PG_FUNCTION_ARGS)
*/
Datum line_distance(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
float8 result;
@ -1141,7 +1080,7 @@ Datum line_distance(PG_FUNCTION_ARGS)
if (!DatumGetBool(DirectFunctionCall2(line_parallel, LinePGetDatum(l1), LinePGetDatum(l2)))) {
PG_RETURN_FLOAT8(0.0);
}
/* vertical? */
/* vertical? */
if (FPzero(l1->B)) {
PG_RETURN_FLOAT8(fabs(l1->C - l2->C));
}
@ -1155,14 +1094,11 @@ Datum line_distance(PG_FUNCTION_ARGS)
*/
Datum line_interpt(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* l1 = PG_GETARG_LINE_P(0);
LINE* l2 = PG_GETARG_LINE_P(1);
Point* result = NULL;
result = line_interpt_internal(l1, l2);
if (result == NULL) {
PG_RETURN_NULL();
}
@ -1189,7 +1125,7 @@ static Point* line_interpt_internal(LINE* l1, LINE* l2)
}
#ifdef NOT_USED
/* l1 vertical? */
/* l1 vertical? */
if (FPzero(l1->B)) {
result = point_construct(l2->m * l1->C + l2->C, l1->C);
} else if (FPzero(l2->B)) { /* l2 vertical? */
@ -1573,8 +1509,7 @@ Datum path_distance(PG_FUNCTION_ARGS)
if (i > 0) {
iprev = i - 1;
}
else {
} else {
if (!p1->closed) {
continue;
}
@ -1586,8 +1521,7 @@ Datum path_distance(PG_FUNCTION_ARGS)
if (j > 0) {
jprev = j - 1;
}
else {
} else {
if (!p2->closed) {
continue;
}
@ -1626,8 +1560,7 @@ Datum path_length(PG_FUNCTION_ARGS)
if (i > 0) {
iprev = i - 1;
}
else {
} else {
if (!path->closed) {
continue;
}
@ -2022,8 +1955,7 @@ Datum lseg_perp(PG_FUNCTION_ARGS)
#endif
if (FPzero(m1)) {
PG_RETURN_BOOL(FPeq(m2, DBL_MAX));
}
else if (FPzero(m2)) {
} else if (FPzero(m2)) {
PG_RETURN_BOOL(FPeq(m1, DBL_MAX));
}
PG_RETURN_BOOL(FPeq(m1 / m2, -1.0));
@ -2218,8 +2150,6 @@ Datum lseg_interpt(PG_FUNCTION_ARGS)
Datum dist_pl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
Point* pt = PG_GETARG_POINT_P(0);
LINE* line = PG_GETARG_LINE_P(1);
@ -2355,16 +2285,13 @@ Datum dist_pb(PG_FUNCTION_ARGS)
Datum dist_sl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LSEG* lseg = PG_GETARG_LSEG_P(0);
LINE* line = PG_GETARG_LINE_P(1);
float8 result, d2;
if (has_interpt_sl(lseg, line)) {
result = 0.0;
}
else {
} else {
result = dist_pl_internal(&lseg->p[0], line);
d2 = dist_pl_internal(&lseg->p[1], line);
/* XXX shouldn't we take the min not max? */
@ -2517,8 +2444,6 @@ static bool has_interpt_sl(LSEG* lseg, LINE* line)
*/
Datum close_pl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
Point* pt = PG_GETARG_POINT_P(0);
LINE* line = PG_GETARG_LINE_P(1);
Point* result = NULL;
@ -2603,7 +2528,7 @@ Datum close_ps(PG_FUNCTION_ARGS)
if (result != NULL) {
PG_RETURN_POINT_P(result);
}
/* point lines along (to left or right) of the vertical lseg. */
result = (Point*)palloc(sizeof(Point));
result->x = lseg->p[0].x;
@ -2774,8 +2699,6 @@ Datum close_pb(PG_FUNCTION_ARGS)
*/
Datum close_sl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LSEG* lseg = PG_GETARG_LSEG_P(0);
LINE* line = PG_GETARG_LINE_P(1);
Point* result = NULL;
@ -2789,8 +2712,7 @@ Datum close_sl(PG_FUNCTION_ARGS)
d2 = dist_pl_internal(&lseg->p[1], line);
if (d1 < d2) {
result = point_copy(&lseg->p[0]);
}
else {
} else {
result = point_copy(&lseg->p[1]);
}
@ -2802,8 +2724,6 @@ Datum close_sl(PG_FUNCTION_ARGS)
*/
Datum close_ls(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* line = PG_GETARG_LINE_P(0);
LSEG* lseg = PG_GETARG_LSEG_P(1);
Point* result = NULL;
@ -2898,7 +2818,6 @@ Datum close_lb(PG_FUNCTION_ARGS)
*/
Datum on_pl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
Point* pt = PG_GETARG_POINT_P(0);
LINE* line = PG_GETARG_LINE_P(1);
@ -2977,8 +2896,6 @@ Datum on_ppath(PG_FUNCTION_ARGS)
Datum on_sl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LSEG* lseg = PG_GETARG_LSEG_P(0);
LINE* line = PG_GETARG_LINE_P(1);
@ -3002,8 +2919,6 @@ Datum on_sb(PG_FUNCTION_ARGS)
Datum inter_sl(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LSEG* lseg = PG_GETARG_LSEG_P(0);
LINE* line = PG_GETARG_LINE_P(1);
@ -3042,7 +2957,7 @@ Datum inter_sb(PG_FUNCTION_ARGS)
if (DatumGetBool(DirectFunctionCall2(on_pb, PointPGetDatum(&lseg->p[0]), BoxPGetDatum(box))) ||
DatumGetBool(DirectFunctionCall2(on_pb, PointPGetDatum(&lseg->p[1]), BoxPGetDatum(box)))) {
PG_RETURN_BOOL(true);
}
}
/* pairwise check lseg intersections */
point.x = box->low.x;
@ -3078,8 +2993,6 @@ Datum inter_sb(PG_FUNCTION_ARGS)
*/
Datum inter_lb(PG_FUNCTION_ARGS)
{
LINE_NOT_SUPPORT();
LINE* line = PG_GETARG_LINE_P(0);
BOX* box = PG_GETARG_BOX_P(1);
LSEG bseg;
@ -3579,7 +3492,7 @@ static bool lseg_inside_poly(Point* a, Point* b, POLYGON* poly, int start)
LSEG s, t;
int i;
bool res = true;
bool intersection = false;
bool intersection = false;
t.p[0] = *a;
t.p[1] = *b;
@ -4677,12 +4590,11 @@ Datum circle_poly(PG_FUNCTION_ARGS)
ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("too many points requested")));
}
poly = (POLYGON*)palloc0(size); /* zero any holes */
poly = (POLYGON*)palloc0(size); /* zero any holes */
SET_VARSIZE(poly, size);
poly->npts = npts;
anglestep = (2.0 * M_PI) / npts;
for (i = 0; i < npts; i++) {
angle = i * anglestep;
poly->p[i].x = circle->center.x - (circle->radius * cos(angle));
@ -4807,7 +4719,7 @@ static int lseg_crossing(double x, double y, double prev_x, double prev_y)
double z;
int y_sign;
if (FPzero(y)) { /* y == 0, on X axis */
if (FPzero(y)) { /* y == 0, on X axis */
if (FPzero(x)) { /* (x,y) is (0,0)? */
return POINT_ON_POLYGON;
} else if (FPgt(x, 0)) { /* x > 0 */
@ -4830,10 +4742,10 @@ static int lseg_crossing(double x, double y, double prev_x, double prev_y)
if (FPzero(prev_y)) {
/* previous point was on X axis, so new point is either off or on */
return FPlt(prev_x, 0) ? 0 : y_sign;
} else if (FPgt(y_sign * prev_y, 0)) {
} else if (FPgt(y_sign * prev_y, 0)) {
/* both above or below X axis */
return 0; /* same sign */
} else { /* y and prev_y cross X-axis */
} else { /* y and prev_y cross X-axis */
if (FPge(x, 0) && FPgt(prev_x, 0)) {
/* both non-negative so cross positive X-axis */
return 2 * y_sign;

12
src/test/regress/expected/create_index.out
View File

@ -113,7 +113,11 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
ORDER BY (poly_center(f1))[0];
ERROR: type "line" not yet implemented
id | f1
----+---------------------
1 | ((2,0),(2,4),(0,0))
(1 row)
SELECT * FROM circle_tbl WHERE f1 && circle(point(1,-2), 1)
ORDER BY area(f1);
f1
@ -424,7 +428,11 @@ SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
ORDER BY (poly_center(f1))[0];
ERROR: type "line" not yet implemented
id | f1
----+---------------------
1 | ((2,0),(2,4),(0,0))
(1 row)
EXPLAIN (NUM_NODES OFF, NODES OFF, COSTS OFF)
SELECT * FROM circle_tbl WHERE f1 && circle(point(1,-2), 1)
ORDER BY area(f1);

36
src/test/regress/expected/geometry.out
View File

@ -112,8 +112,40 @@ CONTEXT: referenced column: intersection
-- closest point
SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
FROM LSEG_TBL l, POINT_TBL p ORDER BY (l.s[0])[0], (l.s[0])[1], p.f1[0], p.f1[1];
ERROR: type "line" not yet implemented
CONTEXT: referenced column: closest
thirty | f1 | s | closest
--------+------------+-------------------------------+----------------------------------
| (-10,0) | [(-1000000,200),(300000,-40)] | (-9.99715942258,15.386461014)
| (-5,-12) | [(-1000000,200),(300000,-40)] | (-4.99494420846,15.3855375282)
| (-3,4) | [(-1000000,200),(300000,-40)] | (-2.99789812268,15.3851688427)
| (0,0) | [(-1000000,200),(300000,-40)] | (0.00284023658959,15.3846148603)
| (5.1,34.5) | [(-1000000,200),(300000,-40)] | (5.09647083221,15.3836744977)
| (10,10) | [(-1000000,200),(300000,-40)] | (10.000993742,15.3827690473)
| (-10,0) | [(0,0),(6,6)] | (0,0)
| (-5,-12) | [(0,0),(6,6)] | (0,0)
| (-3,4) | [(0,0),(6,6)] | (0.5,0.5)
| (0,0) | [(0,0),(6,6)] | (-0,0)
| (5.1,34.5) | [(0,0),(6,6)] | (6,6)
| (10,10) | [(0,0),(6,6)] | (6,6)
| (-10,0) | [(1,2),(3,4)] | (1,2)
| (-5,-12) | [(1,2),(3,4)] | (1,2)
| (-3,4) | [(1,2),(3,4)] | (1,2)
| (0,0) | [(1,2),(3,4)] | (1,2)
| (5.1,34.5) | [(1,2),(3,4)] | (3,4)
| (10,10) | [(1,2),(3,4)] | (3,4)
| (-10,0) | [(10,-10),(-3,-4)] | (-3,-4)
| (-5,-12) | [(10,-10),(-3,-4)] | (-1.60487804878,-4.64390243902)
| (-3,4) | [(10,-10),(-3,-4)] | (-3,-4)
| (0,0) | [(10,-10),(-3,-4)] | (-2.0487804878,-4.43902439024)
| (5.1,34.5) | [(10,-10),(-3,-4)] | (-3,-4)
| (10,10) | [(10,-10),(-3,-4)] | (2.39024390244,-6.48780487805)
| (-10,0) | [(11,22),(33,44)] | (11,22)
| (-5,-12) | [(11,22),(33,44)] | (11,22)
| (-3,4) | [(11,22),(33,44)] | (11,22)
| (0,0) | [(11,22),(33,44)] | (11,22)
| (5.1,34.5) | [(11,22),(33,44)] | (14.3,25.3)
| (10,10) | [(11,22),(33,44)] | (11,22)
(30 rows)
--
-- Lines
--

116
src/test/regress/expected/line_operator.out Normal file
View File

@ -0,0 +1,116 @@
select ?- line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select ?| line '(1,2),(3,2)';
?column?
----------
f
(1 row)
select line '(1,2),(3,2)' ## lseg '(1,2),(3,2)';
?column?
----------
(3,2)
(1 row)
select line '(1,2),(3,2)' ## box '(1,1),(2,2)';
ERROR: function "close_lb" not implemented
select ## line '(1,2),(3,2)';
ERROR: operator does not exist: ## line
LINE 1: select ## line '(1,2),(3,2)';
^
HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
select ## line '(1,2),(3,2)';
ERROR: operator does not exist: ## line
LINE 1: select ## line '(1,2),(3,2)';
^
HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
select line '(1,2),(3,2)' <-> box '(1,1),(2,2)';
ERROR: function "dist_lb" not implemented
select point '1,2' <-> line '(1,2),(3,2)';
?column?
----------
0
(1 row)
select lseg '(1,2),(3,2)' <-> line '(1,2),(3,2)';
?column?
----------
0
(1 row)
select line '(1,2),(3,2)' <-> line '(1,2),(3,2)';
?column?
----------
0
(1 row)
select line '(1,2),(3,2)' = line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select line '(1,2),(3,2)' ?# line '(1,2),(3,2)';
?column?
----------
f
(1 row)
select line '(1,2),(3,2)' # line '(1,2),(3,2)';
?column?
----------
(1 row)
select line '(1,2),(3,2)' ?|| line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select line '(1,2),(3,2)' ?-| line '(1,2),(3,2)';
?column?
----------
f
(1 row)
select line '(1,2),(3,2)' ?# box '(1,1),(2,2)';
?column?
----------
t
(1 row)
select lseg '(1,2),(3,2)' ?# line '(1,2),(3,2)';
?column?
----------
f
(1 row)
select lseg '(1,2),(3,2)' @ line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select lseg '(1,2),(3,2)' <@line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select point '1,2' @ line '(1,2),(3,2)';
?column?
----------
t
(1 row)
select point '1,2' <@line '(1,2),(3,2)';
?column?
----------
t
(1 row)

11
src/test/regress/expected/lseg.out
View File

@ -2,7 +2,8 @@
-- LSEG
-- Line segments
--
--DROP TABLE LSEG_TBL;
DROP TABLE IF EXISTS LSEG_TBL;
NOTICE: table "lseg_tbl" does not exist, skipping
CREATE TABLE LSEG_TBL (s lseg);
INSERT INTO LSEG_TBL VALUES ('[(1,2),(3,4)]');
INSERT INTO LSEG_TBL VALUES ('(0,0),(6,6)');
@ -47,4 +48,10 @@ SELECT * FROM LSEG_TBL WHERE s <= lseg '[(1,2),(3,4)]' ORDER BY (s[0])[0], (s[0]
(1 row)
SELECT * FROM LSEG_TBL WHERE (s <-> lseg '[(1,2),(3,4)]') < 10 ORDER BY (s[0])[0], (s[0])[1];
ERROR: type "line" not yet implemented
s
--------------------
[(0,0),(6,6)]
[(1,2),(3,4)]
[(10,-10),(-3,-4)]
(3 rows)

6
src/test/regress/expected/mot/single_supported_unsupported_types.out
View File

@ -4,7 +4,7 @@ create foreign table test1 (c char, v varchar(10), t varchar(1000));
create foreign table test2 (i integer, n numeric, f4 float4, f8 float8, s serial);
NOTICE: CREATE FOREIGN TABLE will create implicit sequence "test2_s_seq" for serial column "test2.s"
create foreign table test3 (d date, t time, ts timestamp, i interval);
-- unsupported types
-- unsupported types
create foreign table test4 (u uuid);
ERROR: Column definition of u is not supported
DETAIL: Column type uuid is not supported yet
@ -22,7 +22,8 @@ create foreign table test8 (b box);
ERROR: Column definition of b is not supported
DETAIL: Column type box is not supported yet
create foreign table test9 (l line);
ERROR: type line is not yet supported.
ERROR: Column definition of l is not supported
DETAIL: Column type line is not supported yet
create foreign table test10 (p point);
ERROR: Column definition of p is not supported
DETAIL: Column type point is not supported yet
@ -42,3 +43,4 @@ drop foreign table test0;
drop foreign table test1;
drop foreign table test2;
drop foreign table test3;

65
src/test/regress/expected/polygon.out
View File

@ -13,6 +13,8 @@
--
-- 0 1 2 3 4
--
DROP TABLE IF EXISTS POLYGON_TBL;
NOTICE: table "polygon_tbl" does not exist, skipping
CREATE TABLE POLYGON_TBL(ID int, f1 polygon);
INSERT INTO POLYGON_TBL(ID,f1) VALUES (1, '(2.0,0.0),(2.0,4.0),(0.0,0.0)');
INSERT INTO POLYGON_TBL(ID,f1) VALUES (2, '(3.0,1.0),(3.0,3.0),(1.0,0.0)');
@ -58,7 +60,12 @@ SELECT '' AS four, * FROM POLYGON_TBL ORDER BY ID;
SELECT '' AS three, p.*
FROM POLYGON_TBL p
WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)' ORDER BY ID;
ERROR: type "line" not yet implemented
three | id | f1
-------+----+---------------------
| 1 | ((2,0),(2,4),(0,0))
| 2 | ((3,1),(3,3),(1,0))
(2 rows)
-- left overlap
SELECT '' AS four, p.*
FROM POLYGON_TBL p
@ -189,8 +196,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(
-- endpoints '+' is ofr one polygon, '*' - for another
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
-- +-----------+
-- | *---* /
-- | | |/
@ -199,8 +209,11 @@ CONTEXT: referenced column: false
-- | *---* \
-- +-----------+
SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +-----------------+
-- | |
-- | +---*---*-----+
@ -209,8 +222,11 @@ CONTEXT: referenced column: true
-- | |
-- +-----------------+
SELECT '((1,1),(1,4),(5,4),(5,3),(2,3),(2,2),(5,2),(5,1))'::polygon @> '((3,2),(3,3),(4,3),(4,2))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
-- +---------+
-- | |
-- | *----*
@ -219,8 +235,11 @@ CONTEXT: referenced column: false
-- | |
-- +---------+
SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- same
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
false
@ -230,8 +249,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(
-- overlap
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true;
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +--------------------+
-- | *---* 1
-- | + | |
@ -240,8 +262,11 @@ CONTEXT: referenced column: true
-- 3
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +--+ *--*
-- | | | |
-- | | *--*
@ -249,8 +274,14 @@ CONTEXT: referenced column: true
-- | |
-- +-------+
SELECT '((1,4),(1,1),(4,1),(4,2),(2,2),(2,4),(1,4))'::polygon && '((3,3),(4,3),(4,4),(3,4),(3,3))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
SELECT '((200,800),(800,800),(800,200),(200,200))' && '(1000,1000,0,0)'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)

11
src/test/regress/expected/single_node_lseg.out
View File

@ -2,7 +2,8 @@
-- LSEG
-- Line segments
--
--DROP TABLE LSEG_TBL;
DROP TABLE IF EXISTS LSEG_TBL;
NOTICE: table "lseg_tbl" does not exist, skipping
CREATE TABLE LSEG_TBL (s lseg);
INSERT INTO LSEG_TBL VALUES ('[(1,2),(3,4)]');
INSERT INTO LSEG_TBL VALUES ('(0,0),(6,6)');
@ -47,4 +48,10 @@ SELECT * FROM LSEG_TBL WHERE s <= lseg '[(1,2),(3,4)]';
(1 row)
SELECT * FROM LSEG_TBL WHERE (s <-> lseg '[(1,2),(3,4)]') < 10;
ERROR: type "line" not yet implemented
s
--------------------
[(1,2),(3,4)]
[(0,0),(6,6)]
[(10,-10),(-3,-4)]
(3 rows)

65
src/test/regress/expected/single_node_polygon.out
View File

@ -13,6 +13,8 @@
--
-- 0 1 2 3 4
--
DROP TABLE IF EXISTS POLYGON_TBL;
NOTICE: table "polygon_tbl" does not exist, skipping
CREATE TABLE POLYGON_TBL(f1 polygon);
INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)');
INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)');
@ -58,7 +60,12 @@ SELECT '' AS four, * FROM POLYGON_TBL;
SELECT '' AS three, p.*
FROM POLYGON_TBL p
WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)';
ERROR: type "line" not yet implemented
three | f1
-------+---------------------
| ((2,0),(2,4),(0,0))
| ((3,1),(3,3),(1,0))
(2 rows)
-- left overlap
SELECT '' AS four, p.*
FROM POLYGON_TBL p
@ -189,8 +196,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(
-- endpoints '+' is ofr one polygon, '*' - for another
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
-- +-----------+
-- | *---* /
-- | | |/
@ -199,8 +209,11 @@ CONTEXT: referenced column: false
-- | *---* \
-- +-----------+
SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +-----------------+
-- | |
-- | +---*---*-----+
@ -209,8 +222,11 @@ CONTEXT: referenced column: true
-- | |
-- +-----------------+
SELECT '((1,1),(1,4),(5,4),(5,3),(2,3),(2,2),(5,2),(5,1))'::polygon @> '((3,2),(3,3),(4,3),(4,2))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
-- +---------+
-- | |
-- | *----*
@ -219,8 +235,11 @@ CONTEXT: referenced column: false
-- | |
-- +---------+
SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- same
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false;
false
@ -230,8 +249,11 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(
-- overlap
SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true;
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +--------------------+
-- | *---* 1
-- | + | |
@ -240,8 +262,11 @@ CONTEXT: referenced column: true
-- 3
-- Edges 1-2, 2-3 are not shown on picture
SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon && '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)
-- +--+ *--*
-- | | | |
-- | | *--*
@ -249,8 +274,14 @@ CONTEXT: referenced column: true
-- | |
-- +-------+
SELECT '((1,4),(1,1),(4,1),(4,2),(2,2),(2,4),(1,4))'::polygon && '((3,3),(4,3),(4,4),(3,4),(3,3))'::polygon AS "false";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: false
false
-------
f
(1 row)
SELECT '((200,800),(800,800),(800,200),(200,200))' && '(1000,1000,0,0)'::polygon AS "true";
ERROR: type "line" not yet implemented
CONTEXT: referenced column: true
true
------
t
(1 row)

3
src/test/regress/parallel_schedule10
View File

@ -80,4 +80,5 @@ test: duplicate_column_index
test: initdb
# test explain gather
test: explain_gather
test: password_length
test: password_length
test: line_operator

21
src/test/regress/sql/line_operator.sql Normal file
View File

@ -0,0 +1,21 @@
select ?- line '(1,2),(3,2)';
select ?| line '(1,2),(3,2)';
select line '(1,2),(3,2)' ## lseg '(1,2),(3,2)';
select line '(1,2),(3,2)' ## box '(1,1),(2,2)';
select ## line '(1,2),(3,2)';
select ## line '(1,2),(3,2)';
select line '(1,2),(3,2)' <-> box '(1,1),(2,2)';
select point '1,2' <-> line '(1,2),(3,2)';
select lseg '(1,2),(3,2)' <-> line '(1,2),(3,2)';
select line '(1,2),(3,2)' <-> line '(1,2),(3,2)';
select line '(1,2),(3,2)' = line '(1,2),(3,2)';
select line '(1,2),(3,2)' ?# line '(1,2),(3,2)';
select line '(1,2),(3,2)' # line '(1,2),(3,2)';
select line '(1,2),(3,2)' ?|| line '(1,2),(3,2)';
select line '(1,2),(3,2)' ?-| line '(1,2),(3,2)';
select line '(1,2),(3,2)' ?# box '(1,1),(2,2)';
select lseg '(1,2),(3,2)' ?# line '(1,2),(3,2)';
select lseg '(1,2),(3,2)' @ line '(1,2),(3,2)';
select lseg '(1,2),(3,2)' <@line '(1,2),(3,2)';
select point '1,2' @ line '(1,2),(3,2)';
select point '1,2' <@line '(1,2),(3,2)';

2
src/test/regress/sql/lseg.sql
View File

@ -3,7 +3,7 @@
-- Line segments
--
--DROP TABLE LSEG_TBL;
DROP TABLE IF EXISTS LSEG_TBL;
CREATE TABLE LSEG_TBL (s lseg);
INSERT INTO LSEG_TBL VALUES ('[(1,2),(3,4)]');

2
src/test/regress/sql/polygon.sql
View File

@ -13,10 +13,10 @@
--
-- 0 1 2 3 4
--
DROP TABLE IF EXISTS POLYGON_TBL;
CREATE TABLE POLYGON_TBL(ID int, f1 polygon);
INSERT INTO POLYGON_TBL(ID,f1) VALUES (1, '(2.0,0.0),(2.0,4.0),(0.0,0.0)');
INSERT INTO POLYGON_TBL(ID,f1) VALUES (2, '(3.0,1.0),(3.0,3.0),(1.0,0.0)');

2
src/test/regress/sql/single_node_lseg.sql
View File

@ -3,7 +3,7 @@
-- Line segments
--
--DROP TABLE LSEG_TBL;
DROP TABLE IF EXISTS LSEG_TBL;
CREATE TABLE LSEG_TBL (s lseg);
INSERT INTO LSEG_TBL VALUES ('[(1,2),(3,4)]');

1
src/test/regress/sql/single_node_polygon.sql
View File

@ -13,6 +13,7 @@
--
-- 0 1 2 3 4
--
DROP TABLE IF EXISTS POLYGON_TBL;
CREATE TABLE POLYGON_TBL(f1 polygon);