diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 19110ce..9849fb4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -6403,7 +6403,8 @@ private void checkAcidConstraints(QB qb, TableDesc tableDesc, 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"); diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java index 14ee3f0..65f5eaa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java @@ -236,7 +236,7 @@ private void reparseAndSuperAnalyze(ASTNode tree) throws SemanticException { } // 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; diff --git ql/src/test/results/clientpositive/delete_all_partitioned.q.out ql/src/test/results/clientpositive/delete_all_partitioned.q.out index c5149b2..90f8753 100644 --- ql/src/test/results/clientpositive/delete_all_partitioned.q.out +++ ql/src/test/results/clientpositive/delete_all_partitioned.q.out @@ -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 diff --git ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out index c5149b2..90f8753 100644 --- ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out @@ -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 diff --git ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out index 533dd88..286e2ed 100644 --- ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out @@ -85,21 +85,15 @@ POSTHOOK: Input: default@acid_uap@ds=today 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 diff --git ql/src/test/results/clientpositive/update_all_partitioned.q.out ql/src/test/results/clientpositive/update_all_partitioned.q.out index 533dd88..286e2ed 100644 --- ql/src/test/results/clientpositive/update_all_partitioned.q.out +++ ql/src/test/results/clientpositive/update_all_partitioned.q.out @@ -85,21 +85,15 @@ POSTHOOK: Input: default@acid_uap@ds=today 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