code refactor

Author: anandamideShakyan

presto-main-base/src/main/java/com/facebook/presto/execution/BasicStageExecutionStats.java

@@ -68,10 +68,10 @@ public class BasicStageExecutionStats
     private final int queuedDrivers;
     private final int runningDrivers;
     private final int completedDrivers;
-    private final int totalNativeDrivers;
-    private final int queuedNativeDrivers;
-    private final int runningNativeDrivers;
-    private final int completedNativeDrivers;
+    private final int totalNewDrivers;
+    private final int queuedNewDrivers;
+    private final int runningNewDrivers;
+    private final int completedNewDrivers;
     private final int totalSplits;
     private final int queuedSplits;
     private final int runningSplits;
@@ -97,10 +97,10 @@ public BasicStageExecutionStats(
             int runningDrivers,
             int completedDrivers,
 
-            int totalNativeDrivers,
-            int queuedNativeDrivers,
-            int runningNativeDrivers,
-            int completedNativeDrivers,
+            int totalNewDrivers,
+            int queuedNewDrivers,
+            int runningNewDrivers,
+            int completedNewDrivers,
 
             int totalSplits,
             int queuedSplits,
@@ -130,10 +130,10 @@ public BasicStageExecutionStats(
         this.queuedDrivers = queuedDrivers;
         this.runningDrivers = runningDrivers;
         this.completedDrivers = completedDrivers;
-        this.totalNativeDrivers = totalNativeDrivers;
-        this.queuedNativeDrivers = queuedNativeDrivers;
-        this.runningNativeDrivers = runningNativeDrivers;
-        this.completedNativeDrivers = completedNativeDrivers;
+        this.totalNewDrivers = totalNewDrivers;
+        this.queuedNewDrivers = queuedNewDrivers;
+        this.runningNewDrivers = runningNewDrivers;
+        this.completedNewDrivers = completedNewDrivers;
         this.totalSplits = totalSplits;
         this.queuedSplits = queuedSplits;
         this.runningSplits = runningSplits;
@@ -181,24 +181,24 @@ public int getCompletedDrivers()
         return completedDrivers;
     }
 
-    public int getTotalNativeDrivers()
+    public int getTotalNewDrivers()
     {
-        return totalNativeDrivers;
+        return totalNewDrivers;
     }
 
-    public int getQueuedNativeDrivers()
+    public int getQueuedNewDrivers()
     {
-        return queuedNativeDrivers;
+        return queuedNewDrivers;
     }
 
-    public int getRunningNativeDrivers()
+    public int getRunningNewDrivers()
     {
-        return runningNativeDrivers;
+        return runningNewDrivers;
     }
 
-    public int getCompletedNativeDrivers()
+    public int getCompletedNewDrivers()
     {
-        return completedNativeDrivers;
+        return completedNewDrivers;
     }
 
     public int getTotalSplits()
@@ -288,10 +288,10 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
         int runningDrivers = 0;
         int completedDrivers = 0;
 
-        int totalNativeDrivers = 0;
-        int queuedNativeDrivers = 0;
-        int runningNativeDrivers = 0;
-        int completedNativeDrivers = 0;
+        int totalNewDrivers = 0;
+        int queuedNewDrivers = 0;
+        int runningNewDrivers = 0;
+        int completedNewDrivers = 0;
 
         int totalSplits = 0;
         int queuedSplits = 0;
@@ -322,10 +322,10 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
             runningDrivers += stageStats.getRunningDrivers();
             completedDrivers += stageStats.getCompletedDrivers();
 
-            totalNativeDrivers += stageStats.getTotalNativeDrivers();
-            queuedNativeDrivers += stageStats.getQueuedNativeDrivers();
-            runningNativeDrivers += stageStats.getRunningNativeDrivers();
-            completedNativeDrivers += stageStats.getCompletedNativeDrivers();
+            totalNewDrivers += stageStats.getTotalNewDrivers();
+            queuedNewDrivers += stageStats.getQueuedNewDrivers();
+            runningNewDrivers += stageStats.getRunningNewDrivers();
+            completedNewDrivers += stageStats.getCompletedNewDrivers();
 
             totalSplits += stageStats.getTotalSplits();
             queuedSplits += stageStats.getQueuedSplits();
@@ -364,10 +364,10 @@ public static BasicStageExecutionStats aggregateBasicStageStats(Iterable<BasicSt
                 runningDrivers,
                 completedDrivers,
 
-                totalNativeDrivers,
-                queuedNativeDrivers,
-                runningNativeDrivers,
-                completedNativeDrivers,
+                totalNewDrivers,
+                queuedNewDrivers,
+                runningNewDrivers,
+                completedNewDrivers,
 
                 totalSplits,
                 queuedSplits,

presto-main-base/src/main/java/com/facebook/presto/execution/QueryStateMachine.java

@@ -388,10 +388,10 @@ public BasicQueryInfo getBasicQueryInfo(Optional<BasicStageExecutionStats> rootS
                 stageStats.getRunningDrivers(),
                 stageStats.getCompletedDrivers(),
 
-                stageStats.getTotalNativeDrivers(),
-                stageStats.getQueuedNativeDrivers(),
-                stageStats.getRunningNativeDrivers(),
-                stageStats.getCompletedNativeDrivers(),
+                stageStats.getTotalNewDrivers(),
+                stageStats.getQueuedNewDrivers(),
+                stageStats.getRunningNewDrivers(),
+                stageStats.getCompletedNewDrivers(),
 
                 stageStats.getTotalSplits(),
                 stageStats.getQueuedSplits(),
@@ -1312,10 +1312,10 @@ private static QueryStats pruneQueryStats(QueryStats queryStats)
                 queryStats.getRunningDrivers(),
                 queryStats.getBlockedDrivers(),
                 queryStats.getCompletedDrivers(),
-                queryStats.getTotalNativeDrivers(),
-                queryStats.getQueuedNativeDrivers(),
-                queryStats.getRunningNativeDrivers(),
-                queryStats.getCompletedNativeDrivers(),
+                queryStats.getTotalNewDrivers(),
+                queryStats.getQueuedNewDrivers(),
+                queryStats.getRunningNewDrivers(),
+                queryStats.getCompletedNewDrivers(),
                 queryStats.getTotalSplits(),
                 queryStats.getQueuedSplits(),
                 queryStats.getRunningSplits(),

presto-main-base/src/main/java/com/facebook/presto/execution/QueryStats.java

@@ -78,10 +78,10 @@ public class QueryStats
     private final int blockedDrivers;
     private final int completedDrivers;
 
-    private final int totalNativeDrivers;
-    private final int queuedNativeDrivers;
-    private final int runningNativeDrivers;
-    private final int completedNativeDrivers;
+    private final int totalNewDrivers;
+    private final int queuedNewDrivers;
+    private final int runningNewDrivers;
+    private final int completedNewDrivers;
 
     private final int totalSplits;
     private final int queuedSplits;
@@ -162,10 +162,10 @@ public QueryStats(
             int blockedDrivers,
             int completedDrivers,
 
-            int totalNativeDrivers,
-            int queuedNativeDrivers,
-            int runningNativeDrivers,
-            int completedNativeDrivers,
+            int totalNewDrivers,
+            int queuedNewDrivers,
+            int runningNewDrivers,
+            int completedNewDrivers,
 
             int totalSplits,
             int queuedSplits,
@@ -254,14 +254,14 @@ public QueryStats(
         this.blockedDrivers = blockedDrivers;
         checkArgument(completedDrivers >= 0, "completedDrivers is negative");
         this.completedDrivers = completedDrivers;
-        checkArgument(totalNativeDrivers >= 0, "totalNativeDrivers is negative");
-        this.totalNativeDrivers = totalNativeDrivers;
-        checkArgument(queuedNativeDrivers >= 0, "queuedNativeDrivers is negative");
-        this.queuedNativeDrivers = queuedNativeDrivers;
-        checkArgument(runningNativeDrivers >= 0, "runningNativeDrivers is negative");
-        this.runningNativeDrivers = runningNativeDrivers;
-        checkArgument(completedNativeDrivers >= 0, "completedNativeDrivers is negative");
-        this.completedNativeDrivers = completedNativeDrivers;
+        checkArgument(totalNewDrivers >= 0, "totalNewDrivers is negative");
+        this.totalNewDrivers = totalNewDrivers;
+        checkArgument(queuedNewDrivers >= 0, "queuedNewDrivers is negative");
+        this.queuedNewDrivers = queuedNewDrivers;
+        checkArgument(runningNewDrivers >= 0, "runningNewDrivers is negative");
+        this.runningNewDrivers = runningNewDrivers;
+        checkArgument(completedNewDrivers >= 0, "completedNewDrivers is negative");
+        this.completedNewDrivers = completedNewDrivers;
         checkArgument(totalSplits >= 0, "totalSplits is negative");
         this.totalSplits = totalSplits;
         checkArgument(queuedSplits >= 0, "queuedSplits is negative");
@@ -350,10 +350,10 @@ public QueryStats(
             @JsonProperty("blockedDrivers") int blockedDrivers,
             @JsonProperty("completedDrivers") int completedDrivers,
 
-            @JsonProperty("totalNativeDrivers") int totalNativeDrivers,
-            @JsonProperty("queuedNativeDrivers") int queuedNativeDrivers,
-            @JsonProperty("runningNativeDrivers") int runningNativeDrivers,
-            @JsonProperty("completedNativeDrivers") int completedNativeDrivers,
+            @JsonProperty("totalNewDrivers") int totalNewDrivers,
+            @JsonProperty("queuedNewDrivers") int queuedNewDrivers,
+            @JsonProperty("runningNewDrivers") int runningNewDrivers,
+            @JsonProperty("completedNewDrivers") int completedNewDrivers,
 
             @JsonProperty("totalSplits") int totalSplits,
             @JsonProperty("queuedSplits") int queuedSplits,
@@ -432,10 +432,10 @@ public QueryStats(
                 blockedDrivers,
                 completedDrivers,
 
-                totalNativeDrivers,
-                queuedNativeDrivers,
-                runningNativeDrivers,
-                completedNativeDrivers,
+                totalNewDrivers,
+                queuedNewDrivers,
+                runningNewDrivers,
+                completedNewDrivers,
 
                 totalSplits,
                 queuedSplits,
@@ -508,10 +508,10 @@ public static QueryStats create(
         int blockedDrivers = 0;
         int completedDrivers = 0;
 
-        int totalNativeDrivers = 0;
-        int queuedNativeDrivers = 0;
-        int runningNativeDrivers = 0;
-        int completedNativeDrivers = 0;
+        int totalNewDrivers = 0;
+        int queuedNewDrivers = 0;
+        int runningNewDrivers = 0;
+        int completedNewDrivers = 0;
 
         int totalSplits = 0;
         int queuedSplits = 0;
@@ -567,10 +567,10 @@ public static QueryStats create(
             blockedDrivers += stageExecutionStats.getBlockedDrivers();
             completedDrivers += stageExecutionStats.getCompletedDrivers();
 
-            totalNativeDrivers += stageExecutionStats.getTotalNativeDrivers();
-            queuedNativeDrivers += stageExecutionStats.getQueuedNativeDrivers();
-            runningNativeDrivers += stageExecutionStats.getRunningNativeDrivers();
-            completedNativeDrivers += stageExecutionStats.getCompletedNativeDrivers();
+            totalNewDrivers += stageExecutionStats.getTotalNewDrivers();
+            queuedNewDrivers += stageExecutionStats.getQueuedNewDrivers();
+            runningNewDrivers += stageExecutionStats.getRunningNewDrivers();
+            completedNewDrivers += stageExecutionStats.getCompletedNewDrivers();
 
             totalSplits += stageExecutionStats.getTotalSplits();
             queuedSplits += stageExecutionStats.getQueuedSplits();
@@ -676,10 +676,10 @@ else if (operatorType.equals(TableScanOperator.class.getSimpleName()) || operato
                 blockedDrivers,
                 completedDrivers,
 
-                totalNativeDrivers,
-                queuedNativeDrivers,
-                runningNativeDrivers,
-                completedNativeDrivers,
+                totalNewDrivers,
+                queuedNewDrivers,
+                runningNewDrivers,
+                completedNewDrivers,
 
                 totalSplits,
                 queuedSplits,
@@ -973,27 +973,27 @@ public int getCompletedDrivers()
     }
 
     @JsonProperty
-    public int getTotalNativeDrivers()
+    public int getTotalNewDrivers()
     {
-        return totalNativeDrivers;
+        return totalNewDrivers;
     }
 
     @JsonProperty
-    public int getQueuedNativeDrivers()
+    public int getQueuedNewDrivers()
     {
-        return queuedNativeDrivers;
+        return queuedNewDrivers;
     }
 
     @JsonProperty
-    public int getRunningNativeDrivers()
+    public int getRunningNewDrivers()
     {
-        return runningNativeDrivers;
+        return runningNewDrivers;
     }
 
     @JsonProperty
-    public int getCompletedNativeDrivers()
+    public int getCompletedNewDrivers()
     {
-        return completedNativeDrivers;
+        return completedNewDrivers;
     }
 
     @JsonProperty

presto-main-base/src/main/java/com/facebook/presto/execution/StageExecutionInfo.java

@@ -113,10 +113,10 @@ public static StageExecutionInfo create(
                 taskStatsAggregator.blockedDrivers,
                 taskStatsAggregator.completedDrivers,
 
-                taskStatsAggregator.totalNativeDrivers,
-                taskStatsAggregator.queuedNativeDrivers,
-                taskStatsAggregator.runningNativeDrivers,
-                taskStatsAggregator.completedNativeDrivers,
+                taskStatsAggregator.totalNewDrivers,
+                taskStatsAggregator.queuedNewDrivers,
+                taskStatsAggregator.runningNewDrivers,
+                taskStatsAggregator.completedNewDrivers,
 
                 taskStatsAggregator.totalSplits,
                 taskStatsAggregator.queuedSplits,
@@ -256,10 +256,10 @@ private static class TaskStatsAggregator
         private int blockedDrivers;
         private int completedDrivers;
 
-        private int totalNativeDrivers;
-        private int queuedNativeDrivers;
-        private int runningNativeDrivers;
-        private int completedNativeDrivers;
+        private int totalNewDrivers;
+        private int queuedNewDrivers;
+        private int runningNewDrivers;
+        private int completedNewDrivers;
 
         private int totalSplits;
         private int queuedSplits;
@@ -311,10 +311,10 @@ public void processTaskStats(TaskStats taskStats)
             blockedDrivers += taskStats.getBlockedDrivers();
             completedDrivers += taskStats.getCompletedDrivers();
 
-            totalNativeDrivers += taskStats.getTotalNativeDrivers();
-            queuedNativeDrivers += taskStats.getQueuedNativeDrivers();
-            runningNativeDrivers += taskStats.getRunningNativeDrivers();
-            completedNativeDrivers += taskStats.getCompletedNativeDrivers();
+            totalNewDrivers += taskStats.getTotalNewDrivers();
+            queuedNewDrivers += taskStats.getQueuedNewDrivers();
+            runningNewDrivers += taskStats.getRunningNewDrivers();
+            completedNewDrivers += taskStats.getCompletedNewDrivers();
 
             totalSplits += taskStats.getTotalSplits();
             queuedSplits += taskStats.getQueuedSplits();