summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2014-06-12 20:51:02 +0000
committerTom Lane2014-06-12 20:51:02 +0000
commitd2783bee3045d6190dcff0ccf985c4e60a660f99 (patch)
treec264cc23752d5c11b9db6d422ba13b7fc573eb10
parent2dd352d4b01648cac0354c754d9617b2e61f065d (diff)
Remove inadvertent copyright violation in largeobject regression test.
Robert Frost is no longer with us, but his copyrights still are, so let's stop using "Stopping by Woods on a Snowy Evening" as test data before somebody decides to sue us. Wordsworth is more safely dead.
-rw-r--r--src/test/regress/input/largeobject.source60
-rw-r--r--src/test/regress/output/largeobject.source88
-rw-r--r--src/test/regress/output/largeobject_1.source88
3 files changed, 130 insertions, 106 deletions
diff --git a/src/test/regress/input/largeobject.source b/src/test/regress/input/largeobject.source
index ecb5340a47..bd577d58b2 100644
--- a/src/test/regress/input/largeobject.source
+++ b/src/test/regress/input/largeobject.source
@@ -42,27 +42,35 @@ UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS in
-- lowrite(fd integer, data bytea) returns integer
-- the integer is the number of bytes written
SELECT lowrite(fd, '
-Whose woods these are I think I know,
-His house is in the village though.
-He will not see me stopping here,
-To watch his woods fill up with snow.
-
-My little horse must think it queer,
-To stop without a farmhouse near,
-Between the woods and frozen lake,
-The darkest evening of the year.
-
-He gives his harness bells a shake,
-To ask if there is some mistake.
-The only other sound''s the sweep,
-Of easy wind and downy flake.
-
-The woods are lovely, dark and deep,
-But I have promises to keep,
-And miles to go before I sleep,
-And miles to go before I sleep.
-
- -- Robert Frost
+I wandered lonely as a cloud
+That floats on high o''er vales and hills,
+When all at once I saw a crowd,
+A host, of golden daffodils;
+Beside the lake, beneath the trees,
+Fluttering and dancing in the breeze.
+
+Continuous as the stars that shine
+And twinkle on the milky way,
+They stretched in never-ending line
+Along the margin of a bay:
+Ten thousand saw I at a glance,
+Tossing their heads in sprightly dance.
+
+The waves beside them danced; but they
+Out-did the sparkling waves in glee:
+A poet could not but be gay,
+In such a jocund company:
+I gazed--and gazed--but little thought
+What wealth the show to me had brought:
+
+For oft, when on my couch I lie
+In vacant or in pensive mood,
+They flash upon that inward eye
+Which is the bliss of solitude;
+And then my heart with pleasure fills,
+And dances with the daffodils.
+
+ -- William Wordsworth
') FROM lotest_stash_values;
-- lo_close(fd integer) returns integer
@@ -81,11 +89,11 @@ UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS inte
-- SEEK_CUR (= 1) meaning relative to current position
-- SEEK_END (= 2) meaning relative to end (offset better be negative)
-- returns current position in file
-SELECT lo_lseek(fd, 422, 0) FROM lotest_stash_values;
+SELECT lo_lseek(fd, 104, 0) FROM lotest_stash_values;
-- loread/lowrite names are wonky, different from other functions which are lo_*
-- loread(fd integer, len integer) returns bytea
-SELECT loread(fd, 35) FROM lotest_stash_values;
+SELECT loread(fd, 28) FROM lotest_stash_values;
SELECT lo_lseek(fd, -19, 1) FROM lotest_stash_values;
@@ -93,9 +101,9 @@ SELECT lowrite(fd, 'n') FROM lotest_stash_values;
SELECT lo_tell(fd) FROM lotest_stash_values;
-SELECT lo_lseek(fd, -156, 2) FROM lotest_stash_values;
+SELECT lo_lseek(fd, -744, 2) FROM lotest_stash_values;
-SELECT loread(fd, 35) FROM lotest_stash_values;
+SELECT loread(fd, 28) FROM lotest_stash_values;
SELECT lo_close(fd) FROM lotest_stash_values;
@@ -110,7 +118,7 @@ ABORT;
BEGIN;
UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
-SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+SELECT lo_truncate(fd, 11) FROM lotest_stash_values;
SELECT loread(fd, 15) FROM lotest_stash_values;
SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;
diff --git a/src/test/regress/output/largeobject.source b/src/test/regress/output/largeobject.source
index 56a50c0a15..63a51241d0 100644
--- a/src/test/regress/output/largeobject.source
+++ b/src/test/regress/output/largeobject.source
@@ -41,31 +41,39 @@ UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS in
-- lowrite(fd integer, data bytea) returns integer
-- the integer is the number of bytes written
SELECT lowrite(fd, '
-Whose woods these are I think I know,
-His house is in the village though.
-He will not see me stopping here,
-To watch his woods fill up with snow.
-
-My little horse must think it queer,
-To stop without a farmhouse near,
-Between the woods and frozen lake,
-The darkest evening of the year.
-
-He gives his harness bells a shake,
-To ask if there is some mistake.
-The only other sound''s the sweep,
-Of easy wind and downy flake.
-
-The woods are lovely, dark and deep,
-But I have promises to keep,
-And miles to go before I sleep,
-And miles to go before I sleep.
-
- -- Robert Frost
+I wandered lonely as a cloud
+That floats on high o''er vales and hills,
+When all at once I saw a crowd,
+A host, of golden daffodils;
+Beside the lake, beneath the trees,
+Fluttering and dancing in the breeze.
+
+Continuous as the stars that shine
+And twinkle on the milky way,
+They stretched in never-ending line
+Along the margin of a bay:
+Ten thousand saw I at a glance,
+Tossing their heads in sprightly dance.
+
+The waves beside them danced; but they
+Out-did the sparkling waves in glee:
+A poet could not but be gay,
+In such a jocund company:
+I gazed--and gazed--but little thought
+What wealth the show to me had brought:
+
+For oft, when on my couch I lie
+In vacant or in pensive mood,
+They flash upon that inward eye
+Which is the bliss of solitude;
+And then my heart with pleasure fills,
+And dances with the daffodils.
+
+ -- William Wordsworth
') FROM lotest_stash_values;
lowrite
---------
- 578
+ 848
(1 row)
-- lo_close(fd integer) returns integer
@@ -86,24 +94,24 @@ UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS inte
-- SEEK_CUR (= 1) meaning relative to current position
-- SEEK_END (= 2) meaning relative to end (offset better be negative)
-- returns current position in file
-SELECT lo_lseek(fd, 422, 0) FROM lotest_stash_values;
+SELECT lo_lseek(fd, 104, 0) FROM lotest_stash_values;
lo_lseek
----------
- 422
+ 104
(1 row)
-- loread/lowrite names are wonky, different from other functions which are lo_*
-- loread(fd integer, len integer) returns bytea
-SELECT loread(fd, 35) FROM lotest_stash_values;
- loread
--------------------------------------
- The woods are lovely, dark and deep
+SELECT loread(fd, 28) FROM lotest_stash_values;
+ loread
+------------------------------
+ A host, of golden daffodils;
(1 row)
SELECT lo_lseek(fd, -19, 1) FROM lotest_stash_values;
lo_lseek
----------
- 438
+ 113
(1 row)
SELECT lowrite(fd, 'n') FROM lotest_stash_values;
@@ -115,19 +123,19 @@ SELECT lowrite(fd, 'n') FROM lotest_stash_values;
SELECT lo_tell(fd) FROM lotest_stash_values;
lo_tell
---------
- 439
+ 114
(1 row)
-SELECT lo_lseek(fd, -156, 2) FROM lotest_stash_values;
+SELECT lo_lseek(fd, -744, 2) FROM lotest_stash_values;
lo_lseek
----------
- 422
+ 104
(1 row)
-SELECT loread(fd, 35) FROM lotest_stash_values;
- loread
--------------------------------------
- The woods are lonely, dark and deep
+SELECT loread(fd, 28) FROM lotest_stash_values;
+ loread
+------------------------------
+ A host, on golden daffodils;
(1 row)
SELECT lo_close(fd) FROM lotest_stash_values;
@@ -149,16 +157,16 @@ ABORT;
-- Test truncation.
BEGIN;
UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
-SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+SELECT lo_truncate(fd, 11) FROM lotest_stash_values;
lo_truncate
-------------
0
(1 row)
SELECT loread(fd, 15) FROM lotest_stash_values;
- loread
----------------
- \012Whose woo
+ loread
+----------------
+ \012I wandered
(1 row)
SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;
diff --git a/src/test/regress/output/largeobject_1.source b/src/test/regress/output/largeobject_1.source
index c3b537c4ba..dee56e10b3 100644
--- a/src/test/regress/output/largeobject_1.source
+++ b/src/test/regress/output/largeobject_1.source
@@ -41,31 +41,39 @@ UPDATE lotest_stash_values SET fd = lo_open(loid, CAST(x'20000' | x'40000' AS in
-- lowrite(fd integer, data bytea) returns integer
-- the integer is the number of bytes written
SELECT lowrite(fd, '
-Whose woods these are I think I know,
-His house is in the village though.
-He will not see me stopping here,
-To watch his woods fill up with snow.
-
-My little horse must think it queer,
-To stop without a farmhouse near,
-Between the woods and frozen lake,
-The darkest evening of the year.
-
-He gives his harness bells a shake,
-To ask if there is some mistake.
-The only other sound''s the sweep,
-Of easy wind and downy flake.
-
-The woods are lovely, dark and deep,
-But I have promises to keep,
-And miles to go before I sleep,
-And miles to go before I sleep.
-
- -- Robert Frost
+I wandered lonely as a cloud
+That floats on high o''er vales and hills,
+When all at once I saw a crowd,
+A host, of golden daffodils;
+Beside the lake, beneath the trees,
+Fluttering and dancing in the breeze.
+
+Continuous as the stars that shine
+And twinkle on the milky way,
+They stretched in never-ending line
+Along the margin of a bay:
+Ten thousand saw I at a glance,
+Tossing their heads in sprightly dance.
+
+The waves beside them danced; but they
+Out-did the sparkling waves in glee:
+A poet could not but be gay,
+In such a jocund company:
+I gazed--and gazed--but little thought
+What wealth the show to me had brought:
+
+For oft, when on my couch I lie
+In vacant or in pensive mood,
+They flash upon that inward eye
+Which is the bliss of solitude;
+And then my heart with pleasure fills,
+And dances with the daffodils.
+
+ -- William Wordsworth
') FROM lotest_stash_values;
lowrite
---------
- 578
+ 848
(1 row)
-- lo_close(fd integer) returns integer
@@ -86,24 +94,24 @@ UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS inte
-- SEEK_CUR (= 1) meaning relative to current position
-- SEEK_END (= 2) meaning relative to end (offset better be negative)
-- returns current position in file
-SELECT lo_lseek(fd, 422, 0) FROM lotest_stash_values;
+SELECT lo_lseek(fd, 104, 0) FROM lotest_stash_values;
lo_lseek
----------
- 422
+ 104
(1 row)
-- loread/lowrite names are wonky, different from other functions which are lo_*
-- loread(fd integer, len integer) returns bytea
-SELECT loread(fd, 35) FROM lotest_stash_values;
- loread
--------------------------------------
- The woods are lovely, dark and deep
+SELECT loread(fd, 28) FROM lotest_stash_values;
+ loread
+------------------------------
+ A host, of golden daffodils;
(1 row)
SELECT lo_lseek(fd, -19, 1) FROM lotest_stash_values;
lo_lseek
----------
- 438
+ 113
(1 row)
SELECT lowrite(fd, 'n') FROM lotest_stash_values;
@@ -115,19 +123,19 @@ SELECT lowrite(fd, 'n') FROM lotest_stash_values;
SELECT lo_tell(fd) FROM lotest_stash_values;
lo_tell
---------
- 439
+ 114
(1 row)
-SELECT lo_lseek(fd, -156, 2) FROM lotest_stash_values;
+SELECT lo_lseek(fd, -744, 2) FROM lotest_stash_values;
lo_lseek
----------
- 422
+ 104
(1 row)
-SELECT loread(fd, 35) FROM lotest_stash_values;
- loread
--------------------------------------
- The woods are lonely, dark and deep
+SELECT loread(fd, 28) FROM lotest_stash_values;
+ loread
+------------------------------
+ A host, on golden daffodils;
(1 row)
SELECT lo_close(fd) FROM lotest_stash_values;
@@ -149,16 +157,16 @@ ABORT;
-- Test truncation.
BEGIN;
UPDATE lotest_stash_values SET fd=lo_open(loid, CAST(x'20000' | x'40000' AS integer));
-SELECT lo_truncate(fd, 10) FROM lotest_stash_values;
+SELECT lo_truncate(fd, 11) FROM lotest_stash_values;
lo_truncate
-------------
0
(1 row)
SELECT loread(fd, 15) FROM lotest_stash_values;
- loread
----------------
- \012Whose woo
+ loread
+----------------
+ \012I wandered
(1 row)
SELECT lo_truncate(fd, 10000) FROM lotest_stash_values;