From 00a38075682a1ce5c52d7efc38b80ae1ec736348 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 3 Mar 2007 20:17:25 +0000 Subject: [PATCH] Cosmetic patch to large object regression test. Jeremy Drake --- src/test/regress/input/largeobject.source | 10 +++++----- src/test/regress/output/largeobject.source | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source index 8386922133..c47cee3a61 100644 --- a/src/test/regress/input/largeobject.source +++ b/src/test/regress/input/largeobject.source @@ -14,11 +14,11 @@ BEGIN; -- lo_open(lobjId oid, mode integer) returns integer -- The mode parameter to lo_open uses two constants: --- INV_READ = 0x20000 = 2 * 16^4 --- INV_WRITE = 0x40000 = 4 * 16^4 +-- INV_READ = 0x20000 +-- INV_WRITE = 0x40000 -- The return value is a file descriptor-like value which remains valid for the -- transaction. -UPDATE lotest_stash_values SET fd = lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- loread/lowrite names are wonky, different from other functions which are lo_* -- lowrite(fd integer, data bytea) returns integer @@ -55,7 +55,7 @@ END; -- Read out a portion BEGIN; -UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- lo_lseek(fd integer, offset integer, whence integer) returns integer -- offset is in bytes, whence is one of three values: @@ -111,7 +111,7 @@ TRUNCATE lotest_stash_values; INSERT INTO lotest_stash_values (loid) SELECT lo_import('@abs_srcdir@/data/tenk.data'); BEGIN; -UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- with the default BLKSZ, LOBLKSZ = 2048, so this positions us for a block -- edge case diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source index f4addeaab5..4fd3bc156d 100644 --- a/src/test/regress/output/largeobject.source +++ b/src/test/regress/output/largeobject.source @@ -11,11 +11,11 @@ INSERT INTO lotest_stash_values (loid) SELECT lo_creat(42); BEGIN; -- lo_open(lobjId oid, mode integer) returns integer -- The mode parameter to lo_open uses two constants: --- INV_READ = 0x20000 = 2 * 16^4 --- INV_WRITE = 0x40000 = 4 * 16^4 +-- INV_READ = 0x20000 +-- INV_WRITE = 0x40000 -- The return value is a file descriptor-like value which remains valid for the -- transaction. -UPDATE lotest_stash_values SET fd = lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- loread/lowrite names are wonky, different from other functions which are lo_* -- lowrite(fd integer, data bytea) returns integer -- the integer is the number of bytes written @@ -58,7 +58,7 @@ SELECT lo_close(fd) FROM lotest_stash_values; END; -- Read out a portion BEGIN; -UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- lo_lseek(fd integer, offset integer, whence integer) returns integer -- offset is in bytes, whence is one of three values: -- SEEK_SET (= 0) meaning relative to beginning @@ -191,7 +191,7 @@ SELECT lo_unlink(loid) from lotest_stash_values; TRUNCATE lotest_stash_values; INSERT INTO lotest_stash_values (loid) SELECT lo_import('@abs_srcdir@/data/tenk.data'); BEGIN; -UPDATE lotest_stash_values SET fd=lo_open(loid, CAST((2 | 4) * 16^4 AS integer)); +UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer)); -- with the default BLKSZ, LOBLKSZ = 2048, so this positions us for a block -- edge case SELECT lo_lseek(fd, 2030, 0) FROM lotest_stash_values; -- 2.40.0