Merge branch 'apache:master' into HIVE-28147

slfan1989 · Apr 5, 2024 · 0428a18 · 0428a18
2 parents 34da82f + c629020
commit 0428a18
Show file tree

Hide file tree

Showing 111 changed files with 1,175 additions and 9,571 deletions.
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -2691,8 +2691,8 @@ public static enum ConfVars {
         "\n" +
         "If the skew information is correctly stored in the metadata, hive.optimize.skewjoin.compiletime\n" +
         "would change the query plan to take care of it, and hive.optimize.skewjoin will be a no-op."),
-
-    HIVE_OPTIMIZE_REPLACE_DELETE_WITH_TRUNCATE("hive.optimize.delete.all", false, 
+    @Deprecated
+    HIVE_OPTIMIZE_REPLACE_DELETE_WITH_TRUNCATE("hive.optimize.delete.all", true,
         "Optimize delete the entire data from table, use truncate instead"),
     HIVE_OPTIMIZE_METADATA_DELETE("hive.optimize.delete.metadata.only", true,
             "Optimize delete the entire data from table, use truncate instead"),

diff --git a/hcatalog/src/docs/forrest.properties b/hcatalog/src/docs/forrest.properties
diff --git a/hcatalog/src/docs/forrest.properties.dispatcher.properties b/hcatalog/src/docs/forrest.properties.dispatcher.properties
diff --git a/hcatalog/src/docs/forrest.properties.xml b/hcatalog/src/docs/forrest.properties.xml
diff --git a/hcatalog/src/docs/overview.html b/hcatalog/src/docs/overview.html
diff --git a/hcatalog/src/docs/src/documentation/README.txt b/hcatalog/src/docs/src/documentation/README.txt