HAWQ-1044. Fix bugs in test case TestHawqRegister.TestUsage2Case2IncludeDirectory
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/0675b4a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/0675b4a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/0675b4a4 Branch: refs/heads/master Commit: 0675b4a4ef003b2822954983d29ae4acb2b956b6 Parents: d683631 Author: stanlyxiang <[email protected]> Authored: Wed Dec 14 16:30:54 2016 +0800 Committer: xunzhang <[email protected]> Committed: Wed Dec 14 19:18:32 2016 +0800 ---------------------------------------------------------------------- .../test_hawq_register_usage2_case1.cpp | 8 ++++---- .../test_hawq_register_usage2_case2.cpp | 15 +++++++++++--- .../usage2_include1/includedirectory_tpl.yml | 21 ++++++++++++++++++++ .../usage2_include2/includedirectory_tpl.yml | 21 ++++++++++++++++++++ 4 files changed, 58 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0675b4a4/src/test/feature/ManagementTool/test_hawq_register_usage2_case1.cpp ---------------------------------------------------------------------- diff --git a/src/test/feature/ManagementTool/test_hawq_register_usage2_case1.cpp b/src/test/feature/ManagementTool/test_hawq_register_usage2_case1.cpp index 0c05c33..d23d754 100644 --- a/src/test/feature/ManagementTool/test_hawq_register_usage2_case1.cpp +++ b/src/test/feature/ManagementTool/test_hawq_register_usage2_case1.cpp @@ -326,9 +326,9 @@ TEST_F(TestHawqRegister, DISABLED_TestUsage2Case1ErrorRowgroupSize) { TEST_F(TestHawqRegister, TestUsage2Case1IncludeDirectory) { SQLUtility util; string test_root(util.getTestRootPath()); - EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hadoop fs -put -f %s/ManagementTool/usage2case1 %s/", test_root.c_str(), getHdfsLocation().c_str()))); - string t_yml(hawq::test::stringFormat("%s/ManagementTool/usage2case1/includedirectory.yml", test_root.c_str())); - string t_yml_tpl(hawq::test::stringFormat("%s/ManagementTool/usage2case1/includedirectory_tpl.yml", test_root.c_str())); + EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hadoop fs -put -f %s/ManagementTool/usage2_include1 %s/", test_root.c_str(), getHdfsLocation().c_str()))); + string t_yml(hawq::test::stringFormat("%s/ManagementTool/usage2_include1/includedirectory.yml", test_root.c_str())); + string t_yml_tpl(hawq::test::stringFormat("%s/ManagementTool/usage2_include1/includedirectory_tpl.yml", test_root.c_str())); hawq::test::FileReplace frep; std::unordered_map<std::string, std::string> strs_src_dst; hawq::test::HdfsConfig hc; @@ -338,7 +338,7 @@ TEST_F(TestHawqRegister, TestUsage2Case1IncludeDirectory) { frep.replace(t_yml_tpl, t_yml, strs_src_dst); EXPECT_EQ(1, Command::getCommandStatus(hawq::test::stringFormat("hawq register -d %s -c %s testhawqregister_testusage2case1includedirectory.nt", HAWQ_DB, t_yml.c_str()))); EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("rm -rf %s", t_yml.c_str()))); - EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hdfs dfs -rm -r %s/usage2case1", getHdfsLocation().c_str()))); + EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hdfs dfs -rm -r %s/usage2_include1", getHdfsLocation().c_str()))); } TEST_F(TestHawqRegister, TestUsage2Case1ErrorFormat) { http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0675b4a4/src/test/feature/ManagementTool/test_hawq_register_usage2_case2.cpp ---------------------------------------------------------------------- diff --git a/src/test/feature/ManagementTool/test_hawq_register_usage2_case2.cpp b/src/test/feature/ManagementTool/test_hawq_register_usage2_case2.cpp index 16df829..1fb02ad 100644 --- a/src/test/feature/ManagementTool/test_hawq_register_usage2_case2.cpp +++ b/src/test/feature/ManagementTool/test_hawq_register_usage2_case2.cpp @@ -366,10 +366,19 @@ TEST_F(TestHawqRegister, DISABLED_TestUsage2Case2ErrorRowgroupSize) { TEST_F(TestHawqRegister, TestUsage2Case2IncludeDirectory) { SQLUtility util; string test_root(util.getTestRootPath()); - EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hadoop fs -put -f %s/ManagementTool/usage2case2 %s/", test_root.c_str(), getHdfsLocation().c_str()))); - string t_yml(hawq::test::stringFormat("%s/ManagementTool/usage2case2/includedirectory.yml", test_root.c_str())); + EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hadoop fs -put -f %s/ManagementTool/usage2_include2 %s/", test_root.c_str(), getHdfsLocation().c_str()))); + string t_yml(hawq::test::stringFormat("%s/ManagementTool/usage2_include2/includedirectory.yml", test_root.c_str())); + string t_yml_tpl(hawq::test::stringFormat("%s/ManagementTool/usage2_include2/includedirectory_tpl.yml", test_root.c_str())); + hawq::test::FileReplace frep; + std::unordered_map<std::string, std::string> strs_src_dst; + hawq::test::HdfsConfig hc; + string hdfs_prefix; + hc.getNamenodeHost(hdfs_prefix); + strs_src_dst["@PORT@"]= hdfs_prefix; + frep.replace(t_yml_tpl, t_yml, strs_src_dst); EXPECT_EQ(1, Command::getCommandStatus(hawq::test::stringFormat("hawq register --force -d %s -c %s testhawqregister_testusage2case2includedirectory.nt", HAWQ_DB, t_yml.c_str()))); - EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hdfs dfs -rm -r %s/usage2case2", getHdfsLocation().c_str()))); + EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("rm -rf %s", t_yml.c_str()))); + EXPECT_EQ(0, Command::getCommandStatus(hawq::test::stringFormat("hdfs dfs -rm -r %s/usage2_include2", getHdfsLocation().c_str()))); } TEST_F(TestHawqRegister, TestUsage2Case2ErrorFormat) { http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0675b4a4/src/test/feature/ManagementTool/usage2_include1/includedirectory_tpl.yml ---------------------------------------------------------------------- diff --git a/src/test/feature/ManagementTool/usage2_include1/includedirectory_tpl.yml b/src/test/feature/ManagementTool/usage2_include1/includedirectory_tpl.yml new file mode 100644 index 0000000..6838afa --- /dev/null +++ b/src/test/feature/ManagementTool/usage2_include1/includedirectory_tpl.yml @@ -0,0 +1,21 @@ +AO_FileLocations: + Blocksize: 32768 + Checksum: false + CompressionLevel: 0 + CompressionType: null + Files: + - path: /usage2_include1 + size: 1016 +AO_Schema: +- name: i + type: int4 +Bucketnum: 6 +DBVersion: PostgreSQL 8.2.15 (Greenplum Database 4.2.0 build 1) (HAWQ 2.0.1.0 build + dev) on x86_64-apple-darwin14.5.0, compiled by GCC Apple LLVM version 6.1.0 (clang-602.0.53) + (based on LLVM 3.6.0svn) compiled on Jul 6 2016 10:22:33 +DFS_URL: hdfs://@PORT@ +Distribution_Policy: DISTRIBUTED RANDOMLY +Encoding: UTF8 +FileFormat: AO +TableName: public.t +Version: 1.0.0 http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/0675b4a4/src/test/feature/ManagementTool/usage2_include2/includedirectory_tpl.yml ---------------------------------------------------------------------- diff --git a/src/test/feature/ManagementTool/usage2_include2/includedirectory_tpl.yml b/src/test/feature/ManagementTool/usage2_include2/includedirectory_tpl.yml new file mode 100644 index 0000000..3fd009c --- /dev/null +++ b/src/test/feature/ManagementTool/usage2_include2/includedirectory_tpl.yml @@ -0,0 +1,21 @@ +AO_FileLocations: + Blocksize: 32768 + Checksum: false + CompressionLevel: 0 + CompressionType: null + Files: + - path: /usage2_include2 + size: 1016 +AO_Schema: +- name: i + type: int4 +Bucketnum: 6 +DBVersion: PostgreSQL 8.2.15 (Greenplum Database 4.2.0 build 1) (HAWQ 2.0.1.0 build + dev) on x86_64-apple-darwin14.5.0, compiled by GCC Apple LLVM version 6.1.0 (clang-602.0.53) + (based on LLVM 3.6.0svn) compiled on Jul 6 2016 10:22:33 +DFS_URL: hdfs://@PORT@ +Distribution_Policy: DISTRIBUTED RANDOMLY +Encoding: UTF8 +FileFormat: AO +TableName: public.t +Version: 1.0.0
