diff --git a/src/test/isolation2/input/local_directory_table_mixed.source b/src/test/isolation2/input/local_directory_table_mixed.source index 35f302d3b7b..a98bcb86e08 100644 --- a/src/test/isolation2/input/local_directory_table_mixed.source +++ b/src/test/isolation2/input/local_directory_table_mixed.source @@ -46,13 +46,6 @@ CREATE TABLESPACE directory_tblspc LOCATION '@testtablespace@'; 2<: 2: COMMIT; -1: BEGIN; -2: BEGIN; -1: SELECT remove_file('dir_table1', 'nation3'); -2: COPY BINARY dir_table1 FROM '@abs_srcdir@/data/nation.csv' 'nation8'; -1: COMMIT; -2: COMMIT; - -- Test select and select 1: BEGIN; 2: BEGIN; @@ -66,34 +59,12 @@ CREATE TABLESPACE directory_tblspc LOCATION '@testtablespace@'; -- Test select and remove_file() 1: BEGIN; 2: BEGIN; -1: SELECT relative_path, size, md5, tag FROM dir_table1; +1: SELECT relative_path, size, md5, tag, content FROM directory_table('dir_table1'); 2&: SELECT remove_file('dir_table1', 'nation7'); 1: COMMIT; 2<: 2: COMMIT; -1: BEGIN; -2: BEGIN; -1: SELECT remove_file('dir_table1', 'nation5'); -2: SELECT relative_path, size, md5, tag FROM dir_table1; -1: COMMIT; -2: COMMIT; - -1: BEGIN; -2: BEGIN; -1: SELECT remove_file('dir_table2', 'nation6'); -2&: SELECT relative_path, size, md5, tag, content FROM directory_table('dir_table2'); -1: COMMIT; -2<: -2: COMMIT; - -1: BEGIN; -2: BEGIN; -1: SELECT relative_path, size, md5, tag, content FROM directory_table('dir_table2'); -2: SELECT remove_file('dir_table2', 'nation5'); -1: COMMIT; -2: COMMIT; - 1: BEGIN; 2: BEGIN; 1: SELECT relative_path, size, md5, tag FROM dir_table1; @@ -117,10 +88,10 @@ CREATE TABLESPACE directory_tblspc LOCATION '@testtablespace@'; 1: COMMIT; 2: COMMIT; --- Test drop directory table and copy from/select/remove +-- Test drop directory table and copy from/select 1: BEGIN; 2: BEGIN; -1: COPY BINARY dir_table3 FROM '@abs_srcdir@/data/nation.csv' 'nation'; +1: COPY BINARY dir_table3 FROM '@abs_srcdir@/data/nation.csv' 'nation1'; 2&: DROP DIRECTORY TABLE dir_table3; 1: COMMIT; 2<: @@ -128,18 +99,10 @@ CREATE TABLESPACE directory_tblspc LOCATION '@testtablespace@'; 1: BEGIN; 2: BEGIN; -1: SELECT relative_path, size, md5, tag FROM dir_table2; +1: SELECT relative_path, size, md5, tag, content FROM directory_table('dir_table2'); 2&: DROP DIRECTORY TABLE dir_table2; 1: COMMIT; 2<: 2: COMMIT; -1: BEGIN; -2: BEGIN; -1: SELECT remove_file('dir_table1', 'nation1'); -2&: DROP DIRECTORY TABLE dir_table1; -1: COMMIT; -2<: -2: COMMIT; - DROP TABLESPACE directory_tblspc; \ No newline at end of file