http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java ----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- diff --cc itests/src/test/resources/testconfiguration.properties index 72dbcec,13efc58..e927955 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@@ -1167,20 -1227,7 +1227,18 @@@ miniSparkOnYarn.query.files=auto_sortme load_fs2.q,\ load_hdfs_file_with_space_in_the_name.q,\ optrstat_groupby.q,\ + orc_merge1.q,\ + orc_merge2.q,\ + orc_merge3.q,\ + orc_merge4.q,\ + orc_merge5.q,\ + orc_merge6.q,\ + orc_merge7.q,\ + orc_merge8.q,\ + orc_merge9.q,\ + orc_merge_incompat1.q,\ + orc_merge_incompat2.q,\ parallel_orderby.q,\ - ql_rewrite_gbtoidx.q,\ - ql_rewrite_gbtoidx_cbo_1.q,\ quotedid_smb.q,\ reduce_deduplicate.q,\ remote_script.q,\ @@@ -1194,15 -1240,14 +1251,21 @@@ stats_counter_partitioned.q,\ temp_table_external.q,\ truncate_column_buckets.q,\ - uber_reduce.q + uber_reduce.q,\ + vector_inner_join.q,\ + vector_outer_join0.q,\ + vector_outer_join1.q,\ + vector_outer_join2.q,\ + vector_outer_join3.q,\ + vector_outer_join4.q,\ + vector_outer_join5.q + # These tests are removed from miniSparkOnYarn.query.files + # ql_rewrite_gbtoidx.q,\ + # ql_rewrite_gbtoidx_cbo_1.q,\ + # smb_mapjoin_8.q,\ + + spark.query.negative.files=groupby2_map_skew_multi_distinct.q,\ groupby2_multi_distinct.q,\ groupby3_map_skew_multi_distinct.q,\ http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 0cd4238,3b3303c..0d9c9a3 --- a/pom.xml +++ b/pom.xml @@@ -159,9 -158,9 +158,9 @@@ <stax.version>1.0.1</stax.version> <slf4j.version>1.7.5</slf4j.version> <ST4.version>4.0.4</ST4.version> - <tez.version>0.5.2</tez.version> + <tez.version>0.8.1-alpha</tez.version> <super-csv.version>2.2.0</super-csv.version> - <spark.version>1.4.0</spark.version> + <spark.version>1.5.0</spark.version> <scala.binary.version>2.10</scala.binary.version> <scala.version>2.10.4</scala.version> <tempus-fugit.version>1.1</tempus-fugit.version> @@@ -222,9 -222,18 +222,8 @@@ <enabled>false</enabled> </snapshots> </repository> - <repository> - <id>spark-1.3</id> - <url>https://s3-us-west-1.amazonaws.com/hive-spark/maven2/spark_2.10-1.3-rc1/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> </repositories> - <!-- Hadoop dependency management is done at the bottom under profiles --> <dependencyManagement> <dependencies> <!-- dependencies are always listed in sorted order by groupId, artifectId --> http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java ---------------------------------------------------------------------- diff --cc ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java index d2c5245,085ad9e..2ab9c2d --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java @@@ -24,11 -23,8 +24,9 @@@ import java.util.List import java.util.Map; import java.util.Set; - import com.google.common.base.Preconditions; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.ql.io.merge.MergeFileMapper; http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/c9073aad/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java ----------------------------------------------------------------------
