TAJO-1763: tpch/*.tbl files cannot be founded in maven modules except for core-tests.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d49449a9 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d49449a9 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d49449a9 Branch: refs/heads/TAJO-1730 Commit: d49449a9a9ac6c50db958f9f73b6ebb8209134c2 Parents: c9f61e4 Author: Hyunsik Choi <[email protected]> Authored: Sun Aug 16 11:05:12 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Sun Aug 16 11:05:12 2015 +0900 ---------------------------------------------------------------------- .../test/java/org/apache/tajo/TpchTestBase.java | 5 ++-- .../java/org/apache/tajo/util/FileUtil.java | 4 ---- .../src/test/resources/tpch/customer.tbl | 5 ++++ .../src/test/resources/tpch/empty_orders.tbl | 0 .../src/test/resources/tpch/lineitem.tbl | 5 ++++ .../src/test/resources/tpch/nation.tbl | 25 ++++++++++++++++++++ .../src/test/resources/tpch/orders.tbl | 3 +++ .../src/test/resources/tpch/part.tbl | 4 ++++ .../src/test/resources/tpch/partsupp.tbl | 3 +++ .../src/test/resources/tpch/region.tbl | 5 ++++ .../src/test/resources/tpch/supplier.tbl | 3 +++ tajo-core-tests/src/test/tpch/customer.tbl | 5 ---- tajo-core-tests/src/test/tpch/empty_orders.tbl | 0 tajo-core-tests/src/test/tpch/lineitem.tbl | 5 ---- tajo-core-tests/src/test/tpch/nation.tbl | 25 -------------------- tajo-core-tests/src/test/tpch/orders.tbl | 3 --- tajo-core-tests/src/test/tpch/part.tbl | 4 ---- tajo-core-tests/src/test/tpch/partsupp.tbl | 3 --- tajo-core-tests/src/test/tpch/region.tbl | 5 ---- tajo-core-tests/src/test/tpch/supplier.tbl | 3 --- .../java/org/apache/tajo/benchmark/TPCH.java | 21 +++++----------- 21 files changed, 61 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-cluster-tests/src/test/java/org/apache/tajo/TpchTestBase.java ---------------------------------------------------------------------- diff --git a/tajo-cluster-tests/src/test/java/org/apache/tajo/TpchTestBase.java b/tajo-cluster-tests/src/test/java/org/apache/tajo/TpchTestBase.java index 055dd02..7b0bf37 100644 --- a/tajo-cluster-tests/src/test/java/org/apache/tajo/TpchTestBase.java +++ b/tajo-cluster-tests/src/test/java/org/apache/tajo/TpchTestBase.java @@ -37,7 +37,6 @@ public class TpchTestBase { String [] names; String [] paths; - String [][] tables; Schema[] schemas; Map<String, Integer> nameMap = Maps.newHashMap(); protected TPCH tpch; @@ -70,11 +69,11 @@ public class TpchTestBase { schemas[i] = tpch.getSchema(names[i]); } - tables = new String[names.length][]; + //tables = new String[names.length][]; File file; for (int i = 0; i < names.length; i++) { file = TPCH.getDataFile(names[i]); - tables[i] = FileUtil.readTextFile(file).split("\n"); + //tables[i] = FileUtil.readTextFile(file).split("\n"); paths[i] = file.getAbsolutePath(); } try { http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-common/src/main/java/org/apache/tajo/util/FileUtil.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/util/FileUtil.java b/tajo-common/src/main/java/org/apache/tajo/util/FileUtil.java index 39f4c29..a7f8691 100644 --- a/tajo-common/src/main/java/org/apache/tajo/util/FileUtil.java +++ b/tajo-common/src/main/java/org/apache/tajo/util/FileUtil.java @@ -79,10 +79,6 @@ public class FileUtil { } } - public static File getFile(String path) { - return new File(path); - } - public static URL getResourcePath(String resource) throws IOException { return ClassLoader.getSystemResource(resource); } http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/customer.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/customer.tbl b/tajo-core-tests/src/test/resources/tpch/customer.tbl new file mode 100644 index 0000000..4f684c6 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/customer.tbl @@ -0,0 +1,5 @@ +1|Customer#000000001|IVhzIApeRb ot,c,E|15|25-989-741-2988|711.56|BUILDING|to the even, regular platelets. regular, ironic epitaphs nag e| +2|Customer#000000002|XSTf4,NCwDVaWNe6tEgvwfmRchLXak|13|23-768-687-3665|121.65|AUTOMOBILE|l accounts. blithely ironic theodolites integrate boldly: caref| +3|Customer#000000003|MG9kdTD2WBHm|1|11-719-748-3364|7498.12|AUTOMOBILE| deposits eat slyly ironic, even instructions. express foxes detect slyly. blithely even accounts abov| +4|Customer#000000004|XxVSJsLAGtn|4|14-128-190-5944|2866.83|MACHINERY| requests. final, regular ideas sleep final accou| +5|Customer#000000005|KvpyuHCplrB84WgAiGV6sYpZq7Tj|3|13-750-942-6364|794.47|HOUSEHOLD|n accounts will have to unwind. foxes cajole accor| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/empty_orders.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/empty_orders.tbl b/tajo-core-tests/src/test/resources/tpch/empty_orders.tbl new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/lineitem.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/lineitem.tbl b/tajo-core-tests/src/test/resources/tpch/lineitem.tbl new file mode 100644 index 0000000..e3beac9 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/lineitem.tbl @@ -0,0 +1,5 @@ +1|1|7706|1|17|21168.23|0.04|0.02|N|O|1996-03-13|1996-02-12|1996-03-22|DELIVER IN PERSON|TRUCK|egular courts above the| +1|1|7311|2|36|45983.16|0.09|0.06|N|O|1996-04-12|1996-02-28|1996-04-20|TAKE BACK RETURN|MAIL|ly final dependencies: slyly bold | +2|2|1191|1|38|44694.46|0.00|0.05|N|O|1997-01-28|1997-01-14|1997-02-02|TAKE BACK RETURN|RAIL|ven requests. deposits breach a| +3|2|1798|1|45|54058.05|0.06|0.00|R|F|1994-02-02|1994-01-04|1994-02-23|NONE|AIR|ongside of the furiously brave acco| +3|3|6540|2|49|46796.47|0.10|0.00|R|F|1993-11-09|1993-12-20|1993-11-24|TAKE BACK RETURN|RAIL| unusual accounts. eve| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/nation.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/nation.tbl b/tajo-core-tests/src/test/resources/tpch/nation.tbl new file mode 100644 index 0000000..ed3fd5b --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/nation.tbl @@ -0,0 +1,25 @@ +0|ALGERIA|0| haggle. carefully final deposits detect slyly agai| +1|ARGENTINA|1|al foxes promise slyly according to the regular accounts. bold requests alon| +2|BRAZIL|1|y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special | +3|CANADA|1|eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold| +4|EGYPT|4|y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d| +5|ETHIOPIA|0|ven packages wake quickly. regu| +6|FRANCE|3|refully final requests. regular, ironi| +7|GERMANY|3|l platelets. regular accounts x-ray: unusual, regular acco| +8|INDIA|2|ss excuses cajole slyly across the packages. deposits print aroun| +9|INDONESIA|2| slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull| +10|IRAN|4|efully alongside of the slyly final dependencies. | +11|IRAQ|4|nic deposits boost atop the quickly final requests? quickly regula| +12|JAPAN|2|ously. final, express gifts cajole a| +13|JORDAN|4|ic deposits are blithely about the carefully regular pa| +14|KENYA|0| pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t| +15|MOROCCO|0|rns. blithely bold courts among the closely regular packages use furiously bold platelets?| +16|MOZAMBIQUE|0|s. ironic, unusual asymptotes wake blithely r| +17|PERU|1|platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun| +18|CHINA|2|c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos| +19|ROMANIA|3|ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account| +20|SAUDI ARABIA|4|ts. silent requests haggle. closely express packages sleep across the blithely| +21|VIETNAM|2|hely enticingly express accounts. even, final | +22|RUSSIA|3| requests against the platelets use never according to the quickly regular pint| +23|UNITED KINGDOM|3|eans boost carefully special requests. accounts are. carefull| +24|UNITED STATES|1|y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/orders.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/orders.tbl b/tajo-core-tests/src/test/resources/tpch/orders.tbl new file mode 100644 index 0000000..15a1b6f --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/orders.tbl @@ -0,0 +1,3 @@ +1|3|O|173665.47|1996-01-02|5-LOW|Clerk#000000951|0|nstructions sleep furiously among | +2|4|O|46929.18|1996-12-01|1-URGENT|Clerk#000000880|0| foxes. pending accounts at the pending, silent asymptot| +3|2|F|193846.25|1993-10-14|5-LOW|Clerk#000000955|0|sly final accounts boost. carefully regular ideas cajole carefully. depos| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/part.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/part.tbl b/tajo-core-tests/src/test/resources/tpch/part.tbl new file mode 100644 index 0000000..6e6fa72 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/part.tbl @@ -0,0 +1,4 @@ +1|goldenrod lavender spring chocolate lace|Manufacturer#1|Brand#13|PROMO BURNISHED COPPER|7|JUMBO PKG|901.00|ly. slyly ironi +2|blush thistle blue yellow saddle|Manufacturer#1|Brand#13|LARGE BRUSHED BRASS|15|LG CASE|902.00|lar accounts amo +3|spring green yellow purple cornsilk|Manufacturer#4|Brand#42|STANDARD POLISHED BRASS|21|WRAP CASE|903.00|egular deposits hag +4|cornflower chocolate smoke green pink|Manufacturer#3|Brand#34|SMALL PLATED BRASS|14|MED DRUM|904.00|p furiously r \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/partsupp.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/partsupp.tbl b/tajo-core-tests/src/test/resources/tpch/partsupp.tbl new file mode 100644 index 0000000..a6211e6 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/partsupp.tbl @@ -0,0 +1,3 @@ +1|2|3325|771.64|, even theodolites. regular, final theodolites eat after the carefully pending foxes. furiously regular deposits sleep slyly. carefully bold realms above the ironic dependencies haggle careful| +2|3|8895|1.01|nic accounts. final accounts sleep furiously about the ironic, bold packages. regular, regular accounts| +3|4|4651|920.92|ilent foxes affix furiously quickly unusual requests. even packages across the carefully even theodolites nag above the sp| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/region.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/region.tbl b/tajo-core-tests/src/test/resources/tpch/region.tbl new file mode 100644 index 0000000..c5ebb63 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/region.tbl @@ -0,0 +1,5 @@ +0|AFRICA|lar deposits. blithely final packages cajole. regular waters are final requests. regular accounts are according to | +1|AMERICA|hs use ironic, even requests. s| +2|ASIA|ges. thinly even pinto beans ca| +3|EUROPE|ly final courts cajole furiously final excuse| +4|MIDDLE EAST|uickly special accounts cajole carefully blithely close requests. carefully final asymptotes haggle furiousl| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/resources/tpch/supplier.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/resources/tpch/supplier.tbl b/tajo-core-tests/src/test/resources/tpch/supplier.tbl new file mode 100644 index 0000000..a6fafb3 --- /dev/null +++ b/tajo-core-tests/src/test/resources/tpch/supplier.tbl @@ -0,0 +1,3 @@ +2|Supplier#000000002|89eJ5ksX3ImxJQBvxObC,|5|15-679-861-2259|4032.68| slyly bold instructions. idle dependen| +3|Supplier#000000003|q1,G3Pj6OjIuUYfUoH18BFTKP5aU9bEV3|1|11-383-516-1199|4192.40|blithely silent requests after the express dependencies are sl| +4|Supplier#000000004|Bk7ah4CK8SYQTepEmvMkkgMwg|15|25-843-787-7479|4641.08|riously even requests above the exp| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/customer.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/customer.tbl b/tajo-core-tests/src/test/tpch/customer.tbl deleted file mode 100644 index 4f684c6..0000000 --- a/tajo-core-tests/src/test/tpch/customer.tbl +++ /dev/null @@ -1,5 +0,0 @@ -1|Customer#000000001|IVhzIApeRb ot,c,E|15|25-989-741-2988|711.56|BUILDING|to the even, regular platelets. regular, ironic epitaphs nag e| -2|Customer#000000002|XSTf4,NCwDVaWNe6tEgvwfmRchLXak|13|23-768-687-3665|121.65|AUTOMOBILE|l accounts. blithely ironic theodolites integrate boldly: caref| -3|Customer#000000003|MG9kdTD2WBHm|1|11-719-748-3364|7498.12|AUTOMOBILE| deposits eat slyly ironic, even instructions. express foxes detect slyly. blithely even accounts abov| -4|Customer#000000004|XxVSJsLAGtn|4|14-128-190-5944|2866.83|MACHINERY| requests. final, regular ideas sleep final accou| -5|Customer#000000005|KvpyuHCplrB84WgAiGV6sYpZq7Tj|3|13-750-942-6364|794.47|HOUSEHOLD|n accounts will have to unwind. foxes cajole accor| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/empty_orders.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/empty_orders.tbl b/tajo-core-tests/src/test/tpch/empty_orders.tbl deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/lineitem.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/lineitem.tbl b/tajo-core-tests/src/test/tpch/lineitem.tbl deleted file mode 100644 index e3beac9..0000000 --- a/tajo-core-tests/src/test/tpch/lineitem.tbl +++ /dev/null @@ -1,5 +0,0 @@ -1|1|7706|1|17|21168.23|0.04|0.02|N|O|1996-03-13|1996-02-12|1996-03-22|DELIVER IN PERSON|TRUCK|egular courts above the| -1|1|7311|2|36|45983.16|0.09|0.06|N|O|1996-04-12|1996-02-28|1996-04-20|TAKE BACK RETURN|MAIL|ly final dependencies: slyly bold | -2|2|1191|1|38|44694.46|0.00|0.05|N|O|1997-01-28|1997-01-14|1997-02-02|TAKE BACK RETURN|RAIL|ven requests. deposits breach a| -3|2|1798|1|45|54058.05|0.06|0.00|R|F|1994-02-02|1994-01-04|1994-02-23|NONE|AIR|ongside of the furiously brave acco| -3|3|6540|2|49|46796.47|0.10|0.00|R|F|1993-11-09|1993-12-20|1993-11-24|TAKE BACK RETURN|RAIL| unusual accounts. eve| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/nation.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/nation.tbl b/tajo-core-tests/src/test/tpch/nation.tbl deleted file mode 100644 index ed3fd5b..0000000 --- a/tajo-core-tests/src/test/tpch/nation.tbl +++ /dev/null @@ -1,25 +0,0 @@ -0|ALGERIA|0| haggle. carefully final deposits detect slyly agai| -1|ARGENTINA|1|al foxes promise slyly according to the regular accounts. bold requests alon| -2|BRAZIL|1|y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special | -3|CANADA|1|eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold| -4|EGYPT|4|y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d| -5|ETHIOPIA|0|ven packages wake quickly. regu| -6|FRANCE|3|refully final requests. regular, ironi| -7|GERMANY|3|l platelets. regular accounts x-ray: unusual, regular acco| -8|INDIA|2|ss excuses cajole slyly across the packages. deposits print aroun| -9|INDONESIA|2| slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull| -10|IRAN|4|efully alongside of the slyly final dependencies. | -11|IRAQ|4|nic deposits boost atop the quickly final requests? quickly regula| -12|JAPAN|2|ously. final, express gifts cajole a| -13|JORDAN|4|ic deposits are blithely about the carefully regular pa| -14|KENYA|0| pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t| -15|MOROCCO|0|rns. blithely bold courts among the closely regular packages use furiously bold platelets?| -16|MOZAMBIQUE|0|s. ironic, unusual asymptotes wake blithely r| -17|PERU|1|platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun| -18|CHINA|2|c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos| -19|ROMANIA|3|ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account| -20|SAUDI ARABIA|4|ts. silent requests haggle. closely express packages sleep across the blithely| -21|VIETNAM|2|hely enticingly express accounts. even, final | -22|RUSSIA|3| requests against the platelets use never according to the quickly regular pint| -23|UNITED KINGDOM|3|eans boost carefully special requests. accounts are. carefull| -24|UNITED STATES|1|y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/orders.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/orders.tbl b/tajo-core-tests/src/test/tpch/orders.tbl deleted file mode 100644 index 15a1b6f..0000000 --- a/tajo-core-tests/src/test/tpch/orders.tbl +++ /dev/null @@ -1,3 +0,0 @@ -1|3|O|173665.47|1996-01-02|5-LOW|Clerk#000000951|0|nstructions sleep furiously among | -2|4|O|46929.18|1996-12-01|1-URGENT|Clerk#000000880|0| foxes. pending accounts at the pending, silent asymptot| -3|2|F|193846.25|1993-10-14|5-LOW|Clerk#000000955|0|sly final accounts boost. carefully regular ideas cajole carefully. depos| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/part.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/part.tbl b/tajo-core-tests/src/test/tpch/part.tbl deleted file mode 100644 index 6e6fa72..0000000 --- a/tajo-core-tests/src/test/tpch/part.tbl +++ /dev/null @@ -1,4 +0,0 @@ -1|goldenrod lavender spring chocolate lace|Manufacturer#1|Brand#13|PROMO BURNISHED COPPER|7|JUMBO PKG|901.00|ly. slyly ironi -2|blush thistle blue yellow saddle|Manufacturer#1|Brand#13|LARGE BRUSHED BRASS|15|LG CASE|902.00|lar accounts amo -3|spring green yellow purple cornsilk|Manufacturer#4|Brand#42|STANDARD POLISHED BRASS|21|WRAP CASE|903.00|egular deposits hag -4|cornflower chocolate smoke green pink|Manufacturer#3|Brand#34|SMALL PLATED BRASS|14|MED DRUM|904.00|p furiously r \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/partsupp.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/partsupp.tbl b/tajo-core-tests/src/test/tpch/partsupp.tbl deleted file mode 100644 index a6211e6..0000000 --- a/tajo-core-tests/src/test/tpch/partsupp.tbl +++ /dev/null @@ -1,3 +0,0 @@ -1|2|3325|771.64|, even theodolites. regular, final theodolites eat after the carefully pending foxes. furiously regular deposits sleep slyly. carefully bold realms above the ironic dependencies haggle careful| -2|3|8895|1.01|nic accounts. final accounts sleep furiously about the ironic, bold packages. regular, regular accounts| -3|4|4651|920.92|ilent foxes affix furiously quickly unusual requests. even packages across the carefully even theodolites nag above the sp| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/region.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/region.tbl b/tajo-core-tests/src/test/tpch/region.tbl deleted file mode 100644 index c5ebb63..0000000 --- a/tajo-core-tests/src/test/tpch/region.tbl +++ /dev/null @@ -1,5 +0,0 @@ -0|AFRICA|lar deposits. blithely final packages cajole. regular waters are final requests. regular accounts are according to | -1|AMERICA|hs use ironic, even requests. s| -2|ASIA|ges. thinly even pinto beans ca| -3|EUROPE|ly final courts cajole furiously final excuse| -4|MIDDLE EAST|uickly special accounts cajole carefully blithely close requests. carefully final asymptotes haggle furiousl| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core-tests/src/test/tpch/supplier.tbl ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/tpch/supplier.tbl b/tajo-core-tests/src/test/tpch/supplier.tbl deleted file mode 100644 index a6fafb3..0000000 --- a/tajo-core-tests/src/test/tpch/supplier.tbl +++ /dev/null @@ -1,3 +0,0 @@ -2|Supplier#000000002|89eJ5ksX3ImxJQBvxObC,|5|15-679-861-2259|4032.68| slyly bold instructions. idle dependen| -3|Supplier#000000003|q1,G3Pj6OjIuUYfUoH18BFTKP5aU9bEV3|1|11-383-516-1199|4192.40|blithely silent requests after the express dependencies are sl| -4|Supplier#000000004|Bk7ah4CK8SYQTepEmvMkkgMwg|15|25-843-787-7479|4641.08|riously even requests above the exp| http://git-wip-us.apache.org/repos/asf/tajo/blob/d49449a9/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java index 9739767..969a8be 100644 --- a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java +++ b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java @@ -34,9 +34,11 @@ import org.apache.tajo.common.TajoDataTypes; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.exception.TajoException; import org.apache.tajo.storage.StorageConstants; +import org.apache.tajo.util.FileUtil; import java.io.File; import java.io.IOException; +import java.net.URISyntaxException; import java.sql.SQLException; import java.util.List; import java.util.Map; @@ -227,22 +229,11 @@ public class TPCH extends BenchmarkSet { new Path(dataDir, tableName).toUri(), meta, partitionMethodDesc); } - public static List<String> getDataFilePaths(String... tables) { - List<String> tablePaths = Lists.newArrayList(); - File file; - for (String table : tables) { - file = getDataFile(table); - tablePaths.add(file.getAbsolutePath()); - } - return tablePaths; - } - public static File getDataFile(String table) { - File file = new File("src/test/tpch/" + table + ".tbl"); - if (!file.exists()) { - file = new File(System.getProperty("user.dir") + "/tajo-core/src/test/tpch/" + table - + ".tbl"); + try { + return new File(FileUtil.getResourcePath("tpch/" + table + ".tbl").toURI()); + } catch (Throwable t) { + throw new RuntimeException(t); } - return file; } }
