Merge origin/master into HIVE-29368

Author: konstantinb

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -3765,6 +3765,10 @@ public static enum ConfVars {
             + "prints) the same node multiple times. The number of visits can become exponential and make the server "
             + "crash or become unresponsive so this limit acts as a safety net to fail-fast the problematic query and "
             + "avoid bringing down the entire server."),
+    @InterfaceAudience.Private
+    HIVE_EXPLAIN_FORMATTED_INDENT("hive.explain.formatted.indent", false,
+        "Whether to indent the JSON output of EXPLAIN FORMATTED for better readability. " +
+        "The property is private to be used in tests only."),
     // prefix used to auto generated column aliases (this should be started with '_')
     HIVE_AUTOGEN_COLUMNALIAS_PREFIX_LABEL("hive.autogen.columnalias.prefix.label", "_c",
         "String used as a prefix when auto generating column alias.\n" +
@@ -6551,6 +6555,19 @@ public HiveConf(Configuration other, Class<?> cls) {
     initialize(cls);
   }
 
+  /**
+   * For internal use only, assumed the "other" has loaded all properties that intend to use
+   * and want to cast it to a HiveConf without extra re-loading the source file.
+   * @param other The Configuration whose properties are to be wrapped by this HiveConf.
+   */
+  private HiveConf(Configuration other) {
+    super(other);
+    setupRestrictList();
+    hiddenSet.addAll(HiveConfUtil.getHiddenSet(other));
+    lockedSet.addAll(HiveConfUtil.getLockedSet(other));
+    origProp = getProperties(other);
+  }
+
   /**
    * Copy constructor
    */
@@ -7313,4 +7330,19 @@ public void syncFromConf(HiveConf conf) {
       set(e.getKey(), e.getValue());
     }
   }
+
+  /**
+   * Sometimes if the configuration contains all the information we want,
+   * but want to cast it to a HiveConf, without loading the props from the
+   * source file again, which is wasteful and might cost dozens of milliseconds.
+   * @param configuration The original configuration
+   * @return A HiveConf wrapping on the original configuration
+   */
+  public static HiveConf cloneConf(Configuration configuration) {
+    if (configuration instanceof HiveConf config) {
+      return new HiveConf(config);
+    } else {
+      return new HiveConf(configuration);
+    }
+  }
 }

common/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java

@@ -468,7 +468,7 @@ public enum ErrorMsg {
   RESOURCE_PLAN_ALREADY_EXISTS(10417, "Resource plan {0} already exists", true),
   RESOURCE_PLAN_NOT_EXISTS(10418, "Resource plan {0} does not exist", true),
   INCOMPATIBLE_STRUCT(10419, "Incompatible structs.", true),
-  OBJECTNAME_CONTAINS_DOT(10420, "Table or database name may not contain dot(.) character", true),
+  OBJECTNAME_CONTAINS_DOT(10420, "Catalog, database or table names may not contain dot(.) character", true),
   WITHIN_GROUP_NOT_ALLOWED(10421,
           "Not an ordered-set aggregate function: {0}. WITHIN GROUP clause is not allowed.", true),
   WITHIN_GROUP_PARAMETER_MISMATCH(10422,

data/conf/iceberg/tez/hive-site.xml

@@ -320,4 +320,8 @@
   <name>hive.lock.sleep.between.retries</name>
   <value>2</value>
 </property>
+  <property>
+    <name>hive.explain.formatted.indent</name>
+    <value>true</value>
+  </property>
 </configuration>

data/conf/llap/hive-site.xml

@@ -294,7 +294,10 @@
   <name>hive.explain.user</name>
   <value>false</value>
 </property>
-
+<property>
+  <name>hive.explain.formatted.indent</name>
+  <value>true</value>
+</property>
 <property>
   <name>hive.join.inner.residual</name>
   <value>true</value>

iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java

@@ -38,18 +38,17 @@
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hive.iceberg.org.apache.avro.generic.GenericData;
 import org.apache.hive.iceberg.org.apache.avro.generic.GenericRecordBuilder;
-import org.apache.iceberg.BaseTable;
 import org.apache.iceberg.DataFile;
 import org.apache.iceberg.DataFiles;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.Files;
-import org.apache.iceberg.HasTableOperations;
 import org.apache.iceberg.ManifestFile;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
 import org.apache.iceberg.Table;
 import org.apache.iceberg.TableMetadataParser;
 import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.TableUtil;
 import org.apache.iceberg.avro.Avro;
 import org.apache.iceberg.avro.AvroSchemaUtil;
 import org.apache.iceberg.catalog.Namespace;
@@ -259,7 +258,7 @@ public void testDropTable() throws IOException {
           .as("Table manifest files should not exist")
           .doesNotExist();
     }
-    assertThat(new File(((HasTableOperations) table).operations().current().metadataFileLocation()
+    assertThat(new File(TableUtil.metadataFileLocation(table)
         .replace("file:", "")))
         .as("Table metadata file should not exist")
         .doesNotExist();
@@ -552,7 +551,7 @@ public void testRegisterHadoopTableToHiveCatalog() throws IOException, TExceptio
         .hasMessage("Table does not exist: hivedb.table1");
 
     // register the table to hive catalog using the latest metadata file
-    String latestMetadataFile = ((BaseTable) table).operations().current().metadataFileLocation();
+    String latestMetadataFile = TableUtil.metadataFileLocation(table);
     catalog.registerTable(identifier, "file:" + latestMetadataFile);
     assertThat(HIVE_METASTORE_EXTENSION.metastoreClient().getTable(DB_NAME, "table1")).isNotNull();