Thread: windows progname / regression fixes
Attached are 2 patches and one additional alternative contrib regression test file (for cube). The patches fix a misleading message in pg_regress.sh, and strip the .exe suffix from the result of get_progname() as previously discussed. This lets us get much further with contrib regression tests - there are 2 remaining issues preventing a clean run - one odd one in the seg module and a path issue in tsearch2. I am looking into these. (Why am I bothered with all this? Because I want the buildfarm system to run on Windows). One odd thing I have noticed in testing, is that dropping the regression database takes a *very* long time, especially after the third or fourth go, and I see messages about not being able to remove the directory, which means rmtree() is failing somehow. cheers andrew -- -- Test cube datatype -- -- -- first, define the datatype. Turn off echoing so that expected file -- does not depend on contents of cube.sql. -- \set ECHO none psql:cube.sql:10: NOTICE: type "cube" is not yet defined DETAIL: Creating a shell type definition. psql:cube.sql:15: NOTICE: argument type cube is only a shell -- -- testing the input and output functions -- -- Any number (a one-dimensional point) SELECT '1'::cube AS cube; cube ------ (1) (1 row) SELECT '-1'::cube AS cube; cube ------ (-1) (1 row) SELECT '1.'::cube AS cube; cube ------ (1) (1 row) SELECT '-1.'::cube AS cube; cube ------ (-1) (1 row) SELECT '.1'::cube AS cube; cube ------- (0.1) (1 row) SELECT '-.1'::cube AS cube; cube -------- (-0.1) (1 row) SELECT '1.0'::cube AS cube; cube ------ (1) (1 row) SELECT '-1.0'::cube AS cube; cube ------ (-1) (1 row) SELECT '1e27'::cube AS cube; cube ---------- (1e+027) (1 row) SELECT '-1e27'::cube AS cube; cube ----------- (-1e+027) (1 row) SELECT '1.0e27'::cube AS cube; cube ---------- (1e+027) (1 row) SELECT '-1.0e27'::cube AS cube; cube ----------- (-1e+027) (1 row) SELECT '1e+27'::cube AS cube; cube ---------- (1e+027) (1 row) SELECT '-1e+27'::cube AS cube; cube ----------- (-1e+027) (1 row) SELECT '1.0e+27'::cube AS cube; cube ---------- (1e+027) (1 row) SELECT '-1.0e+27'::cube AS cube; cube ----------- (-1e+027) (1 row) SELECT '1e-7'::cube AS cube; cube ---------- (1e-007) (1 row) SELECT '-1e-7'::cube AS cube; cube ----------- (-1e-007) (1 row) SELECT '1.0e-7'::cube AS cube; cube ---------- (1e-007) (1 row) SELECT '-1.0e-7'::cube AS cube; cube ----------- (-1e-007) (1 row) SELECT '1e-700'::cube AS cube; cube ------ (0) (1 row) SELECT '-1e-700'::cube AS cube; cube ------ (0) (1 row) SELECT '1234567890123456'::cube AS cube; cube ------------------------- (1.23456789012346e+015) (1 row) SELECT '+1234567890123456'::cube AS cube; cube ------------------------- (1.23456789012346e+015) (1 row) SELECT '-1234567890123456'::cube AS cube; cube -------------------------- (-1.23456789012346e+015) (1 row) SELECT '.1234567890123456'::cube AS cube; cube --------------------- (0.123456789012346) (1 row) SELECT '+.1234567890123456'::cube AS cube; cube --------------------- (0.123456789012346) (1 row) SELECT '-.1234567890123456'::cube AS cube; cube ---------------------- (-0.123456789012346) (1 row) -- simple lists (points) SELECT '1,2'::cube AS cube; cube -------- (1, 2) (1 row) SELECT '(1,2)'::cube AS cube; cube -------- (1, 2) (1 row) SELECT '1,2,3,4,5'::cube AS cube; cube ----------------- (1, 2, 3, 4, 5) (1 row) SELECT '(1,2,3,4,5)'::cube AS cube; cube ----------------- (1, 2, 3, 4, 5) (1 row) -- double lists (cubes) SELECT '(0),(0)'::cube AS cube; cube ------ (0) (1 row) SELECT '(0),(1)'::cube AS cube; cube --------- (0),(1) (1 row) SELECT '[(0),(0)]'::cube AS cube; cube ------ (0) (1 row) SELECT '[(0),(1)]'::cube AS cube; cube --------- (0),(1) (1 row) SELECT '(0,0,0,0),(0,0,0,0)'::cube AS cube; cube -------------- (0, 0, 0, 0) (1 row) SELECT '(0,0,0,0),(1,0,0,0)'::cube AS cube; cube --------------------------- (0, 0, 0, 0),(1, 0, 0, 0) (1 row) SELECT '[(0,0,0,0),(0,0,0,0)]'::cube AS cube; cube -------------- (0, 0, 0, 0) (1 row) SELECT '[(0,0,0,0),(1,0,0,0)]'::cube AS cube; cube --------------------------- (0, 0, 0, 0),(1, 0, 0, 0) (1 row) -- invalid input: parse errors SELECT ''::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at end of input SELECT 'ABC'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "A" SELECT '()'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near ")" SELECT '[]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "]" SELECT '[()]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near ")" SELECT '[(1)]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "]" SELECT '[(1),]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "]" SELECT '[(1),2]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "2" SELECT '[(1),(2),(3)]'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "," SELECT '1,'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at end of input SELECT '1,2,'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at end of input SELECT '1,,2'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "," SELECT '(1,)'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near ")" SELECT '(1,2,)'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near ")" SELECT '(1,,2)'::cube AS cube; ERROR: bad cube representation DETAIL: syntax error at or near "," -- invalid input: semantic errors and trailing garbage SELECT '[(1),(2)],'::cube AS cube; -- 0 ERROR: bad cube representation DETAIL: syntax error at or near "," SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1 ERROR: bad cube representation DETAIL: different point dimensions in (1,2,3) and (2,3) SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1 ERROR: bad cube representation DETAIL: different point dimensions in (1,2) and (1,2,3) SELECT '(1),(2),'::cube AS cube; -- 2 ERROR: bad cube representation DETAIL: syntax error at or near "," SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3 ERROR: bad cube representation DETAIL: different point dimensions in (1,2,3) and (2,3) SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3 ERROR: bad cube representation DETAIL: different point dimensions in (1,2) and (1,2,3) SELECT '(1,2,3)ab'::cube AS cube; -- 4 ERROR: bad cube representation DETAIL: syntax error at or near "a" SELECT '(1,2,3)a'::cube AS cube; -- 5 ERROR: bad cube representation DETAIL: syntax error at or near "a" SELECT '(1,2)('::cube AS cube; -- 5 ERROR: bad cube representation DETAIL: syntax error at or near "(" SELECT '1,2ab'::cube AS cube; -- 6 ERROR: bad cube representation DETAIL: syntax error at or near "a" SELECT '1 e7'::cube AS cube; -- 6 ERROR: bad cube representation DETAIL: syntax error at or near "e" SELECT '1,2a'::cube AS cube; -- 7 ERROR: bad cube representation DETAIL: syntax error at or near "a" SELECT '1..2'::cube AS cube; -- 7 ERROR: bad cube representation DETAIL: syntax error at or near ".2" -- -- Testing building cubes from float8 values -- SELECT cube(0::float8); cube ------ (0) (1 row) SELECT cube(1::float8); cube ------ (1) (1 row) SELECT cube(1,2); cube --------- (1),(2) (1 row) SELECT cube(cube(1,2),3); cube --------------- (1, 3),(2, 3) (1 row) SELECT cube(cube(1,2),3,4); cube --------------- (1, 3),(2, 4) (1 row) SELECT cube(cube(cube(1,2),3,4),5); cube --------------------- (1, 3, 5),(2, 4, 5) (1 row) SELECT cube(cube(cube(1,2),3,4),5,6); cube --------------------- (1, 3, 5),(2, 4, 6) (1 row) -- -- Test that the text -> cube cast was installed. -- SELECT '(0)'::text::cube; cube ------ (0) (1 row) -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. -- select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube; ERROR: bad cube representation DETAIL: more than 100 dimensions select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube; ERROR: bad cube representation DETAIL: more than 100 dimensions -- -- testing the operators -- -- equality/inequality: -- SELECT '24, 33.20'::cube = '24, 33.20'::cube AS bool; bool ------ t (1 row) SELECT '24, 33.20'::cube != '24, 33.20'::cube AS bool; bool ------ f (1 row) SELECT '24, 33.20'::cube = '24, 33.21'::cube AS bool; bool ------ f (1 row) SELECT '24, 33.20'::cube != '24, 33.21'::cube AS bool; bool ------ t (1 row) SELECT '(2,0),(3,1)'::cube = '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0),(3,1)'::cube = '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; bool ------ f (1 row) -- "lower than" / "greater than" -- (these operators are not useful for anything but ordering) -- SELECT '1'::cube > '2'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube < '2'::cube AS bool; bool ------ t (1 row) SELECT '1,1'::cube > '1,2'::cube AS bool; bool ------ f (1 row) SELECT '1,1'::cube < '1,2'::cube AS bool; bool ------ t (1 row) SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube > '(2,0),(3,1)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube < '(2,0),(3,1)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool; bool ------ f (1 row) SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool; bool ------ t (1 row) SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool; bool ------ f (1 row) -- "overlap" -- SELECT '1'::cube && '1'::cube AS bool; bool ------ t (1 row) SELECT '1'::cube && '2'::cube AS bool; bool ------ f (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '0'::cube AS bool; bool ------ t (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1'::cube AS bool; bool ------ t (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1,1,1'::cube AS bool; bool ------ t (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1,1),(2,2,2)]'::cube AS bool; bool ------ t (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1),(2,2)]'::cube AS bool; bool ------ t (1 row) SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool; bool ------ f (1 row) -- "overlap on the left" / "overlap on the right" -- (these operators are not useful at all but R-tree seems to be -- sensitive to their presence) -- SELECT '1'::cube &< '0'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube &< '1'::cube AS bool; bool ------ t (1 row) SELECT '1'::cube &< '2'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube &< '0'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube &< '1'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube &< '(0),(0.5)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube &< '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube &< '(0),(2)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube &< '(1),(2)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube &< '(2),(3)'::cube AS bool; bool ------ f (1 row) SELECT '0'::cube &> '1'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube &> '1'::cube AS bool; bool ------ t (1 row) SELECT '2'::cube &> '1'::cube AS bool; bool ------ f (1 row) SELECT '0'::cube &> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '1'::cube &> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(0.5)' &> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube &> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(2)'::cube &> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(1),(2)'::cube &> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(2),(3)'::cube &> '(0),(1)'::cube AS bool; bool ------ f (1 row) -- "left" / "right" -- (these operators are not useful but for 1-D or 2-D cubes, but R-tree -- seems to want them defined) -- SELECT '1'::cube << '0'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube << '1'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube << '2'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube << '0'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube << '1'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube << '(0),(0.5)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube << '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube << '(0),(2)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube << '(1),(2)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(1)'::cube << '(2),(3)'::cube AS bool; bool ------ t (1 row) SELECT '0'::cube >> '1'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube >> '1'::cube AS bool; bool ------ f (1 row) SELECT '2'::cube >> '1'::cube AS bool; bool ------ t (1 row) SELECT '0'::cube >> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '1'::cube >> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(0),(0.5)' >> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(1)'::cube >> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(0),(2)'::cube >> '(0),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(1),(2)'::cube >> '(0),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(2),(3)'::cube >> '(0),(1)'::cube AS bool; bool ------ t (1 row) -- "contained in" (the left operand is the cube entirely enclosed by -- the right operand): -- SELECT '0'::cube ~ '0'::cube AS bool; bool ------ t (1 row) SELECT '0,0,0'::cube ~ '0,0,0'::cube AS bool; bool ------ t (1 row) SELECT '0,0'::cube ~ '0,0,1'::cube AS bool; bool ------ t (1 row) SELECT '0,0,0'::cube ~ '0,0,1'::cube AS bool; bool ------ f (1 row) SELECT '1,0,0'::cube ~ '0,0,1'::cube AS bool; bool ------ f (1 row) SELECT '(1,0,0),(0,0,1)'::cube ~ '(1,0,0),(0,0,1)'::cube AS bool; bool ------ t (1 row) SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1),(1,1,1)'::cube AS bool; bool ------ t (1 row) SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool; bool ------ t (1 row) SELECT '0'::cube ~ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '1'::cube ~ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '-1'::cube ~ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube ~ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool; bool ------ t (1 row) SELECT '(-2),(1)'::cube ~ '(-1),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool; bool ------ f (1 row) -- "contains" (the left operand is the cube that entirely encloses the -- right operand) -- SELECT '0'::cube @ '0'::cube AS bool; bool ------ t (1 row) SELECT '0,0,0'::cube @ '0,0,0'::cube AS bool; bool ------ t (1 row) SELECT '0,0,1'::cube @ '0,0'::cube AS bool; bool ------ t (1 row) SELECT '0,0,1'::cube @ '0,0,0'::cube AS bool; bool ------ f (1 row) SELECT '0,0,1'::cube @ '1,0,0'::cube AS bool; bool ------ f (1 row) SELECT '(1,0,0),(0,0,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1,-1,-1),(1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube @ '0'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube @ '1'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube @ '-1'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube @ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1,-1),(1,1)'::cube @ '(-1),(1)'::cube AS bool; bool ------ t (1 row) SELECT '(-1),(1)'::cube @ '(-2),(1)'::cube AS bool; bool ------ f (1 row) SELECT '(-1,-1),(1,1)'::cube @ '(-2),(1)'::cube AS bool; bool ------ f (1 row) -- Test of distance function -- SELECT cube_distance('(0)'::cube,'(2,2,2,2)'::cube); cube_distance --------------- 4 (1 row) SELECT cube_distance('(0)'::cube,'(.3,.4)'::cube); cube_distance --------------- 0.5 (1 row) -- Test of cube function (text to cube) -- SELECT cube('('||1||','||1.2||')'); cube ---------- (1, 1.2) (1 row) SELECT cube(NULL); cube ------ (1 row) -- Test of cube_dim function (dimensions stored in cube) -- SELECT cube_dim('(0)'::cube); cube_dim ---------- 1 (1 row) SELECT cube_dim('(0,0)'::cube); cube_dim ---------- 2 (1 row) SELECT cube_dim('(0,0,0)'::cube); cube_dim ---------- 3 (1 row) -- Test of cube_ll_coord function (retrieves LL coodinate values) -- SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1); cube_ll_coord --------------- -1 (1 row) SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2); cube_ll_coord --------------- -2 (1 row) SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 3); cube_ll_coord --------------- 0 (1 row) -- Test of cube_ur_coord function (retrieves UR coodinate values) -- SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1); cube_ur_coord --------------- 2 (1 row) SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 2); cube_ur_coord --------------- 1 (1 row) SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 3); cube_ur_coord --------------- 0 (1 row) -- Test of cube_is_point -- SELECT cube_is_point('(0)'::cube); cube_is_point --------------- t (1 row) SELECT cube_is_point('(0,1,2)'::cube); cube_is_point --------------- t (1 row) SELECT cube_is_point('(0,1,2),(0,1,2)'::cube); cube_is_point --------------- t (1 row) SELECT cube_is_point('(0,1,2),(-1,1,2)'::cube); cube_is_point --------------- f (1 row) SELECT cube_is_point('(0,1,2),(0,-1,2)'::cube); cube_is_point --------------- f (1 row) SELECT cube_is_point('(0,1,2),(0,1,-2)'::cube); cube_is_point --------------- f (1 row) -- Test of cube_enlarge (enlarging and shrinking cubes) -- SELECT cube_enlarge('(0)'::cube, 0, 0); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(0)'::cube, 0, 1); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(0)'::cube, 0, 2); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(2),(-2)'::cube, 0, 4); cube_enlarge -------------- (-2),(2) (1 row) SELECT cube_enlarge('(0)'::cube, 1, 0); cube_enlarge -------------- (-1),(1) (1 row) SELECT cube_enlarge('(0)'::cube, 1, 1); cube_enlarge -------------- (-1),(1) (1 row) SELECT cube_enlarge('(0)'::cube, 1, 2); cube_enlarge ----------------- (-1, -1),(1, 1) (1 row) SELECT cube_enlarge('(2),(-2)'::cube, 1, 4); cube_enlarge ------------------------------- (-3, -1, -1, -1),(3, 1, 1, 1) (1 row) SELECT cube_enlarge('(0)'::cube, -1, 0); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(0)'::cube, -1, 1); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(0)'::cube, -1, 2); cube_enlarge -------------- (0) (1 row) SELECT cube_enlarge('(2),(-2)'::cube, -1, 4); cube_enlarge -------------- (-1),(1) (1 row) SELECT cube_enlarge('(0,0,0)'::cube, 1, 0); cube_enlarge ------------------------ (-1, -1, -1),(1, 1, 1) (1 row) SELECT cube_enlarge('(0,0,0)'::cube, 1, 2); cube_enlarge ------------------------ (-1, -1, -1),(1, 1, 1) (1 row) SELECT cube_enlarge('(2,-2),(-3,7)'::cube, 1, 2); cube_enlarge ----------------- (-4, -3),(3, 8) (1 row) SELECT cube_enlarge('(2,-2),(-3,7)'::cube, 3, 2); cube_enlarge ------------------ (-6, -5),(5, 10) (1 row) SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -1, 2); cube_enlarge ----------------- (-2, -1),(1, 6) (1 row) SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); cube_enlarge --------------------- (-0.5, 1),(-0.5, 4) (1 row) -- Load some example data and build the index -- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' CREATE INDEX test_cube_ix ON test_cube USING gist (c); SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)'; c -------------------------- (2424, 160),(2424, 81) (759, 187),(662, 163) (1444, 403),(1346, 344) (337, 455),(240, 359) (1594, 1043),(1517, 971) (5 rows) -- Test sorting SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c; c -------------------------- (337, 455),(240, 359) (759, 187),(662, 163) (1444, 403),(1346, 344) (1594, 1043),(1517, 971) (2424, 160),(2424, 81) (5 rows) Index: src/port/path.c =================================================================== RCS file: /home/cvsmirror/pgsql/src/port/path.c,v retrieving revision 1.36 diff -c -w -r1.36 path.c *** src/port/path.c 24 Sep 2004 05:16:35 -0000 1.36 --- src/port/path.c 17 Oct 2004 11:58:00 -0000 *************** *** 175,189 **** /* ! * Extracts the actual name of the program as called. */ const char * get_progname(const char *argv0) { if (!last_dir_separator(argv0)) ! return argv0; else ! return last_dir_separator(argv0) + 1; } --- 175,215 ---- /* ! * Extracts the actual name of the program as called - ! * stripped of .exe suffix if any */ const char * get_progname(const char *argv0) { + char *nodir_name; + #if defined(__CYGWIN__) || defined(WIN32) + char *exe; + #endif + if (!last_dir_separator(argv0)) ! nodir_name = argv0; else ! nodir_name = last_dir_separator(argv0) + 1; ! ! #if defined(__CYGWIN__) || defined(WIN32) ! if (strlen(nodir_name) > 4 && ! (exe = nodir_name + (strlen(nodir_name) - 4)) && ! stricmp(exe, EXE) == 0) ! { ! char *progname; ! /* strip .exe suffix, regardless of case */ ! progname = strdup(nodir_name); ! if (progname == NULL) ! { ! fprintf(stderr,"%s: out of memory\n",nodir_name); ! exit(1); ! } ! *(progname + strlen(progname) - 4) = '\0'; ! nodir_name = progname; ! } ! #endif ! ! return nodir_name; } Index: src/test/regress/pg_regress.sh =================================================================== RCS file: /home/cvsmirror/pgsql/src/test/regress/pg_regress.sh,v retrieving revision 1.47 diff -c -r1.47 pg_regress.sh *** src/test/regress/pg_regress.sh 22 Sep 2004 19:11:19 -0000 1.47 --- src/test/regress/pg_regress.sh 17 Oct 2004 18:55:55 -0000 *************** *** 470,476 **** if [ -n "$PGHOST" ]; then echo "(using postmaster on $PGHOST, $port_info)" else ! echo "(using postmaster on Unix socket, $port_info)" fi message "dropping database \"$dbname\"" "$bindir/dropdb" $psql_options "$dbname" --- 470,483 ---- if [ -n "$PGHOST" ]; then echo "(using postmaster on $PGHOST, $port_info)" else ! case $host_platform in ! *-*-mingw32*) ! echo "(using postmaster on localhost socket, $port_info)" ! ;; ! *) ! echo "(using postmaster on Unix socket, $port_info)" ! ;; ! esac fi message "dropping database \"$dbname\"" "$bindir/dropdb" $psql_options "$dbname"
I will add some comments to the code when applying. Your patch has been added to the PostgreSQL unapplied patches list at: http://momjian.postgresql.org/cgi-bin/pgpatches It will be applied as soon as one of the PostgreSQL committers reviews and approves it. --------------------------------------------------------------------------- Andrew Dunstan wrote: > > Attached are 2 patches and one additional alternative contrib regression > test file (for cube). The patches fix a misleading message in > pg_regress.sh, and strip the .exe suffix from the result of > get_progname() as previously discussed. This lets us get much further > with contrib regression tests - there are 2 remaining issues preventing > a clean run - one odd one in the seg module and a path issue in > tsearch2. I am looking into these. (Why am I bothered with all this? > Because I want the buildfarm system to run on Windows). > > One odd thing I have noticed in testing, is that dropping the regression > database takes a *very* long time, especially after the third or fourth > go, and I see messages about not being able to remove the directory, > which means rmtree() is failing somehow. > > cheers > > andrew > -- > -- Test cube datatype > -- > -- > -- first, define the datatype. Turn off echoing so that expected file > -- does not depend on contents of cube.sql. > -- > \set ECHO none > psql:cube.sql:10: NOTICE: type "cube" is not yet defined > DETAIL: Creating a shell type definition. > psql:cube.sql:15: NOTICE: argument type cube is only a shell > -- > -- testing the input and output functions > -- > -- Any number (a one-dimensional point) > SELECT '1'::cube AS cube; > cube > ------ > (1) > (1 row) > > SELECT '-1'::cube AS cube; > cube > ------ > (-1) > (1 row) > > SELECT '1.'::cube AS cube; > cube > ------ > (1) > (1 row) > > SELECT '-1.'::cube AS cube; > cube > ------ > (-1) > (1 row) > > SELECT '.1'::cube AS cube; > cube > ------- > (0.1) > (1 row) > > SELECT '-.1'::cube AS cube; > cube > -------- > (-0.1) > (1 row) > > SELECT '1.0'::cube AS cube; > cube > ------ > (1) > (1 row) > > SELECT '-1.0'::cube AS cube; > cube > ------ > (-1) > (1 row) > > SELECT '1e27'::cube AS cube; > cube > ---------- > (1e+027) > (1 row) > > SELECT '-1e27'::cube AS cube; > cube > ----------- > (-1e+027) > (1 row) > > SELECT '1.0e27'::cube AS cube; > cube > ---------- > (1e+027) > (1 row) > > SELECT '-1.0e27'::cube AS cube; > cube > ----------- > (-1e+027) > (1 row) > > SELECT '1e+27'::cube AS cube; > cube > ---------- > (1e+027) > (1 row) > > SELECT '-1e+27'::cube AS cube; > cube > ----------- > (-1e+027) > (1 row) > > SELECT '1.0e+27'::cube AS cube; > cube > ---------- > (1e+027) > (1 row) > > SELECT '-1.0e+27'::cube AS cube; > cube > ----------- > (-1e+027) > (1 row) > > SELECT '1e-7'::cube AS cube; > cube > ---------- > (1e-007) > (1 row) > > SELECT '-1e-7'::cube AS cube; > cube > ----------- > (-1e-007) > (1 row) > > SELECT '1.0e-7'::cube AS cube; > cube > ---------- > (1e-007) > (1 row) > > SELECT '-1.0e-7'::cube AS cube; > cube > ----------- > (-1e-007) > (1 row) > > SELECT '1e-700'::cube AS cube; > cube > ------ > (0) > (1 row) > > SELECT '-1e-700'::cube AS cube; > cube > ------ > (0) > (1 row) > > SELECT '1234567890123456'::cube AS cube; > cube > ------------------------- > (1.23456789012346e+015) > (1 row) > > SELECT '+1234567890123456'::cube AS cube; > cube > ------------------------- > (1.23456789012346e+015) > (1 row) > > SELECT '-1234567890123456'::cube AS cube; > cube > -------------------------- > (-1.23456789012346e+015) > (1 row) > > SELECT '.1234567890123456'::cube AS cube; > cube > --------------------- > (0.123456789012346) > (1 row) > > SELECT '+.1234567890123456'::cube AS cube; > cube > --------------------- > (0.123456789012346) > (1 row) > > SELECT '-.1234567890123456'::cube AS cube; > cube > ---------------------- > (-0.123456789012346) > (1 row) > > -- simple lists (points) > SELECT '1,2'::cube AS cube; > cube > -------- > (1, 2) > (1 row) > > SELECT '(1,2)'::cube AS cube; > cube > -------- > (1, 2) > (1 row) > > SELECT '1,2,3,4,5'::cube AS cube; > cube > ----------------- > (1, 2, 3, 4, 5) > (1 row) > > SELECT '(1,2,3,4,5)'::cube AS cube; > cube > ----------------- > (1, 2, 3, 4, 5) > (1 row) > > -- double lists (cubes) > SELECT '(0),(0)'::cube AS cube; > cube > ------ > (0) > (1 row) > > SELECT '(0),(1)'::cube AS cube; > cube > --------- > (0),(1) > (1 row) > > SELECT '[(0),(0)]'::cube AS cube; > cube > ------ > (0) > (1 row) > > SELECT '[(0),(1)]'::cube AS cube; > cube > --------- > (0),(1) > (1 row) > > SELECT '(0,0,0,0),(0,0,0,0)'::cube AS cube; > cube > -------------- > (0, 0, 0, 0) > (1 row) > > SELECT '(0,0,0,0),(1,0,0,0)'::cube AS cube; > cube > --------------------------- > (0, 0, 0, 0),(1, 0, 0, 0) > (1 row) > > SELECT '[(0,0,0,0),(0,0,0,0)]'::cube AS cube; > cube > -------------- > (0, 0, 0, 0) > (1 row) > > SELECT '[(0,0,0,0),(1,0,0,0)]'::cube AS cube; > cube > --------------------------- > (0, 0, 0, 0),(1, 0, 0, 0) > (1 row) > > -- invalid input: parse errors > SELECT ''::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at end of input > SELECT 'ABC'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "A" > SELECT '()'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near ")" > SELECT '[]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "]" > SELECT '[()]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near ")" > SELECT '[(1)]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "]" > SELECT '[(1),]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "]" > SELECT '[(1),2]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "2" > SELECT '[(1),(2),(3)]'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "," > SELECT '1,'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at end of input > SELECT '1,2,'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at end of input > SELECT '1,,2'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "," > SELECT '(1,)'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near ")" > SELECT '(1,2,)'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near ")" > SELECT '(1,,2)'::cube AS cube; > ERROR: bad cube representation > DETAIL: syntax error at or near "," > -- invalid input: semantic errors and trailing garbage > SELECT '[(1),(2)],'::cube AS cube; -- 0 > ERROR: bad cube representation > DETAIL: syntax error at or near "," > SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1 > ERROR: bad cube representation > DETAIL: different point dimensions in (1,2,3) and (2,3) > SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1 > ERROR: bad cube representation > DETAIL: different point dimensions in (1,2) and (1,2,3) > SELECT '(1),(2),'::cube AS cube; -- 2 > ERROR: bad cube representation > DETAIL: syntax error at or near "," > SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3 > ERROR: bad cube representation > DETAIL: different point dimensions in (1,2,3) and (2,3) > SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3 > ERROR: bad cube representation > DETAIL: different point dimensions in (1,2) and (1,2,3) > SELECT '(1,2,3)ab'::cube AS cube; -- 4 > ERROR: bad cube representation > DETAIL: syntax error at or near "a" > SELECT '(1,2,3)a'::cube AS cube; -- 5 > ERROR: bad cube representation > DETAIL: syntax error at or near "a" > SELECT '(1,2)('::cube AS cube; -- 5 > ERROR: bad cube representation > DETAIL: syntax error at or near "(" > SELECT '1,2ab'::cube AS cube; -- 6 > ERROR: bad cube representation > DETAIL: syntax error at or near "a" > SELECT '1 e7'::cube AS cube; -- 6 > ERROR: bad cube representation > DETAIL: syntax error at or near "e" > SELECT '1,2a'::cube AS cube; -- 7 > ERROR: bad cube representation > DETAIL: syntax error at or near "a" > SELECT '1..2'::cube AS cube; -- 7 > ERROR: bad cube representation > DETAIL: syntax error at or near ".2" > -- > -- Testing building cubes from float8 values > -- > SELECT cube(0::float8); > cube > ------ > (0) > (1 row) > > SELECT cube(1::float8); > cube > ------ > (1) > (1 row) > > SELECT cube(1,2); > cube > --------- > (1),(2) > (1 row) > > SELECT cube(cube(1,2),3); > cube > --------------- > (1, 3),(2, 3) > (1 row) > > SELECT cube(cube(1,2),3,4); > cube > --------------- > (1, 3),(2, 4) > (1 row) > > SELECT cube(cube(cube(1,2),3,4),5); > cube > --------------------- > (1, 3, 5),(2, 4, 5) > (1 row) > > SELECT cube(cube(cube(1,2),3,4),5,6); > cube > --------------------- > (1, 3, 5),(2, 4, 6) > (1 row) > > -- > -- Test that the text -> cube cast was installed. > -- > SELECT '(0)'::text::cube; > cube > ------ > (0) > (1 row) > > -- > -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. > -- > select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube; > ERROR: bad cube representation > DETAIL: more than 100 dimensions > select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube; > ERROR: bad cube representation > DETAIL: more than 100 dimensions > -- > -- testing the operators > -- > -- equality/inequality: > -- > SELECT '24, 33.20'::cube = '24, 33.20'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '24, 33.20'::cube != '24, 33.20'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '24, 33.20'::cube = '24, 33.21'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '24, 33.20'::cube != '24, 33.21'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0),(3,1)'::cube = '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0),(3,1)'::cube = '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; > bool > ------ > f > (1 row) > > -- "lower than" / "greater than" > -- (these operators are not useful for anything but ordering) > -- > SELECT '1'::cube > '2'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube < '2'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '1,1'::cube > '1,2'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1,1'::cube < '1,2'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,0),(3,1,0,0,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,1),(3,1,0,0,0)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0),(3,1)'::cube > '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0),(3,1)'::cube < '(2,0,0,0,0),(3,1,0,0,0)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube > '(2,0),(3,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0,0,0,0),(3,1,0,0,1)'::cube < '(2,0),(3,1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0,0,0,1),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube > '(2,0),(3,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2,0,0,0,0),(3,1,0,0,0)'::cube < '(2,0),(3,1)'::cube AS bool; > bool > ------ > f > (1 row) > > -- "overlap" > -- > SELECT '1'::cube && '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '1'::cube && '2'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '1,1,1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1,1),(2,2,2)]'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(1,1),(2,2)]'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '[(-1,-1,-1),(1,1,1)]'::cube && '[(2,1,1),(2,2,2)]'::cube AS bool; > bool > ------ > f > (1 row) > > -- "overlap on the left" / "overlap on the right" > -- (these operators are not useful at all but R-tree seems to be > -- sensitive to their presence) > -- > SELECT '1'::cube &< '0'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube &< '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '1'::cube &< '2'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube &< '0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube &< '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube &< '(0),(0.5)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube &< '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube &< '(0),(2)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube &< '(1),(2)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube &< '(2),(3)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '0'::cube &> '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube &> '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '2'::cube &> '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '0'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '1'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(0.5)' &> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(2)'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(1),(2)'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(2),(3)'::cube &> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > -- "left" / "right" > -- (these operators are not useful but for 1-D or 2-D cubes, but R-tree > -- seems to want them defined) > -- > SELECT '1'::cube << '0'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube << '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube << '2'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube << '0'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube << '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube << '(0),(0.5)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube << '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube << '(0),(2)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube << '(1),(2)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(1)'::cube << '(2),(3)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0'::cube >> '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube >> '1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '2'::cube >> '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(0),(0.5)' >> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(1)'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(0),(2)'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(1),(2)'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(2),(3)'::cube >> '(0),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > -- "contained in" (the left operand is the cube entirely enclosed by > -- the right operand): > -- > SELECT '0'::cube ~ '0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0,0'::cube ~ '0,0,0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0'::cube ~ '0,0,1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0,0'::cube ~ '0,0,1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '1,0,0'::cube ~ '0,0,1'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(1,0,0),(0,0,1)'::cube ~ '(1,0,0),(0,0,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1),(1,1,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(1,0,0),(0,0,1)'::cube ~ '(-1,-1,-1,-1),(1,1,1,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0'::cube ~ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '1'::cube ~ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '-1'::cube ~ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube ~ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-2),(1)'::cube ~ '(-1),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(-2),(1)'::cube ~ '(-1,-1),(1,1)'::cube AS bool; > bool > ------ > f > (1 row) > > -- "contains" (the left operand is the cube that entirely encloses the > -- right operand) > -- > SELECT '0'::cube @ '0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0,0'::cube @ '0,0,0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0,1'::cube @ '0,0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '0,0,1'::cube @ '0,0,0'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '0,0,1'::cube @ '1,0,0'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(1,0,0),(0,0,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1,-1,-1),(1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1,-1,-1,-1),(1,1,1,1)'::cube @ '(1,0,0),(0,0,1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube @ '0'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube @ '1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube @ '-1'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube @ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1,-1),(1,1)'::cube @ '(-1),(1)'::cube AS bool; > bool > ------ > t > (1 row) > > SELECT '(-1),(1)'::cube @ '(-2),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > SELECT '(-1,-1),(1,1)'::cube @ '(-2),(1)'::cube AS bool; > bool > ------ > f > (1 row) > > -- Test of distance function > -- > SELECT cube_distance('(0)'::cube,'(2,2,2,2)'::cube); > cube_distance > --------------- > 4 > (1 row) > > SELECT cube_distance('(0)'::cube,'(.3,.4)'::cube); > cube_distance > --------------- > 0.5 > (1 row) > > -- Test of cube function (text to cube) > -- > SELECT cube('('||1||','||1.2||')'); > cube > ---------- > (1, 1.2) > (1 row) > > SELECT cube(NULL); > cube > ------ > > (1 row) > > -- Test of cube_dim function (dimensions stored in cube) > -- > SELECT cube_dim('(0)'::cube); > cube_dim > ---------- > 1 > (1 row) > > SELECT cube_dim('(0,0)'::cube); > cube_dim > ---------- > 2 > (1 row) > > SELECT cube_dim('(0,0,0)'::cube); > cube_dim > ---------- > 3 > (1 row) > > -- Test of cube_ll_coord function (retrieves LL coodinate values) > -- > SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 1); > cube_ll_coord > --------------- > -1 > (1 row) > > SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 2); > cube_ll_coord > --------------- > -2 > (1 row) > > SELECT cube_ll_coord('(-1,1),(2,-2)'::cube, 3); > cube_ll_coord > --------------- > 0 > (1 row) > > -- Test of cube_ur_coord function (retrieves UR coodinate values) > -- > SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 1); > cube_ur_coord > --------------- > 2 > (1 row) > > SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 2); > cube_ur_coord > --------------- > 1 > (1 row) > > SELECT cube_ur_coord('(-1,1),(2,-2)'::cube, 3); > cube_ur_coord > --------------- > 0 > (1 row) > > -- Test of cube_is_point > -- > SELECT cube_is_point('(0)'::cube); > cube_is_point > --------------- > t > (1 row) > > SELECT cube_is_point('(0,1,2)'::cube); > cube_is_point > --------------- > t > (1 row) > > SELECT cube_is_point('(0,1,2),(0,1,2)'::cube); > cube_is_point > --------------- > t > (1 row) > > SELECT cube_is_point('(0,1,2),(-1,1,2)'::cube); > cube_is_point > --------------- > f > (1 row) > > SELECT cube_is_point('(0,1,2),(0,-1,2)'::cube); > cube_is_point > --------------- > f > (1 row) > > SELECT cube_is_point('(0,1,2),(0,1,-2)'::cube); > cube_is_point > --------------- > f > (1 row) > > -- Test of cube_enlarge (enlarging and shrinking cubes) > -- > SELECT cube_enlarge('(0)'::cube, 0, 0); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(0)'::cube, 0, 1); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(0)'::cube, 0, 2); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(2),(-2)'::cube, 0, 4); > cube_enlarge > -------------- > (-2),(2) > (1 row) > > SELECT cube_enlarge('(0)'::cube, 1, 0); > cube_enlarge > -------------- > (-1),(1) > (1 row) > > SELECT cube_enlarge('(0)'::cube, 1, 1); > cube_enlarge > -------------- > (-1),(1) > (1 row) > > SELECT cube_enlarge('(0)'::cube, 1, 2); > cube_enlarge > ----------------- > (-1, -1),(1, 1) > (1 row) > > SELECT cube_enlarge('(2),(-2)'::cube, 1, 4); > cube_enlarge > ------------------------------- > (-3, -1, -1, -1),(3, 1, 1, 1) > (1 row) > > SELECT cube_enlarge('(0)'::cube, -1, 0); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(0)'::cube, -1, 1); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(0)'::cube, -1, 2); > cube_enlarge > -------------- > (0) > (1 row) > > SELECT cube_enlarge('(2),(-2)'::cube, -1, 4); > cube_enlarge > -------------- > (-1),(1) > (1 row) > > SELECT cube_enlarge('(0,0,0)'::cube, 1, 0); > cube_enlarge > ------------------------ > (-1, -1, -1),(1, 1, 1) > (1 row) > > SELECT cube_enlarge('(0,0,0)'::cube, 1, 2); > cube_enlarge > ------------------------ > (-1, -1, -1),(1, 1, 1) > (1 row) > > SELECT cube_enlarge('(2,-2),(-3,7)'::cube, 1, 2); > cube_enlarge > ----------------- > (-4, -3),(3, 8) > (1 row) > > SELECT cube_enlarge('(2,-2),(-3,7)'::cube, 3, 2); > cube_enlarge > ------------------ > (-6, -5),(5, 10) > (1 row) > > SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -1, 2); > cube_enlarge > ----------------- > (-2, -1),(1, 6) > (1 row) > > SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); > cube_enlarge > --------------------- > (-0.5, 1),(-0.5, 4) > (1 row) > > -- Load some example data and build the index > -- > CREATE TABLE test_cube (c cube); > \copy test_cube from 'data/test_cube.data' > CREATE INDEX test_cube_ix ON test_cube USING gist (c); > SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)'; > c > -------------------------- > (2424, 160),(2424, 81) > (759, 187),(662, 163) > (1444, 403),(1346, 344) > (337, 455),(240, 359) > (1594, 1043),(1517, 971) > (5 rows) > > -- Test sorting > SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c; > c > -------------------------- > (337, 455),(240, 359) > (759, 187),(662, 163) > (1444, 403),(1346, 344) > (1594, 1043),(1517, 971) > (2424, 160),(2424, 81) > (5 rows) > > > ---------------------------(end of broadcast)--------------------------- > TIP 4: Don't 'kill -9' the postmaster -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073
Andrew Dunstan <andrew@dunslane.net> writes: > Attached are 2 patches and one additional alternative contrib regression > test file (for cube). The patches fix a misleading message in > pg_regress.sh, and strip the .exe suffix from the result of > get_progname() as previously discussed. Applied. regards, tom lane
Andrew Dunstan wrote: > > Attached are 2 patches and one additional alternative contrib regression > test file (for cube). The patches fix a misleading message in > pg_regress.sh, and strip the .exe suffix from the result of > get_progname() as previously discussed. This lets us get much further > with contrib regression tests - there are 2 remaining issues preventing > a clean run - one odd one in the seg module and a path issue in > tsearch2. I am looking into these. (Why am I bothered with all this? > Because I want the buildfarm system to run on Windows). I have changed the .exe patch to use pg_strcasecmp() rather than stricmp(), and changed it to use sizeof(EXE) rather than '4'. Patch attached and applied. -- Bruce Momjian | http://candle.pha.pa.us pgman@candle.pha.pa.us | (610) 359-1001 + If your life is a hard drive, | 13 Roberts Road + Christ can be your backup. | Newtown Square, Pennsylvania 19073 Index: src/port/path.c =================================================================== RCS file: /cvsroot/pgsql/src/port/path.c,v retrieving revision 1.38 diff -c -c -r1.38 path.c *** src/port/path.c 27 Oct 2004 17:17:09 -0000 1.38 --- src/port/path.c 1 Nov 2004 04:21:56 -0000 *************** *** 195,202 **** #if defined(__CYGWIN__) || defined(WIN32) /* strip .exe suffix, regardless of case */ ! if (strlen(nodir_name) > 4 && ! stricmp(nodir_name + (strlen(nodir_name) - 4), EXE) == 0) { char *progname; --- 195,202 ---- #if defined(__CYGWIN__) || defined(WIN32) /* strip .exe suffix, regardless of case */ ! if (strlen(nodir_name) > sizeof(EXE) && ! pg_strcasecmp(nodir_name + strlen(nodir_name) - sizeof(EXE), EXE) == 0) { char *progname; *************** *** 206,212 **** fprintf(stderr, "%s: out of memory\n", nodir_name); exit(1); } ! progname[strlen(progname) - 4] = '\0'; nodir_name = progname; } #endif --- 206,212 ---- fprintf(stderr, "%s: out of memory\n", nodir_name); exit(1); } ! progname[strlen(progname) - sizeof(EXE)] = '\0'; nodir_name = progname; } #endif