This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 07c5e18549b HIVE-27786: Iceberg: Eliminate engine.hive.enabled table 
property. (#4793). (Ayush Saxena, reviewed by Denys Kuzmenko)
07c5e18549b is described below

commit 07c5e18549b1f5e380b178816b7c6dec6bca322d
Author: Ayush Saxena <[email protected]>
AuthorDate: Wed Oct 18 08:10:44 2023 +0530

    HIVE-27786: Iceberg: Eliminate engine.hive.enabled table property. (#4793). 
(Ayush Saxena, reviewed by Denys Kuzmenko)
---
 .../main/java/org/apache/iceberg/hive/HiveTableOperations.java    | 3 +--
 .../src/test/java/org/apache/iceberg/hive/HiveTableTest.java      | 5 ++---
 .../main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java | 6 ------
 .../iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java      | 8 ++------
 .../test/results/positive/alter_multi_part_table_to_iceberg.q.out | 3 ---
 .../src/test/results/positive/alter_part_table_to_iceberg.q.out   | 3 ---
 .../src/test/results/positive/alter_table_to_iceberg.q.out        | 3 ---
 iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out | 2 --
 .../src/test/results/positive/create_iceberg_table.q.out          | 1 -
 .../positive/create_iceberg_table_stored_as_fileformat.q.out      | 5 -----
 .../results/positive/create_iceberg_table_stored_by_iceberg.q.out | 1 -
 ...ate_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out | 1 -
 .../src/test/results/positive/ctas_iceberg_partitioned_orc.q.out  | 1 -
 .../iceberg-handler/src/test/results/positive/ctlt_iceberg.q.out  | 4 ----
 .../src/test/results/positive/delete_all_iceberg.q.out            | 1 -
 .../src/test/results/positive/describe_iceberg_table.q.out        | 4 ----
 .../src/test/results/positive/iceberg_insert_into_partition.q.out | 6 ------
 .../positive/iceberg_insert_into_partition_transforms.q.out       | 5 -----
 .../positive/iceberg_insert_into_partition_with_evolution.q.out   | 1 -
 .../results/positive/iceberg_insert_overwrite_partition.q.out     | 6 ------
 .../positive/iceberg_insert_overwrite_partition_transforms.q.out  | 4 ----
 .../src/test/results/positive/iceberg_v2_deletes.q.out            | 3 ---
 .../src/test/results/positive/mv_iceberg_partitioned_orc.q.out    | 2 --
 .../src/test/results/positive/mv_iceberg_partitioned_orc2.q.out   | 2 --
 iceberg/iceberg-handler/src/test/results/positive/row_count.q.out | 2 --
 .../src/test/results/positive/show_create_iceberg_table.q.out     | 5 -----
 .../test/results/positive/show_iceberg_materialized_views.q.out   | 4 ----
 .../src/test/results/positive/truncate_force_iceberg_table.q.out  | 2 --
 .../src/test/results/positive/truncate_iceberg_table.q.out        | 5 -----
 .../results/positive/truncate_partitioned_iceberg_table.q.out     | 2 --
 .../src/test/results/positive/use_basic_stats_from_iceberg.q.out  | 2 --
 31 files changed, 5 insertions(+), 97 deletions(-)

diff --git 
a/iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
 
b/iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
index 4b747ac7cfe..c5adae435fb 100644
--- 
a/iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
+++ 
b/iceberg/iceberg-catalog/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
@@ -552,8 +552,7 @@ public class HiveTableOperations extends 
BaseMetastoreTableOperations {
       return metadata.propertyAsBoolean(TableProperties.ENGINE_HIVE_ENABLED, 
false);
     }
 
-    return conf.getBoolean(
-        ConfigProperties.ENGINE_HIVE_ENABLED, 
TableProperties.ENGINE_HIVE_ENABLED_DEFAULT);
+    return conf.getBoolean(ConfigProperties.ENGINE_HIVE_ENABLED, true);
   }
 
   /**
diff --git 
a/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java
 
b/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java
index e23d03effed..64c6bc3d330 100644
--- 
a/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java
+++ 
b/iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/hive/HiveTableTest.java
@@ -517,7 +517,7 @@ public class HiveTableTest extends HiveTableBaseTest {
     catalog.dropTable(TABLE_IDENTIFIER);
 
     // Unset in hive-conf
-    catalog.getConf().unset(ConfigProperties.ENGINE_HIVE_ENABLED);
+    catalog.getConf().setBoolean(ConfigProperties.ENGINE_HIVE_ENABLED, false);
 
     catalog.createTable(TABLE_IDENTIFIER, schema, 
PartitionSpec.unpartitioned());
     org.apache.hadoop.hive.metastore.api.Table hmsTable = 
metastoreClient.getTable(DB_NAME, TABLE_NAME);
@@ -531,7 +531,6 @@ public class HiveTableTest extends HiveTableBaseTest {
     catalog.dropTable(TABLE_IDENTIFIER);
 
     // Enable by hive-conf
-    catalog.getConf().set(ConfigProperties.ENGINE_HIVE_ENABLED, "true");
 
     catalog.createTable(TABLE_IDENTIFIER, schema, 
PartitionSpec.unpartitioned());
     org.apache.hadoop.hive.metastore.api.Table hmsTable = 
metastoreClient.getTable(DB_NAME, TABLE_NAME);
@@ -541,7 +540,7 @@ public class HiveTableTest extends HiveTableBaseTest {
     catalog.dropTable(TABLE_IDENTIFIER);
 
     // Disable by hive-conf
-    catalog.getConf().set(ConfigProperties.ENGINE_HIVE_ENABLED, "false");
+    catalog.getConf().setBoolean(ConfigProperties.ENGINE_HIVE_ENABLED, false);
 
     catalog.createTable(TABLE_IDENTIFIER, schema, 
PartitionSpec.unpartitioned());
     hmsTable = metastoreClient.getTable(DB_NAME, TABLE_NAME);
diff --git 
a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
 
b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
index 14ccd429ce1..ad711d16c40 100644
--- 
a/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
+++ 
b/iceberg/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergMetaHook.java
@@ -245,9 +245,6 @@ public class HiveIcebergMetaHook implements HiveMetaHook {
   @Override
   public void commitCreateTable(org.apache.hadoop.hive.metastore.api.Table 
hmsTable) {
     if (icebergTable == null) {
-      if (Catalogs.hiveCatalog(conf, catalogProperties)) {
-        catalogProperties.put(TableProperties.ENGINE_HIVE_ENABLED, true);
-      }
 
       
setFileFormat(catalogProperties.getProperty(TableProperties.DEFAULT_FILE_FORMAT));
 
@@ -544,9 +541,6 @@ public class HiveIcebergMetaHook implements HiveMetaHook {
       catalogProperties.put(InputFormatConfig.TABLE_SCHEMA, 
SchemaParser.toJson(preAlterTableProperties.schema));
       catalogProperties.put(InputFormatConfig.PARTITION_SPEC, 
PartitionSpecParser.toJson(preAlterTableProperties.spec));
       setFileFormat(preAlterTableProperties.format);
-      if (Catalogs.hiveCatalog(conf, catalogProperties)) {
-        catalogProperties.put(TableProperties.ENGINE_HIVE_ENABLED, true);
-      }
       HiveTableUtil.importFiles(preAlterTableProperties.tableLocation, 
preAlterTableProperties.format,
           preAlterTableProperties.partitionSpecProxy, 
preAlterTableProperties.partitionKeys, catalogProperties, conf);
     } else if (currentAlterTableOp != null) {
diff --git 
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
 
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
index 225aefb9250..dc17e472b9c 100644
--- 
a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
+++ 
b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandlerNoScan.java
@@ -1000,19 +1000,15 @@ public class TestHiveIcebergStorageHandlerNoScan {
     Properties tableProperties = new Properties();
     tableProperties.putAll(hmsParams);
 
-    if (Catalogs.hiveCatalog(shell.getHiveConf(), tableProperties)) {
-      expectedIcebergProperties.put(TableProperties.ENGINE_HIVE_ENABLED, 
"true");
-    }
     if (HiveVersion.min(HiveVersion.HIVE_3)) {
       expectedIcebergProperties.put("bucketing_version", "2");
     }
     Assert.assertEquals(expectedIcebergProperties, icebergTable.properties());
 
     if (Catalogs.hiveCatalog(shell.getHiveConf(), tableProperties)) {
-      Assert.assertEquals(13, hmsParams.size());
+      Assert.assertEquals(12, hmsParams.size());
       Assert.assertEquals("initial_val", hmsParams.get("custom_property"));
       Assert.assertEquals("TRUE", hmsParams.get("EXTERNAL"));
-      Assert.assertEquals("true", 
hmsParams.get(TableProperties.ENGINE_HIVE_ENABLED));
       Assert.assertEquals(HiveIcebergStorageHandler.class.getName(),
           hmsParams.get(hive_metastoreConstants.META_TABLE_STORAGE));
       
Assert.assertEquals(BaseMetastoreTableOperations.ICEBERG_TABLE_TYPE_VALUE.toUpperCase(),
@@ -1046,7 +1042,7 @@ public class TestHiveIcebergStorageHandlerNoScan {
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
     if (Catalogs.hiveCatalog(shell.getHiveConf(), tableProperties)) {
-      Assert.assertEquals(16, hmsParams.size()); // 2 newly-added properties + 
previous_metadata_location prop
+      Assert.assertEquals(15, hmsParams.size()); // 2 newly-added properties + 
previous_metadata_location prop
       Assert.assertEquals("true", hmsParams.get("new_prop_1"));
       Assert.assertEquals("false", hmsParams.get("new_prop_2"));
       Assert.assertEquals("new_val", hmsParams.get("custom_property"));
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
index 449b4459c04..9e57537aaa8 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/alter_multi_part_table_to_iceberg.q.out
@@ -200,7 +200,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"7\",\"added-records\":\"15\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"7\",\"total-records\":\"15\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"7\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000},{\"name\":\"c\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -466,7 +465,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"7\",\"added-records\":\"15\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"7\",\"total-records\":\"15\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"7\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000},{\"name\":\"c\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -732,7 +730,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"7\",\"added-records\":\"15\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"7\",\"total-records\":\"15\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"7\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000},{\"name\":\"c\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
index 5f2da382900..7bcde7ebb97 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/alter_part_table_to_iceberg.q.out
@@ -158,7 +158,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"4\",\"added-records\":\"9\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"4\",\"total-records\":\"9\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"4\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -373,7 +372,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"4\",\"added-records\":\"9\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"4\",\"total-records\":\"9\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"4\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -588,7 +586,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"4\",\"added-records\":\"9\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"4\",\"total-records\":\"9\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"4\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
index 41bcffb2ddb..1c9578068c4 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/alter_table_to_iceberg.q.out
@@ -112,7 +112,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"5\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"5\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"1\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -278,7 +277,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"5\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"5\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"1\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
@@ -444,7 +442,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"5\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"5\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"1\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
        metadata_location       hdfs://### HDFS PATH ###
diff --git a/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
index 94708408f3c..dbf77956935 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/col_stats.q.out
@@ -513,7 +513,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"a\",\"required\":false,\"type\":\"int\"}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
@@ -557,7 +556,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"b\",\"required\":false,\"type\":\"int\"}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
index 4f2cbfcd4e7..fb2eeff31c3 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table.q.out
@@ -29,7 +29,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
index 4928ce60090..9d53be2c0cb 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_as_fileformat.q.out
@@ -35,7 +35,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -103,7 +102,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -171,7 +169,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -239,7 +236,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -302,7 +298,6 @@ Table Parameters:
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
        dummy                   dummy_value         
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
index 4f2cbfcd4e7..fb2eeff31c3 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg.q.out
@@ -29,7 +29,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
index 927651fef47..46de7cdd213 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q.out
@@ -29,7 +29,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
index 5f2c545d3af..607426a6890 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
@@ -300,7 +300,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"2\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"a_bucket\",\"transform\":\"bucket[16]\",\"source-id\":1,\"field-id\":1000},{\"name\":\"b_trunc\",\"transform\":\"truncate[3]\",\"source-id\":2,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/ctlt_iceberg.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/ctlt_iceberg.q.out
index e853cfc6bd4..e93f606a141 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/ctlt_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/ctlt_iceberg.q.out
@@ -41,7 +41,6 @@ TBLPROPERTIES (
   'bucketing_version'='2', 
   'created_with_ctlt'='true', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"a","required":false,"type":"int"}]}',
 
-  'engine.hive.enabled'='true', 
   'format-version'='2', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
@@ -126,7 +125,6 @@ TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"id","required":false,"type":"int"},{"id":2,"name":"company","required":false,"type":"string"}]}',
 
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"company","transform":"identity","source-id":2,"field-id":1000}]}',
 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'serialization.format'='1', 
@@ -165,7 +163,6 @@ TBLPROPERTIES (
   'created_with_ctlt'='true', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"id","required":false,"type":"int"},{"id":2,"name":"company","required":false,"type":"string"}]}',
 
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"company","transform":"identity","source-id":2,"field-id":1000}]}',
 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'snapshot-count'='0', 
@@ -232,7 +229,6 @@ TBLPROPERTIES (
   'created_with_ctlt'='true', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"id","required":false,"type":"int"},{"id":2,"name":"company","required":false,"type":"string"}]}',
 
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"company","transform":"identity","source-id":2,"field-id":1000}]}',
 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'snapshot-count'='0', 
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
index 0715f8a5977..40f2e0d4ddf 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/delete_all_iceberg.q.out
@@ -115,7 +115,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"deleted-data-files\":\"5\",\"deleted-records\":\"20\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.delete.skiprowdata      false               
        iceberg.orc.files.only  true                
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
index 3c5a6069c37..84dc9677e2c 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/describe_iceberg_table.q.out
@@ -77,7 +77,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"i\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"s\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ts\",\"required\":false,\"type\":\"timestamp\"},{\"id\":4,\"name\":\"d\",\"required\":false,\"type\":\"date\"}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -134,7 +133,6 @@ Table Parameters:
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"year_field\",\"required\":false,\"type\":\"date\"},{\"id\":2,\"name\":\"month_field\",\"required\":false,\"type\":\"date\"},{\"id\":3,\"name\":\"day_field\",\"required\":false,\"type\":\"date\"},{\"id\":4,\"name\":\"hour_field\",\"required\":false,\"type\":\"timestamp\"},{\"id\":5,\"name\":\"truncate_field\",\"required\":false,\"type\":\"string\"},{\"id\":6,\"name\":\"bucket_field\",\"required\":f
 [...]
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"year_field_year\",\"transform\":\"year\",\"source-id\":1,\"field-id\":1000},{\"name\":\"month_field_month\",\"transform\":\"month\",\"source-id\":2,\"field-id\":1001},{\"name\":\"day_field_day\",\"transform\":\"day\",\"source-id\":3,\"field-id\":1002},{\"name\":\"hour_field_hour\",\"transform\":\"hour\",\"source-id\":4,\"field-id\":1003},{\"name\":\"truncate_field_trunc\",\"transform\":\"truncate[2]\",\"source-id\":5,\"field-
 [...]
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -192,7 +190,6 @@ Table Parameters:
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"id\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"year_field\",\"required\":false,\"type\":\"date\"},{\"id\":3,\"name\":\"month_field\",\"required\":false,\"type\":\"date\"},{\"id\":4,\"name\":\"day_field\",\"required\":false,\"type\":\"date\"},{\"id\":5,\"name\":\"hour_field\",\"required\":false,\"type\":\"timestamp\"},{\"id\":6,\"name\":\"truncate_field\",\"required\":false,\"type\"
 [...]
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"year_field_year\",\"transform\":\"year\",\"source-id\":2,\"field-id\":1000},{\"name\":\"month_field_month\",\"transform\":\"month\",\"source-id\":3,\"field-id\":1001},{\"name\":\"day_field_day\",\"transform\":\"day\",\"source-id\":4,\"field-id\":1002},{\"name\":\"hour_field_hour\",\"transform\":\"hour\",\"source-id\":5,\"field-id\":1003},{\"name\":\"truncate_field_trunc\",\"transform\":\"truncate[2]\",\"source-id\":6,\"field-
 [...]
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
@@ -238,7 +235,6 @@ Table Parameters:
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"a\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"b\",\"required\":false,\"type\":\"string\"}]}
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                0                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
index 3ed994a25a9..de2ce3805c8 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
@@ -482,7 +482,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"8\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1620,7 +1619,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"192\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"384\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"country\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000},{\"name\":\"state\",\"transform\":\"identity\",\"source-id\":4,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                  
@@ -2636,7 +2634,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"192\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"384\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"country\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000},{\"name\":\"state\",\"transform\":\"identity\",\"source-id\":4,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                  
@@ -3290,7 +3287,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -3944,7 +3940,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -4598,7 +4593,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
index d7403efe190..35d37f3367d 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
@@ -601,7 +601,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_year\",\"transform\":\"year\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1257,7 +1256,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_month\",\"transform\":\"month\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1913,7 +1911,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_day\",\"transform\":\"day\",\"source-id\":1,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2340,7 +2337,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"4\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"8\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_trunc\",\"transform\":\"truncate[2]\",\"source-id\":1,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2751,7 +2747,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"4\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"8\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_bucket\",\"transform\":\"bucket[16]\",\"source-id\":1,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
index 10b06657329..8f2e8ee412c 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
@@ -177,7 +177,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"1\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"7\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":1,\"fields\":[{\"name\":\"b_trunc_2\",\"transform\":\"truncate[2]\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
index 277e92a65f6..31e7b1b42b5 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
@@ -276,7 +276,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"2\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"4\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1202,7 +1201,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"2\",\"deleted-data-files\":\"2\",\"added-records\":\"20\",\"deleted-records\":\"10\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"30\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"country\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000},{\"name\":\"state\",\"transform\":\"identity\",\"source-id\":4,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1654,7 +1652,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"6\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2094,7 +2091,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"6\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2534,7 +2530,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"6\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2974,7 +2969,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"6\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol\",\"transform\":\"identity\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition_transforms.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition_transforms.q.out
index 0914b606b01..91ff6028e34 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition_transforms.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition_transforms.q.out
@@ -597,7 +597,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"2\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_year\",\"transform\":\"year\",\"source-id\":3,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1227,7 +1226,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"2\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_month\",\"transform\":\"month\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -1861,7 +1859,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"added-records\":\"12\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"24\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_day\",\"transform\":\"day\",\"source-id\":1,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
@@ -2288,7 +2285,6 @@ Table Parameters:
        current-snapshot-summary        
{\"replace-partitions\":\"true\",\"added-data-files\":\"1\",\"deleted-data-files\":\"1\",\"added-records\":\"2\",\"deleted-records\":\"2\",\"added-files-size\":\"#Masked#\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"#Masked#\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"pcol_trunc\",\"transform\":\"truncate[2]\",\"source-id\":1,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
        numFiles                #Masked#                   
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
index 324f77df0ba..d21ccfe732b 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_v2_deletes.q.out
@@ -26,7 +26,6 @@ LOCATION
 TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"id","required":false,"type":"int"}]}',
 
-  'engine.hive.enabled'='true', 
   'format-version'='2', 
   'iceberg.delete.skiprowdata'='false', 
   'iceberg.orc.files.only'='true', 
@@ -137,7 +136,6 @@ TBLPROPERTIES (
   'current-snapshot-id'='#Masked#', 
   
'current-snapshot-summary'='{"added-position-delete-files":"1","added-delete-files":"1","added-files-size":"#Masked#","added-position-deletes":"1","changed-partition-count":"1","total-records":"8","total-files-size":"#Masked#","total-data-files":"2","total-delete-files":"2","total-position-deletes":"3","total-equality-deletes":"0"}',
 
   'current-snapshot-timestamp-ms'='#Masked#', 
-  'engine.hive.enabled'='true', 
   'format-version'='2', 
   'iceberg.delete.skiprowdata'='true', 
   'iceberg.orc.files.only'='true', 
@@ -284,7 +282,6 @@ TBLPROPERTIES (
   
'current-snapshot-summary'='{"added-position-delete-files":"1","added-delete-files":"1","added-files-size":"#Masked#","added-position-deletes":"1","changed-partition-count":"1","total-records":"8","total-files-size":"#Masked#","total-data-files":"4","total-delete-files":"3","total-position-deletes":"3","total-equality-deletes":"0"}',
 
   'current-snapshot-timestamp-ms'='#Masked#', 
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"part","transform":"identity","source-id":2,"field-id":1000}]}',
 
-  'engine.hive.enabled'='true', 
   'format-version'='2', 
   'iceberg.delete.skiprowdata'='true', 
   'iceberg.orc.files.only'='true', 
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
index 0db129f22ae..2a9eee7b0f0 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc.q.out
@@ -68,7 +68,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"2\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -153,7 +152,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"2\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
index 2f194ac55ae..a035a1cc962 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/mv_iceberg_partitioned_orc2.q.out
@@ -69,7 +69,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"2\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b_bucket\",\"transform\":\"bucket[16]\",\"source-id\":1,\"field-id\":1000},{\"name\":\"c_trunc\",\"transform\":\"truncate[3]\",\"source-id\":2,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -155,7 +154,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"2\",\"added-records\":\"2\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"2\",\"total-records\":\"2\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"2\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b_bucket\",\"transform\":\"bucket[16]\",\"source-id\":1,\"field-id\":1000},{\"name\":\"c_trunc\",\"transform\":\"truncate[3]\",\"source-id\":2,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
diff --git a/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out 
b/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
index b5d9cadc985..481336ab61d 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/row_count.q.out
@@ -105,7 +105,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"10\",\"added-records\":\"21\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"10\",\"total-records\":\"21\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"10\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"p1\",\"transform\":\"identity\",\"source-id\":5,\"field-id\":1000},{\"name\":\"p2\",\"transform\":\"identity\",\"source-id\":6,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -190,7 +189,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-position-delete-files\":\"5\",\"added-delete-files\":\"5\",\"added-files-size\":\"#Masked#\",\"added-position-deletes\":\"6\",\"changed-partition-count\":\"5\",\"total-records\":\"21\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"10\",\"total-delete-files\":\"9\",\"total-position-deletes\":\"10\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"p1\",\"transform\":\"identity\",\"source-id\":5,\"field-id\":1000},{\"name\":\"p2\",\"transform\":\"identity\",\"source-id\":6,\"field-id\":1001}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
index d1f1344eb61..c6e0cddcdef 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/show_create_iceberg_table.q.out
@@ -33,7 +33,6 @@ LOCATION
 TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"i","required":false,"type":"int"},{"id":2,"name":"s","required":false,"type":"string"},{"id":3,"name":"ts","required":false,"type":"timestamp"},{"id":4,"name":"d","required":false,"type":"date"}]}',
 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'serialization.format'='1', 
@@ -88,7 +87,6 @@ TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"year_field","required":false,"type":"date"},{"id":2,"name":"month_field","required":false,"type":"date"},{"id":3,"name":"day_field","required":false,"type":"date"},{"id":4,"name":"hour_field","required":false,"type":"timestamp"},{"id":5,"name":"truncate_field","required":false,"type":"string"},{"id":6,"name":"bucket_field","required":false,"type":"int"},{"id":7,"name":"identity_field","required":false,"type":"in
 [...]
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"year_field_year","transform":"year","source-id":1,"field-id":1000},{"name":"month_field_month","transform":"month","source-id":2,"field-id":1001},{"name":"day_field_day","transform":"day","source-id":3,"field-id":1002},{"name":"hour_field_hour","transform":"hour","source-id":4,"field-id":1003},{"name":"truncate_field_trunc","transform":"truncate[2]","source-id":5,"field-id":1004},{"name":"bucket_field_bucket","transform":"bucket
 [...]
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'serialization.format'='1', 
@@ -144,7 +142,6 @@ TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"id","required":false,"type":"int"},{"id":2,"name":"year_field","required":false,"type":"date"},{"id":3,"name":"month_field","required":false,"type":"date"},{"id":4,"name":"day_field","required":false,"type":"date"},{"id":5,"name":"hour_field","required":false,"type":"timestamp"},{"id":6,"name":"truncate_field","required":false,"type":"string"},{"id":7,"name":"bucket_field","required":false,"type":"int"},{"id":8,
 [...]
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"year_field_year","transform":"year","source-id":2,"field-id":1000},{"name":"month_field_month","transform":"month","source-id":3,"field-id":1001},{"name":"day_field_day","transform":"day","source-id":4,"field-id":1002},{"name":"hour_field_hour","transform":"hour","source-id":5,"field-id":1003},{"name":"truncate_field_trunc","transform":"truncate[2]","source-id":6,"field-id":1004},{"name":"bucket_field_bucket","transform":"bucket
 [...]
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'serialization.format'='1', 
@@ -188,7 +185,6 @@ TBLPROPERTIES (
   'bucketing_version'='2', 
   
'current-schema'='{"type":"struct","schema-id":0,"fields":[{"id":1,"name":"a","required":false,"type":"int"},{"id":2,"name":"b","required":false,"type":"string"}]}',
 
   
'default-partition-spec'='{"spec-id":0,"fields":[{"name":"b","transform":"identity","source-id":2,"field-id":1000}]}',
 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'serialization.format'='1', 
@@ -240,7 +236,6 @@ TBLPROPERTIES (
   'current-snapshot-id'='#SnapshotId#', 
   
'current-snapshot-summary'='{"added-data-files":"1","added-records":"3","added-files-size":"638","changed-partition-count":"1","total-records":"3","total-files-size":"638","total-data-files":"1","total-delete-files":"0","total-position-deletes":"0","total-equality-deletes":"0"}',
 
   'current-snapshot-timestamp-ms'='#Masked#', 
-  'engine.hive.enabled'='true', 
   'iceberg.orc.files.only'='false', 
   'metadata_location'='hdfs://### HDFS PATH ###', 
   'previous_metadata_location'='hdfs://### HDFS PATH ###', 
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
index 7efe8f4aa96..cb796611a99 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/show_iceberg_materialized_views.q.out
@@ -365,7 +365,6 @@ Table Parameters:
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"ds\":\"true\",\"key\":\"true\",\"value\":\"true\"}}
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"key\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"value\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ds\",\"required\":false,\"type\":\"string\"}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -417,7 +416,6 @@ Table Parameters:
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"ds\":\"true\",\"key\":\"true\",\"value\":\"true\"}}
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"key\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"value\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ds\",\"required\":false,\"type\":\"string\"}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -468,7 +466,6 @@ Table Parameters:
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"ds\":\"true\",\"key\":\"true\",\"value\":\"true\"}}
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"key\",\"required\":false,\"type\":\"int\"},{\"id\":2,\"name\":\"value\",\"required\":false,\"type\":\"string\"},{\"id\":3,\"name\":\"ds\",\"required\":false,\"type\":\"string\"}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
@@ -573,7 +570,6 @@ Table Parameters:
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"}}
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"a\",\"required\":false,\"type\":\"int\"}]}
-       engine.hive.enabled     true                
        format-version          1                   
        iceberg.orc.files.only  true                
        metadata_location       hdfs://### HDFS PATH ###
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
index 7e21f4ae71a..0dee689afc2 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_force_iceberg_table.q.out
@@ -94,7 +94,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"3\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"3\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    false               
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
@@ -165,7 +164,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"deleted-data-files\":\"3\",\"deleted-records\":\"10\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    false               
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
index 44f5aa07e4f..95a97d8074f 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_iceberg_table.q.out
@@ -94,7 +94,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"3\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"10\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"3\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
@@ -165,7 +164,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"deleted-data-files\":\"3\",\"deleted-records\":\"10\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
@@ -234,7 +232,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"added-data-files\":\"1\",\"added-records\":\"5\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"5\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"1\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
@@ -305,7 +302,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"deleted-data-files\":\"1\",\"deleted-records\":\"5\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
@@ -392,7 +388,6 @@ Table Parameters:
        current-snapshot-id     #Masked#
        current-snapshot-summary        
{\"deleted-data-files\":\"1\",\"deleted-records\":\"5\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"1\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
-       engine.hive.enabled     true                
        external.table.purge    false               
        iceberg.orc.files.only  true                
 #### A masked pattern was here ####
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
index 2a4257cacc0..309cbee993c 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/truncate_partitioned_iceberg_table.q.out
@@ -101,7 +101,6 @@ Table Parameters:
        current-snapshot-summary        
{\"added-data-files\":\"4\",\"added-records\":\"9\",\"added-files-size\":\"#Masked#\",\"changed-partition-count\":\"4\",\"total-records\":\"9\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"4\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
@@ -200,7 +199,6 @@ Table Parameters:
        current-snapshot-summary        
{\"deleted-data-files\":\"4\",\"deleted-records\":\"9\",\"removed-files-size\":\"#Masked#\",\"changed-partition-count\":\"4\",\"total-records\":\"0\",\"total-files-size\":\"#Masked#\",\"total-data-files\":\"0\",\"total-delete-files\":\"0\",\"total-position-deletes\":\"0\",\"total-equality-deletes\":\"0\"}
        current-snapshot-timestamp-ms   #Masked#       
        default-partition-spec  
{\"spec-id\":0,\"fields\":[{\"name\":\"b\",\"transform\":\"identity\",\"source-id\":2,\"field-id\":1000}]}
-       engine.hive.enabled     true                
        external.table.purge    true                
        iceberg.orc.files.only  false               
 #### A masked pattern was here ####
diff --git 
a/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
 
b/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
index 0469f1b0c75..257ed797965 100644
--- 
a/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
+++ 
b/iceberg/iceberg-handler/src/test/results/positive/use_basic_stats_from_iceberg.q.out
@@ -160,7 +160,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"a\",\"required\":false,\"type\":\"int\"}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###
@@ -204,7 +203,6 @@ Table Parameters:
        EXTERNAL                TRUE                
        bucketing_version       2                   
        current-schema          
{\"type\":\"struct\",\"schema-id\":0,\"fields\":[{\"id\":1,\"name\":\"b\",\"required\":false,\"type\":\"int\"}]}
-       engine.hive.enabled     true                
        format-version          2                   
        iceberg.orc.files.only  false               
        metadata_location       hdfs://### HDFS PATH ###

Reply via email to