You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2014/10/10 18:13:12 UTC

svn commit: r1630932 - in /hive/branches/branch-0.14/ql/src: java/org/apache/hadoop/hive/ql/parse/ test/results/clientpositive/ test/results/clientpositive/tez/

Author: gates
Date: Fri Oct 10 16:13:12 2014
New Revision: 1630932

URL: http://svn.apache.org/r1630932
Log:
HIVE-8367 delete writes records in wrong order in some cases (Alan Gates, reviewed by Eugene Koifman)

Modified:
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/delete_all_partitioned.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/update_all_partitioned.q.out

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Fri Oct 10 16:13:12 2014
@@ -6403,7 +6403,8 @@ public class SemanticAnalyzer extends Ba
       conf.setBoolVar(ConfVars.HIVE_VECTORIZATION_ENABLED, false);
     }
     LOG.info("Modifying config values for ACID write");
-    conf.setBoolVar(ConfVars.HIVEOPTREDUCEDEDUPLICATION, false);
+    conf.setBoolVar(ConfVars.HIVEOPTREDUCEDEDUPLICATION, true);
+    conf.setIntVar(ConfVars.HIVEOPTREDUCEDEDUPLICATIONMINREDUCER, 1);
     conf.setBoolVar(ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES, true);
     conf.set(AcidUtils.CONF_ACID_KEY, "true");
 

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java Fri Oct 10 16:13:12 2014
@@ -236,7 +236,7 @@ public class UpdateDeleteSemanticAnalyze
     }
 
     // Add a sort by clause so that the row ids come out in the correct order
-    rewrittenQueryStr.append(" sort by ROW__ID desc ");
+    rewrittenQueryStr.append(" sort by ROW__ID ");
 
     // Parse the rewritten query string
     Context rewrittenCtx;

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/delete_all_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/delete_all_partitioned.q.out?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/delete_all_partitioned.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/delete_all_partitioned.q.out Fri Oct 10 16:13:12 2014
@@ -84,5 +84,3 @@ POSTHOOK: Input: default@acid_dap
 POSTHOOK: Input: default@acid_dap@ds=today
 POSTHOOK: Input: default@acid_dap@ds=tomorrow
 #### A masked pattern was here ####
--1071480828	aw724t8c5558x2xneC624	today
--1072076362	2uLyD28144vklju213J1mr	today

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out Fri Oct 10 16:13:12 2014
@@ -84,5 +84,3 @@ POSTHOOK: Input: default@acid_dap
 POSTHOOK: Input: default@acid_dap@ds=today
 POSTHOOK: Input: default@acid_dap@ds=tomorrow
 #### A masked pattern was here ####
--1071480828	aw724t8c5558x2xneC624	today
--1072076362	2uLyD28144vklju213J1mr	today

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out Fri Oct 10 16:13:12 2014
@@ -85,21 +85,15 @@ POSTHOOK: Input: default@acid_uap@ds=tod
 POSTHOOK: Input: default@acid_uap@ds=tomorrow
 #### A masked pattern was here ####
 -1073279343	fred	today
--1073279343	oj1YrV5Wa	today
 -1073051226	fred	today
 -1072910839	fred	today
--1072081801	dPkN74F7	today
 -1072081801	fred	today
 -1072076362	fred	today
 -1071480828	fred	today
--1071363017	Anj0oF	today
 -1071363017	fred	today
--1070883071	0ruyd6Y50JpdGRf6HqD	today
 -1070883071	fred	today
 -1070551679	fred	today
--1070551679	iUR3Q	today
 -1069736047	fred	today
--1069736047	k17Am8uPHWk02cEf1jet	today
 762	fred	tomorrow
 762	fred	tomorrow
 762	fred	tomorrow

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/update_all_partitioned.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/update_all_partitioned.q.out?rev=1630932&r1=1630931&r2=1630932&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/update_all_partitioned.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/update_all_partitioned.q.out Fri Oct 10 16:13:12 2014
@@ -85,21 +85,15 @@ POSTHOOK: Input: default@acid_uap@ds=tod
 POSTHOOK: Input: default@acid_uap@ds=tomorrow
 #### A masked pattern was here ####
 -1073279343	fred	today
--1073279343	oj1YrV5Wa	today
 -1073051226	fred	today
 -1072910839	fred	today
--1072081801	dPkN74F7	today
 -1072081801	fred	today
 -1072076362	fred	today
 -1071480828	fred	today
--1071363017	Anj0oF	today
 -1071363017	fred	today
--1070883071	0ruyd6Y50JpdGRf6HqD	today
 -1070883071	fred	today
 -1070551679	fred	today
--1070551679	iUR3Q	today
 -1069736047	fred	today
--1069736047	k17Am8uPHWk02cEf1jet	today
 762	fred	tomorrow
 762	fred	tomorrow
 762	fred	tomorrow