Skip to content

Commit 759024a

Browse files
baobao0206baobao0206
committed
Fix some answer files
1 parent cecefee commit 759024a

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎src/test/regress/expected/directory_table.out‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -916,16 +916,11 @@ SELECT relative_path, content FROM directory_table('dir_table2') ORDER BY 1;
916916
nation4 | \x307c414c47455249417c307c20686167676c652e206361726566756c6c792066696e616c206465706f736974732064657465637420736c796c7920616761690a317c415247454e54494e417c317c616c20666f7865732070726f6d69736520736c796c79206163636f7264696e6720746f2074686520726567756c6172206163636f756e74732e20626f6c6420726571756573747320616c6f6e0a327c4252415a494c7c317c7920616c6f6e6773696465206f66207468652070656e64696e67206465706f736974732e206361726566756c6c79207370656369616c207061636b61676573206172652061626f7574207468652069726f6e696320666f726765732e20736c796c79207370656369616c200a337c43414e4144417c317c6561732068616e672069726f6e69632c2073696c656e74207061636b616765732e20736c796c7920726567756c6172207061636b616765732061726520667572696f75736c79206f76657220746865207469746865732e20666c756666696c7920626f6c640a347c45475950547c347c792061626f766520746865206361726566756c6c7920756e757375616c207468656f646f6c697465732e2066696e616c206475676f7574732061726520717569636b6c79206163726f73732074686520667572696f75736c7920726567756c617220640a357c455448494f5049417c307c76656e207061636b616765732077616b6520717569636b6c792e20726567750a367c4652414e43457c337c726566756c6c792066696e616c2072657175657374732e20726567756c61722c2069726f6e690a377c4745524d414e597c337c6c20706c6174656c6574732e20726567756c6172206163636f756e747320782d7261793a20756e757375616c2c20726567756c6172206163636f0a387c494e4449417c327c737320657863757365732063616a6f6c6520736c796c79206163726f737320746865207061636b616765732e206465706f73697473207072696e742061726f756e0a397c494e444f4e455349417c327c20736c796c792065787072657373206173796d70746f7465732e20726567756c6172206465706f7369747320686167676c6520736c796c792e206361726566756c6c792069726f6e696320686f636b657920706c617965727320736c65657020626c697468656c792e206361726566756c6c0a31307c4952414e7c347c6566756c6c7920616c6f6e6773696465206f662074686520736c796c792066696e616c20646570656e64656e636965732e200a31317c495241517c347c6e6963206465706f7369747320626f6f73742061746f702074686520717569636b6c792066696e616c2072657175657374733f20717569636b6c7920726567756c610a31327c4a4150414e7c327c6f75736c792e2066696e616c2c20657870726573732067696674732063616a6f6c6520610a31337c4a4f5244414e7c347c6963206465706f736974732061726520626c697468656c792061626f757420746865206361726566756c6c7920726567756c61722070610a31347c4b454e59417c307c2070656e64696e67206578637573657320686167676c6520667572696f75736c79206465706f736974732e2070656e64696e672c20657870726573732070696e746f206265616e732077616b6520666c756666696c79207061737420740a31357c4d4f524f43434f7c307c726e732e20626c697468656c7920626f6c6420636f7572747320616d6f6e672074686520636c6f73656c7920726567756c6172207061636b616765732075736520667572696f75736c7920626f6c6420706c6174656c6574733f0a31367c4d4f5a414d42495155457c307c732e2069726f6e69632c20756e757375616c206173796d70746f7465732077616b6520626c697468656c7920720a31377c504552557c317c706c6174656c6574732e20626c697468656c792070656e64696e6720646570656e64656e636965732075736520666c756666696c79206163726f737320746865206576656e2070696e746f206265616e732e206361726566756c6c792073696c656e74206163636f756e0a31387c4348494e417c327c6320646570656e64656e636965732e20667572696f75736c792065787072657373206e6f746f726e697320736c65657020736c796c7920726567756c6172206163636f756e74732e20696465617320736c6565702e206465706f730a31397c524f4d414e49417c337c756c6172206173796d70746f746573206172652061626f75742074686520667572696f7573206d756c7469706c696572732e206578707265737320646570656e64656e63696573206e61672061626f7665207468652069726f6e6963616c6c792069726f6e6963206163636f756e740a32307c5341554449204152414249417c347c74732e2073696c656e7420726571756573747320686167676c652e20636c6f73656c792065787072657373207061636b6167657320736c656570206163726f73732074686520626c697468656c790a32317c564945544e414d7c327c68656c7920656e746963696e676c792065787072657373206163636f756e74732e206576656e2c2066696e616c200a32327c5255535349417c337c20726571756573747320616761696e73742074686520706c6174656c65747320757365206e65766572206163636f7264696e6720746f2074686520717569636b6c7920726567756c61722070696e740a32337c554e49544544204b494e47444f4d7c337c65616e7320626f6f7374206361726566756c6c79207370656369616c2072657175657374732e206163636f756e7473206172652e206361726566756c6c0a32347c554e49544544205354415445537c317c792066696e616c207061636b616765732e20736c6f7720666f7865732063616a6f6c6520717569636b6c792e20717569636b6c792073696c656e7420706c6174656c657473206272656163682069726f6e6963206163636f756e74732e20756e757375616c2070696e746f2062650a
917917
(4 rows)
918918

