diff --git a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy index e53299a001..daeadeffe2 100644 --- a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy +++ b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_client.groovy @@ -19,21 +19,20 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -String[] getFiles(String dirName, int num) { - File[] datas = new File(dirName).listFiles() - if (num != datas.length) { - throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) - } - String[] array = new String[datas.length]; - for (int i = 0; i < datas.length; i++) { - array[i] = datas[i].getPath(); - } - Arrays.sort(array); - return array; -} suite("test_group_commit_insert_into_lineitem_multiple_client") { String[] file_array; + def getFiles = { String dirName, int num-> + File[] datas = new File(dirName).listFiles() + if (num != datas.length) { + throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) + } + file_array = new String[datas.length]; + for (int i = 0; i < datas.length; i++) { + file_array[i] = datas[i].getPath(); + } + Arrays.sort(file_array); + } def prepare = { def dataDir = "${context.config.cacheDataPath}/insert_into_lineitem_multiple_client" File dir = new File(dataDir) @@ -45,7 +44,7 @@ suite("test_group_commit_insert_into_lineitem_multiple_client") { def split_file = """split -l 60000 ${dataDir}/lineitem.tbl.1 ${dataDir}/""".execute().getText() def rm_file = """rm ${dataDir}/lineitem.tbl.1""".execute().getText() } - file_array = getFiles(dataDir, 11) + getFiles(dataDir, 11) for (String s : file_array) { logger.info(s) } diff --git a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy index 3241b44b19..9325ab3a4b 100644 --- a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy +++ b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_multiple_table.groovy @@ -19,21 +19,19 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -String[] getFiles(String dirName, int num) { - File[] datas = new File(dirName).listFiles() - if (num != datas.length) { - throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) - } - String[] array = new String[datas.length]; - for (int i = 0; i < datas.length; i++) { - array[i] = datas[i].getPath(); - } - Arrays.sort(array); - return array; -} - suite("test_group_commit_insert_into_lineitem_multiple_table") { String[] file_array; + def getFiles = { String dirName, int num-> + File[] datas = new File(dirName).listFiles() + if (num != datas.length) { + throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) + } + file_array = new String[datas.length]; + for (int i = 0; i < datas.length; i++) { + file_array[i] = datas[i].getPath(); + } + Arrays.sort(file_array); + } def prepare = { def dataDir = "${context.config.cacheDataPath}/insert_into_lineitem_multiple_table" File dir = new File(dataDir) @@ -45,7 +43,7 @@ suite("test_group_commit_insert_into_lineitem_multiple_table") { def split_file = """split -l 60000 ${dataDir}/lineitem.tbl.1 ${dataDir}/""".execute().getText() def rm_file = """rm ${dataDir}/lineitem.tbl.1""".execute().getText() } - file_array = getFiles(dataDir, 11) + getFiles(dataDir, 11) for (String s : file_array) { logger.info(s) } diff --git a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy index f0714ba7f3..f107b741c6 100644 --- a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy +++ b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_normal.groovy @@ -15,21 +15,20 @@ // specific language governing permissions and limitations // under the License. -String[] getFiles(String dirName, int num) { - File[] datas = new File(dirName).listFiles() - if (num != datas.length) { - throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) - } - String[] array = new String[datas.length]; - for (int i = 0; i < datas.length; i++) { - array[i] = datas[i].getPath(); - } - Arrays.sort(array); - return array; -} suite("test_group_commit_insert_into_lineitem_normal") { String[] file_array; + def getFiles = { String dirName, int num-> + File[] datas = new File(dirName).listFiles() + if (num != datas.length) { + throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) + } + file_array = new String[datas.length]; + for (int i = 0; i < datas.length; i++) { + file_array[i] = datas[i].getPath(); + } + Arrays.sort(file_array); + } def prepare = { def dataDir = "${context.config.cacheDataPath}/insert_into_lineitem_normal" File dir = new File(dataDir) @@ -41,7 +40,7 @@ suite("test_group_commit_insert_into_lineitem_normal") { def split_file = """split -l 60000 ${dataDir}/lineitem.tbl.1 ${dataDir}/""".execute().getText() def rm_file = """rm ${dataDir}/lineitem.tbl.1""".execute().getText() } - file_array = getFiles(dataDir, 11) + getFiles(dataDir, 11) for (String s : file_array) { logger.info(s) } diff --git a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy index f95197ce76..4cd8cc36a4 100644 --- a/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy +++ b/regression-test/suites/insert_p2/test_group_commit_insert_into_lineitem_scheme_change.groovy @@ -47,25 +47,23 @@ enum STATE { } } -String[] getFiles(String dirName, int num) { - File[] datas = new File(dirName).listFiles() - if (num != datas.length) { - throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) - } - String[] tmp_array = new String[datas.length]; - for (int i = 0; i < datas.length; i++) { - tmp_array[i] = datas[i].getPath(); - } - Arrays.sort(tmp_array); - String[] array = new String[5]; - for (int i = 0; i < 5; i++) { - array[i] = tmp_array[i]; - } - return array; -} - suite("test_group_commit_insert_into_lineitem_scheme_change") { String[] file_array; + def getFiles = { String dirName, int num -> + File[] datas = new File(dirName).listFiles() + if (num != datas.length) { + throw new Exception("num not equals,expect:" + num + " vs real:" + datas.length) + } + String[] tmp_array = new String[datas.length]; + for (int i = 0; i < datas.length; i++) { + tmp_array[i] = datas[i].getPath(); + } + Arrays.sort(tmp_array); + file_array = new String[5]; + for (int i = 0; i < 5; i++) { + file_array[i] = tmp_array[i]; + } + } def prepare = { def dataDir = "${context.config.cacheDataPath}/insert_into_lineitem_scheme_change" File dir = new File(dataDir) @@ -77,7 +75,7 @@ suite("test_group_commit_insert_into_lineitem_scheme_change") { def split_file = """split -l 60000 ${dataDir}/lineitem.tbl.1 ${dataDir}/""".execute().getText() def rm_file = """rm ${dataDir}/lineitem.tbl.1""".execute().getText() } - file_array = getFiles(dataDir, 11) + getFiles(dataDir, 11) for (String s : file_array) { logger.info(s) } @@ -321,6 +319,7 @@ PROPERTIES ( log.info("rowCount:" + rowCount[0][0]) sql """ delete from ${table_name} where l_orderkey >=10000; """ total -= rowCount[0][0] + getRowCount(total, table_name) break } catch (Exception e) { log.info("exception:", e)