Merge pull request #31 from c0s/shark-0.11-ojdk7

Shark 0.11 ojdk7
Merge pull request #36 from WANdisco/shark-0.11-ojdk7

Shark 0.11 ojdk7
Commits for SharkServer2
Merge pull request #38 from hw3/SharkServer2

Commits for SharkServer2
Revert "HIVE-4501 HS2 memory leak - FileSystem objects in FileSystem.CACHE"

This reverts commit 6512aef89c72ae5098260bf32e08c4dc3ee612ef.
SHARK-203 : Make orc_diff_part_cols unit test pass
HIVE-4322: SkewedInfo in Metastore Thrift API cannot be deserialized in Python (Samuel Yuan via Gang Tim Liu)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1467491 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4051 : Hive's metastore suffers from 1+N queries when querying partitions & is slow (Sergey Shelukhin via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1511177 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:

	common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
	metastore/src/java/org/apache/hadoop/hive/metastore/parser/ExpressionTree.java
HIVE-4516 : Fix concurrency bug in serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java (Jon Hartlaub and Navis via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1489673 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5364 : NPE on some queries from partitioned orc table (Owen O'Malley via Gunther Hagleitner)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/branch-0.12@1529098 13f79535-47bb-0310-9956-ffa450edef68
Revert "HIVE-2416, Multiple distinct function to support hive.groupby.skewindata optimization"

This reverts commit 5b624b0180f7894d839ad2559364ad5beb8c21c5.
Fixed problem with exceptions in Postgres
Enable MapJoin Hint for Shark
Temporary solution for NullWritable handling
HIVE-4935 : Potential NPE in MetadataOnlyOptimizer (Yin Huai via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507342 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4521 Auto join conversion fails in certain cases (Gunther Hagleitner via omalley)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1484623 13f79535-47bb-0310-9956-ffa450edef68
Rebased HIVE-4221, Stripe-level merge for ORC files
Fixed Hive org.postgresql.util.PSQLException: ERROR: missing FROM-clause entry for table "partitions"
Rebased HIVE-5149 ReduceSinkDeDuplication can pick the wrong partitioning columns
Merge branch 'shark11-ojdk7' into shark-0.11-ojdk7

Conflicts:
	build-common.xml
	ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java
	ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
	ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java
	ql/src/test/queries/clientpositive/groupby2_map_skew_multi_distinct.q