HIVE-29389: HiveProtoLoggingHook populates duplicate entries in TablesRead metrics for tables with multiple partitions (#6253)

tanishq-chugh · web-flow · commit 4b1b2095a363 · 2025-12-31T13:43:22.000-05:00
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java
@@ -92,6 +92,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -489,13 +490,13 @@ private String getQueueName(ExecutionMode mode, HiveConf conf) {
     }
 
     private List<String> getTablesFromEntitySet(Set<? extends Entity> entities) {
-      List<String> tableNames = new ArrayList<>();
+      Set<String> tableNames = new HashSet<>();
       for (Entity entity : entities) {
         if (entity.getType() == TABLE || entity.getType() == PARTITION) {
           tableNames.add(entity.getTable().getDbName() + "." + entity.getTable().getTableName());
         }
       }
-      return tableNames;
+      return new ArrayList<>(tableNames);
     }
 
     private ExecutionMode getExecutionMode(QueryPlan plan, List<ExecDriver> mrTasks,

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@`
`92`	`92`	`import java.util.ArrayList;`
`93`	`93`	`import java.util.Arrays;`
`94`	`94`	`import java.util.HashMap;`
	`95`	`+import java.util.HashSet;`
`95`	`96`	`import java.util.List;`
`96`	`97`	`import java.util.Map;`
`97`	`98`	`import java.util.Set;`
`@@ -489,13 +490,13 @@ private String getQueueName(ExecutionMode mode, HiveConf conf) {`
`489`	`490`	`}`
`490`	`491`
`491`	`492`	`private List<String> getTablesFromEntitySet(Set<? extends Entity> entities) {`
`492`		`- List<String> tableNames = new ArrayList<>();`
	`493`	`+ Set<String> tableNames = new HashSet<>();`
`493`	`494`	`for (Entity entity : entities) {`
`494`	`495`	`if (entity.getType() == TABLE \|\| entity.getType() == PARTITION) {`
`495`	`496`	`tableNames.add(entity.getTable().getDbName() + "." + entity.getTable().getTableName());`
`496`	`497`	`}`
`497`	`498`	`}`
`498`		`- return tableNames;`
	`499`	`+ return new ArrayList<>(tableNames);`
`499`	`500`	`}`
`500`	`501`
`501`	`502`	`private ExecutionMode getExecutionMode(QueryPlan plan, List<ExecDriver> mrTasks,`