919-
\COPY BINARY dir_table1 FROM :'nation_file' 'nation.txt'; -- OK
920-
ERROR: syntax error at or near "'nation.txt'"
921-
LINE 1: COPY BINARY dir_table1 FROM STDIN 'nation_file' 'nation.txt'...
922-
^
919+
COPY BINARY dir_table1 FROM :'nation_file' 'nation.txt'; -- OK
920+
NOTICE: dir_table1 INSERT AFTER ROW (seg0 127.0.1.1:7002 pid=113524)
923921
COPY BINARY dir_table1 FROM :'nation_file' 'nation2.txt'; -- OK
924-
NOTICE: dir_table1 INSERT AFTER ROW (seg2 127.0.1.1:7004 pid=900444)
925-
\COPY BINARY "abs.dir_table" FROM :'nation_file' 'aa.bb'; -- OK
926-
ERROR: syntax error at or near "'aa.bb'"
927-
LINE 1: ...Y BINARY "abs.dir_table" FROM STDIN 'nation_file' 'aa.bb'; ...
928-
^
922+
NOTICE: dir_table1 INSERT AFTER ROW (seg2 127.0.1.1:7004 pid=113526)
923+
COPY BINARY "abs.dir_table" FROM :'nation_file' 'aa.bb'; -- OK
929924
COPY BINARY "abs.dir_table" FROM :'nation_file' 'cc.dd'; -- OK
930925
-- Test copy binary from directory table
931926
COPY BINARY dir_table1 FROM :'nation_file' 'nation_failed' (format CSV);
@@ -1272,7 +1267,8 @@ SELECT relative_path, size, tag FROM dir_table1 ORDER BY 1;
12721267
nation7 | 2199 |
12731268
nation8 | 2199 |
12741269
nation9 | 2199 |
1275-
(18 rows)
1270+
nation.txt | 2199 |
1271+
(19 rows)
12761272

12771273
SELECT relative_path, size, tag FROM dir_table2 ORDER BY 1;
12781274
relative_path | size | tag
@@ -1423,7 +1419,8 @@ SELECT relative_path, size, tag FROM dir_table1 ORDER BY 1;
14231419
nation7 | 2199 |
14241420
nation8 | 2199 |
14251421
nation9 | 2199 |
1426-
(18 rows)
1422+
nation.txt | 2199 |
1423+
(19 rows)
14271424

14281425
SELECT relative_path, size, tag FROM dir_table2 ORDER BY 1;
14291426
relative_path | size | tag
@@ -1459,7 +1456,8 @@ SELECT relative_path, size, tag FROM dir_table1 ORDER BY 1;
14591456
nation7 | 2199 |
14601457
nation8 | 2199 |
14611458
nation9 | 2199 |
1462-
(18 rows)
1459+
nation.txt | 2199 |
1460+
(19 rows)
14631461

14641462
SELECT relative_path, size, tag FROM dir_table2 ORDER BY 1;
14651463
relative_path | size | tag
@@ -1552,7 +1550,8 @@ SELECT relative_path, size, tag FROM dir_table1 ORDER BY 1;
15521550
nation7 | 2199 | nation_new_tag
15531551
nation8 | 2199 | nation_new_tag
15541552
nation9 | 2199 | nation_new_tag
1555-
(18 rows)
1553+
nation.txt | 2199 | nation_new_tag
1554+
(19 rows)
15561555

15571556
SELECT relative_path, size, tag FROM dir_table2 ORDER BY 1;
15581557
relative_path | size | tag
@@ -1660,7 +1659,8 @@ SELECT relative_path, size, tag FROM dir_table1 ORDER BY 1;
16601659
nation7 | 2199 | nation_new_tag
16611660
nation8 | 2199 | nation_new_tag
16621661
nation9 | 2199 | nation_new_tag
1663-
(16 rows)
1662+
nation.txt | 2199 | nation_new_tag
1663+
(17 rows)
16641664

16651665
SELECT relative_path, size, tag FROM dir_table2 ORDER BY 1;
16661666
relative_path | size | tag

‎src/test/regress/expected/oid_wraparound.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ SELECT gp_get_next_oid_segments();
105105
(3 rows)
106106

107107
CREATE TABLE oid_wraparound_table_other AS SELECT 1 AS a;
108-
SELECT gp_get_next_oid_master();
108+
SELECT gp_get_next_oid_master() in (16390, 16391);
109109
?column?
110110
----------
111111
t

‎src/test/regress/sql/oid_wraparound.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ SELECT gp_set_next_oid_segments(16384);
5353
SELECT gp_get_next_oid_master();
5454
SELECT gp_get_next_oid_segments();
5555
CREATE TABLE oid_wraparound_table_other AS SELECT 1 AS a;
56-
SELECT gp_get_next_oid_master() in (16391, 16392);
56+
SELECT gp_get_next_oid_master() in (16390, 16391);
5757
SELECT gp_get_next_oid_segments();

0 commit comments

Comments
 (0)