Repository: tajo Updated Branches: refs/heads/branch-0.8.0 e5519cf0b -> 464f3e522
http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin4.result ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin4.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin4.result new file mode 100644 index 0000000..b7f95a8 --- /dev/null +++ b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin4.result @@ -0,0 +1,27 @@ +n_name,r_name,?plus +------------------------------- +ALGERIA,AFRICA,0 +ARGENTINA,AMERICA,2 +BRAZIL,AMERICA,3 +CANADA,AMERICA,4 +EGYPT,MIDDLE EAST,8 +ETHIOPIA,AFRICA,5 +FRANCE,EUROPE,9 +GERMANY,EUROPE,10 +INDIA,ASIA,10 +INDONESIA,ASIA,11 +IRAN,MIDDLE EAST,14 +IRAQ,MIDDLE EAST,15 +JAPAN,ASIA,14 +JORDAN,MIDDLE EAST,17 +KENYA,AFRICA,14 +MOROCCO,AFRICA,15 +MOZAMBIQUE,AFRICA,16 +PERU,AMERICA,18 +CHINA,ASIA,20 +ROMANIA,EUROPE,22 +SAUDI ARABIA,MIDDLE EAST,24 +VIETNAM,ASIA,23 +RUSSIA,EUROPE,25 +UNITED KINGDOM,EUROPE,26 +UNITED STATES,AMERICA,25 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin5.result ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin5.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin5.result new file mode 100644 index 0000000..ea3b0ff --- /dev/null +++ b/tajo-core/tajo-core-backend/src/test/resources/results/TestJoinBroadcast/testWhereClauseJoin5.result @@ -0,0 +1,5 @@ +s_acctbal,s_name,p_partkey +------------------------------- +4032.68,Supplier#000000002,1 +4192.4,Supplier#000000003,2 +4641.08,Supplier#000000004,3 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-core/tajo-core-backend/src/test/resources/results/TestNetTypes/testJoin.result ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestNetTypes/testJoin.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestNetTypes/testJoin.result index 9d2cdf1..b5817f8 100644 --- a/tajo-core/tajo-core-backend/src/test/resources/results/TestNetTypes/testJoin.result +++ b/tajo-core/tajo-core-backend/src/test/resources/results/TestNetTypes/testJoin.result @@ -1,6 +1,6 @@ id,name,score,type,addr,id,name,score,type,addr ------------------------------- +0,,20.0,d,127.0.0.1,1,ooo,1.1,a,127.0.0.1 1,,0.0,a,127.0.0.8,3,qqq,3.4,c,127.0.0.8 2,,0.0,b,127.0.0.8,3,qqq,3.4,c,127.0.0.8 -0,,20.0,d,127.0.0.1,1,ooo,1.1,a,127.0.0.1 0,,20.0,d,127.0.0.1,4,rrr,4.5,d,127.0.0.1 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion1.result ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion1.result b/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion1.result index 3b4dcf4..f384e9f 100644 --- a/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion1.result +++ b/tajo-core/tajo-core-backend/src/test/resources/results/TestUnionQuery/testUnion1.result @@ -2,9 +2,9 @@ num ------------------------------- 1 2 +2 +3 3 4 -5 -36901 -78002 -123314 \ No newline at end of file +4 +5 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-core/tajo-core-backend/src/test/tpch/orders.tbl ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/tpch/orders.tbl b/tajo-core/tajo-core-backend/src/test/tpch/orders.tbl index 77cbcc0..15a1b6f 100644 --- a/tajo-core/tajo-core-backend/src/test/tpch/orders.tbl +++ b/tajo-core/tajo-core-backend/src/test/tpch/orders.tbl @@ -1,3 +1,3 @@ -1|36901|O|173665.47|1996-01-02|5-LOW|Clerk#000000951|0|nstructions sleep furiously among | -2|78002|O|46929.18|1996-12-01|1-URGENT|Clerk#000000880|0| foxes. pending accounts at the pending, silent asymptot| -3|123314|F|193846.25|1993-10-14|5-LOW|Clerk#000000955|0|sly final accounts boost. carefully regular ideas cajole carefully. depos| +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/464f3e52/tajo-storage/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java b/tajo-storage/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java index 3bfe96f..0315a8d 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java @@ -93,6 +93,9 @@ public class FragmentConvertor { public static <T extends Fragment> List<T> convert(Class<T> clazz, FragmentProto...fragments) throws IOException { List<T> list = Lists.newArrayList(); + if (fragments == null) { + return list; + } for (FragmentProto proto : fragments) { list.add(convert(clazz, proto)); } @@ -102,6 +105,9 @@ public class FragmentConvertor { public static <T extends Fragment> List<T> convert(Configuration conf, StoreType storeType, FragmentProto...fragments) throws IOException { List<T> list = Lists.newArrayList(); + if (fragments == null) { + return list; + } for (FragmentProto proto : fragments) { list.add((T) convert(conf, storeType, proto)); } @@ -110,6 +116,9 @@ public class FragmentConvertor { public static List<FragmentProto> toFragmentProtoList(Fragment... fragments) { List<FragmentProto> list = Lists.newArrayList(); + if (fragments == null) { + return list; + } for (Fragment fragment : fragments) { list.add(fragment.getProto()); } http://git-wip-us.apache.org/repos/asf/tajo/blob/464f3e52/tajo-storage/src/main/java/org/apache/tajo/storage/parquet/TajoRecordMaterializer.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/parquet/TajoRecordMaterializer.java b/tajo-storage/src/main/java/org/apache/tajo/storage/parquet/TajoRecordMaterializer.java index f099d04..e31828c 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/parquet/TajoRecordMaterializer.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/parquet/TajoRecordMaterializer.java @@ -69,7 +69,7 @@ class TajoRecordMaterializer extends RecordMaterializer<Tuple> { /** * Returns the root converter. * - * @param return The root converter + * @return The root converter */ @Override public GroupConverter getRootConverter() {
