From b38361b8ca44d633b49c1b94d98a2c6203fd369b Mon Sep 17 00:00:00 2001
From: Laith Alzyoud <laith.alzyoud@icloud.com>
Date: Thu, 7 Aug 2025 11:49:45 +0200
Subject: [PATCH] Don't pass expected_parameter_key/value with Hive Locking
 enabled

---
 .../iceberg/catalog/hms/HiveMetastoreTableOperations.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
index d318f664b7d7..a736b7ff0756 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/HiveMetastoreTableOperations.java
@@ -113,10 +113,13 @@ private void commitTableUpdate(Table table, TableMetadata metadata, BiFunction<T
 
             Table updatedTable = tableUpdateFunction.apply(table, newMetadataLocation);
 
+            // Passing environment context causes redundant operations if Hive locking is enabled
+            Map<String, String> environmentContext = lockingEnabled ? ImmutableMap.of() : environmentContext(metadataLocation);
+
             // todo privileges should not be replaced for an alter
             PrincipalPrivileges privileges = table.getOwner().map(MetastoreUtil::buildInitialPrivilegeSet).orElse(NO_PRIVILEGES);
             try {
-                metastore.replaceTable(table.getDatabaseName(), table.getTableName(), updatedTable, privileges, environmentContext(metadataLocation));
+                metastore.replaceTable(table.getDatabaseName(), table.getTableName(), updatedTable, privileges, environmentContext);
             }
             catch (RuntimeException e) {
                 // Cannot determine whether the `replaceTable` operation was successful,