Removing class objects comparison using the getName(),getSimpleName()

Changes to correct Operator Type
prestodb · Nov 13, 2024 · 56dcdbb · 56dcdbb
1 parent 0352ee1
commit 56dcdbb
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 8 deletions.
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java b/presto-hive/src/main/java/com/facebook/presto/hive/HiveUtil.java
@@ -56,7 +56,9 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.common.JavaUtils;
 import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.io.RCFileInputFormat;
 import org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat;
+import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat;
 import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat;
 import org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe;
 import org.apache.hadoop.hive.serde2.AbstractSerDe;
@@ -442,8 +444,7 @@ public static long parseHiveTimestamp(String value, DateTimeZone timeZone)
 
     public static boolean isSplittable(InputFormat<?, ?> inputFormat, FileSystem fileSystem, Path path)
     {
-        if ("OrcInputFormat".equals(inputFormat.getClass().getSimpleName()) ||
-                "RCFileInputFormat".equals(inputFormat.getClass().getSimpleName())) {
+        if (inputFormat instanceof OrcInputFormat || inputFormat instanceof RCFileInputFormat) {
             return true;
         }
 

diff --git a/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java b/presto-main/src/main/java/com/facebook/presto/execution/QueryStats.java
@@ -388,11 +388,11 @@ else if (operatorType.equals(TableScanOperator.class.getSimpleName()) || operato
 
                 if (plan.isOutputTableWriterFragment()) {
                     writtenOutputPositions += stageExecutionStats.getOperatorSummaries().stream()
-                            .filter(stats -> stats.getOperatorType().equals(TableWriterOperator.class.getSimpleName()))
+                            .filter(stats -> stats.getOperatorType().equals(TableWriterOperator.OPERATOR_TYPE))
                             .mapToLong(OperatorStats::getInputPositions)
                             .sum();
                     writtenOutputLogicalDataSize += stageExecutionStats.getOperatorSummaries().stream()
-                            .filter(stats -> stats.getOperatorType().equals(TableWriterOperator.class.getSimpleName()))
+                            .filter(stats -> stats.getOperatorType().equals(TableWriterOperator.OPERATOR_TYPE))
                             .mapToLong(stats -> stats.getInputDataSize().toBytes())
                             .sum();
                     writtenOutputPhysicalDataSize += stageExecutionStats.getPhysicalWrittenDataSize().toBytes();

diff --git a/presto-main/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java b/presto-main/src/main/java/com/facebook/presto/execution/executor/TaskExecutor.java
@@ -95,7 +95,7 @@ public class TaskExecutor
     // Interrupt a split if it is running longer than this AND it's blocked on something known
     private static final Predicate<List<StackTraceElement>> DEFAULT_INTERRUPTIBLE_SPLIT_PREDICATE = elements ->
                     elements.stream()
-                            .anyMatch(element -> element.getClassName().equals(JoniRegexpFunctions.class.getName()));
+                            .anyMatch(element -> element.getClassName().equals(JoniRegexpFunctions.CLASS_NAME));
     private static final Duration DEFAULT_INTERRUPT_SPLIT_INTERVAL = new Duration(60, SECONDS);
 
     private static final AtomicLong NEXT_RUNNER_ID = new AtomicLong();

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/AggregationOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/AggregationOperator.java
@@ -35,6 +35,8 @@
 public class AggregationOperator
         implements Operator
 {
+    public static final String OPERATOR_TYPE = "AggregationOperator";
+
     public static class AggregationOperatorFactory
             implements OperatorFactory
     {

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java
@@ -57,6 +57,7 @@ public class HashAggregationOperator
         implements Operator
 {
     private static final double MERGE_WITH_MEMORY_RATIO = 0.9;
+    public static final String OPERATOR_TYPE = "HashAggregationOperator";
 
     public static class HashAggregationOperatorFactory
             implements OperatorFactory

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/HashBuilderOperator.java
@@ -57,6 +57,7 @@ public class HashBuilderOperator
         implements Operator
 {
     private static final Logger log = Logger.get(HashBuilderOperator.class);
+    public static final String OPERATOR_TYPE = "HashBuilderOperator";
 
     public static class HashBuilderOperatorFactory
             implements OperatorFactory

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/TableWriterOperator.java b/presto-main/src/main/java/com/facebook/presto/operator/TableWriterOperator.java
@@ -78,6 +78,7 @@
 public class TableWriterOperator
         implements Operator
 {
+    public static final String OPERATOR_TYPE = "TableWriterOperator";
     public static class TableWriterOperatorFactory
             implements OperatorFactory
     {

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/TaskContext.java b/presto-main/src/main/java/com/facebook/presto/operator/TaskContext.java
@@ -717,7 +717,7 @@ private Optional<String> getAdditionalOperatorInfo(OperatorContext context)
             return Optional.empty();
         }
 
-        if (context.getOperatorType().equals(HashBuilderOperator.class.getSimpleName())) {
+        if (context.getOperatorType().equals(HashBuilderOperator.OPERATOR_TYPE)) {
             Optional<JoinNode> planNode = findPlanNode(context.getPlanNodeId(), JoinNode.class);
             if (!planNode.isPresent()) {
                 return Optional.empty();
@@ -729,8 +729,8 @@ private Optional<String> getAdditionalOperatorInfo(OperatorContext context)
             return Optional.of(info);
         }
 
-        if (context.getOperatorType().equals(HashAggregationOperator.class.getSimpleName()) ||
-                context.getOperatorType().equals(AggregationOperator.class.getSimpleName())) {
+        if (context.getOperatorType().equals(HashAggregationOperator.OPERATOR_TYPE) ||
+                context.getOperatorType().equals(AggregationOperator.OPERATOR_TYPE)) {
             Optional<AggregationNode> planNode = findPlanNode(context.getPlanNodeId(), AggregationNode.class);
             if (!planNode.isPresent()) {
                 return Optional.empty();

diff --git a/presto-main/src/main/java/com/facebook/presto/operator/scalar/JoniRegexpFunctions.java b/presto-main/src/main/java/com/facebook/presto/operator/scalar/JoniRegexpFunctions.java
@@ -47,6 +47,7 @@
 
 public final class JoniRegexpFunctions
 {
+    public static final String CLASS_NAME = "JoniRegexpFunctions";
     private static final Block EMPTY_BLOCK = VarcharType.VARCHAR.createBlockBuilder(null, 0).build();
     private JoniRegexpFunctions()
     {