Upgraded jakcson-core to 2.15.4

pom.xml

@@ -77,7 +77,7 @@
         <dep.ratis.version>2.2.0</dep.ratis.version>
         <dep.errorprone.version>2.18.0</dep.errorprone.version>
         <dep.guava.version>32.1.0-jre</dep.guava.version>
-        <dep.jackson.version>2.11.0</dep.jackson.version>
+        <dep.jackson.version>2.15.4</dep.jackson.version>
         <dep.j2objc.version>2.8</dep.j2objc.version>
         <dep.avro.version>1.11.3</dep.avro.version>
         <dep.commons.compress.version>1.23.0</dep.commons.compress.version>
@@ -204,6 +204,12 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>4.1.107.Final</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.facebook.presto</groupId>
                 <artifactId>presto-testing-docker</artifactId>
@@ -771,6 +777,24 @@
                 <version>${dep.jackson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${dep.jackson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${dep.jackson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${dep.jackson.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
@@ -2340,6 +2364,14 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codehaus.mojo</groupId>
+                            <artifactId>extra-enforcer-rules</artifactId>
+                            <version>1.6.2</version>
+                        </dependency>
+                    </dependencies>
                     <configuration>
                         <rules>
                             <requireUpperBoundDeps>
@@ -2351,6 +2383,7 @@
                                     <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude>
                                     <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
                                     <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
+                                    <exclude>com.google.api.grpc:proto-google-common-protos</exclude>
                                 </excludes>
                             </requireUpperBoundDeps>
                         </rules>
@@ -2394,6 +2427,26 @@
         </pluginManagement>
 
         <plugins>
+
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <ignoredClassPatterns combine.children="append">
+                        <ignoredClassPattern>module-info</ignoredClassPattern>
+                        <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
+                    </ignoredClassPatterns>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>com.facebook.presto</groupId>
                 <artifactId>presto-maven-plugin</artifactId>

presto-cassandra/pom.xml

@@ -185,17 +185,6 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <!-- This is to fix the upper bound issues arising out of different components-->
-        <dependencies>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-handler</artifactId>
-                <version>4.1.107.Final</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>

presto-iceberg/pom.xml

@@ -459,7 +459,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.10.2</version>
             <scope>provided</scope>
         </dependency>
 

presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergDistributedQueries.java

@@ -66,12 +66,6 @@ protected boolean supportsNotNullColumns()
         return false;
     }
 
-    @Override
-    public void testRenameTable()
-    {
-        // Rename table are not supported by the connector
-    }
-
     @Override
     public void testUpdate()
     {

presto-iceberg/src/test/java/com/facebook/presto/iceberg/hadoop/TestIcebergHadoopCatalogDistributedQueries.java

@@ -29,4 +29,10 @@ protected boolean supportsViews()
     {
         return false;
     }
+
+    @Override
+    public void testRenameTable()
+    {
+        // Rename table are not supported by hadoop catalog
+    }
 }

presto-iceberg/src/test/java/com/facebook/presto/iceberg/hive/TestIcebergHiveCatalogDistributedQueries.java

@@ -28,4 +28,10 @@ public TestIcebergHiveCatalogDistributedQueries()
     {
         super(HIVE, ImmutableMap.of("iceberg.hive-statistics-merge-strategy", Joiner.on(",").join(NUMBER_OF_DISTINCT_VALUES.name(), TOTAL_SIZE_IN_BYTES.name())));
     }
+
+    @Override
+    public void testRenameTable()
+    {
+        // Rename table are not supported by hive catalog
+    }
 }

presto-main/src/main/java/com/facebook/presto/operator/OperatorContext.java

@@ -63,6 +63,8 @@ public class OperatorContext
     private final DriverContext driverContext;
     private final Executor executor;
 
+    private final OperationTiming isBlockedTiming = new OperationTiming();
+
     private final CounterStat rawInputDataSize = new CounterStat();
     private final CounterStat rawInputPositions = new CounterStat();
 
@@ -536,6 +538,11 @@ public OperatorStats getOperatorStats()
 
                 1,
 
+                isBlockedTiming.getCalls(),
+                succinctNanos(isBlockedTiming.getWallNanos()),
+                succinctNanos(isBlockedTiming.getCpuNanos()),
+                succinctBytes(isBlockedTiming.getAllocationBytes()),
+
                 addInputTiming.getCalls(),
                 succinctNanos(addInputTiming.getWallNanos()),
                 succinctNanos(addInputTiming.getCpuNanos()),

presto-main/src/main/java/com/facebook/presto/operator/OperatorStats.java

@@ -50,6 +50,11 @@ public class OperatorStats
 
     private final long totalDrivers;
 
+    private final long isBlockedCalls;
+    private final Duration isBlockedWall;
+    private final Duration isBlockedCpu;
+    private final DataSize isBlockedAllocation;
+
     private final long addInputCalls;
     private final Duration addInputWall;
     private final Duration addInputCpu;
@@ -113,6 +118,11 @@ public OperatorStats(
 
             @JsonProperty("totalDrivers") long totalDrivers,
 
+            @JsonProperty("isBlockedCalls") long isBlockedCalls,
+            @JsonProperty("isBlockedWall") Duration isBlockedWall,
+            @JsonProperty("isBlockedCpu") Duration isBlockedCpu,
+            @JsonProperty("isBlockedAllocation") DataSize isBlockedAllocation,
+
             @JsonProperty("addInputCalls") long addInputCalls,
             @JsonProperty("addInputWall") Duration addInputWall,
             @JsonProperty("addInputCpu") Duration addInputCpu,
@@ -171,6 +181,11 @@ public OperatorStats(
 
         this.totalDrivers = totalDrivers;
 
+        this.isBlockedCalls = isBlockedCalls;
+        this.isBlockedWall = requireNonNull(isBlockedWall, "isBlockedWall is null");
+        this.isBlockedCpu = requireNonNull(isBlockedCpu, "isBlockedCpu is null");
+        this.isBlockedAllocation = requireNonNull(isBlockedAllocation, "isBlockedAllocation is null");
+
         this.addInputCalls = addInputCalls;
         this.addInputWall = requireNonNull(addInputWall, "addInputWall is null");
         this.addInputCpu = requireNonNull(addInputCpu, "addInputCpu is null");
@@ -235,6 +250,11 @@ public OperatorStats(
 
             long totalDrivers,
 
+            long isBlockedCalls,
+            Duration isBlockedWall,
+            Duration isBlockedCpu,
+            DataSize isBlockedAllocation,
+
             long addInputCalls,
             Duration addInputWall,
             Duration addInputCpu,
@@ -293,6 +313,11 @@ public OperatorStats(
 
         this.totalDrivers = totalDrivers;
 
+        this.isBlockedCalls = isBlockedCalls;
+        this.isBlockedWall = requireNonNull(isBlockedWall, "isBlockedWall is null");
+        this.isBlockedCpu = requireNonNull(isBlockedCpu, "isBlockedCpu is null");
+        this.isBlockedAllocation = requireNonNull(isBlockedAllocation, "isBlockedAllocation is null");
+
         this.addInputCalls = addInputCalls;
         this.addInputWall = requireNonNull(addInputWall, "addInputWall is null");
         this.addInputCpu = requireNonNull(addInputCpu, "addInputCpu is null");
@@ -663,6 +688,34 @@ public DynamicFilterStats getDynamicFilterStats()
         return dynamicFilterStats;
     }
 
+    @JsonProperty
+    @ThriftField(45)
+    public long getIsBlockedCalls()
+    {
+        return isBlockedCalls;
+    }
+
+    @JsonProperty
+    @ThriftField(46)
+    public Duration getIsBlockedWall()
+    {
+        return isBlockedWall;
+    }
+
+    @JsonProperty
+    @ThriftField(47)
+    public Duration getIsBlockedCpu()
+    {
+        return isBlockedCpu;
+    }
+
+    @JsonProperty
+    @ThriftField(48)
+    public DataSize getIsBlockedAllocation()
+    {
+        return isBlockedAllocation;
+    }
+
     public OperatorStats add(OperatorStats operatorStats)
     {
         return add(ImmutableList.of(operatorStats));
@@ -672,6 +725,11 @@ public OperatorStats add(Iterable<OperatorStats> operators)
     {
         long totalDrivers = this.totalDrivers;
 
+        long isBlockedCalls = this.isBlockedCalls;
+        long isBlockedWall = this.isBlockedWall.roundTo(NANOSECONDS);
+        long isBlockedCpu = this.isBlockedCpu.roundTo(NANOSECONDS);
+        long isBlockedAllocation = this.isBlockedAllocation.toBytes();
+
         long addInputCalls = this.addInputCalls;
         long addInputWall = this.addInputWall.roundTo(NANOSECONDS);
         long addInputCpu = this.addInputCpu.roundTo(NANOSECONDS);
@@ -724,6 +782,11 @@ public OperatorStats add(Iterable<OperatorStats> operators)
 
             totalDrivers += operator.totalDrivers;
 
+            isBlockedCalls += operator.getGetOutputCalls();
+            isBlockedWall += operator.getGetOutputWall().roundTo(NANOSECONDS);
+            isBlockedCpu += operator.getGetOutputCpu().roundTo(NANOSECONDS);
+            isBlockedAllocation += operator.getIsBlockedAllocation().toBytes();
+
             addInputCalls += operator.getAddInputCalls();
             addInputWall += operator.getAddInputWall().roundTo(NANOSECONDS);
             addInputCpu += operator.getAddInputCpu().roundTo(NANOSECONDS);
@@ -789,6 +852,11 @@ public OperatorStats add(Iterable<OperatorStats> operators)
 
                 totalDrivers,
 
+                isBlockedCalls,
+                succinctNanos(isBlockedWall),
+                succinctNanos(isBlockedCpu),
+                succinctBytes(isBlockedAllocation),
+
                 addInputCalls,
                 succinctNanos(addInputWall),
                 succinctNanos(addInputCpu),
@@ -866,6 +934,10 @@ public OperatorStats summarize()
                 planNodeId,
                 operatorType,
                 totalDrivers,
+                isBlockedCalls,
+                isBlockedWall,
+                isBlockedCpu,
+                isBlockedAllocation,
                 addInputCalls,
                 addInputWall,
                 addInputCpu,

presto-main/src/main/java/com/facebook/presto/server/TaskResourceUtils.java

@@ -217,6 +217,10 @@ private static OperatorStats convertToThriftOperatorStats(OperatorStats operator
                 operatorStats.getPlanNodeId(),
                 operatorStats.getOperatorType(),
                 operatorStats.getTotalDrivers(),
+                operatorStats.getIsBlockedCalls(),
+                operatorStats.getIsBlockedWall(),
+                operatorStats.getIsBlockedCpu(),
+                operatorStats.getIsBlockedAllocation(),
                 operatorStats.getAddInputCalls(),
                 operatorStats.getAddInputWall(),
                 operatorStats.getAddInputCpu(),
@@ -452,6 +456,10 @@ private static OperatorStats convertFromThriftOperatorStats(OperatorStats thrift
                 thriftOperatorStats.getPlanNodeId(),
                 thriftOperatorStats.getOperatorType(),
                 thriftOperatorStats.getTotalDrivers(),
+                thriftOperatorStats.getIsBlockedCalls(),
+                thriftOperatorStats.getIsBlockedWall(),
+                thriftOperatorStats.getIsBlockedCpu(),
+                thriftOperatorStats.getIsBlockedAllocation(),
                 thriftOperatorStats.getAddInputCalls(),
                 thriftOperatorStats.getAddInputWall(),
                 thriftOperatorStats.getAddInputCpu(),

presto-main/src/test/java/com/facebook/presto/execution/TestQueryStats.java

@@ -68,6 +68,10 @@ public class TestQueryStats
                     new PlanNodeId("13"),
                     TableWriterOperator.class.getSimpleName(),
                     14L,
+                    14L,
+                    new Duration(15, NANOSECONDS),
+                    new Duration(16, NANOSECONDS),
+                    new DataSize(121, BYTE),
                     15L,
                     new Duration(16, NANOSECONDS),
                     new Duration(17, NANOSECONDS),
@@ -113,6 +117,10 @@ public class TestQueryStats
                     new PlanNodeId("23"),
                     FilterAndProjectOperator.class.getSimpleName(),
                     24L,
+                    24L,
+                    new Duration(25, NANOSECONDS),
+                    new Duration(26, NANOSECONDS),
+                    new DataSize(1210, BYTE),
                     25L,
                     new Duration(26, NANOSECONDS),
                     new Duration(27, NANOSECONDS),
@@ -158,6 +166,10 @@ public class TestQueryStats
                     new PlanNodeId("33"),
                     TableWriterOperator.class.getSimpleName(),
                     34L,
+                    34L,
+                    new Duration(35, NANOSECONDS),
+                    new Duration(36, NANOSECONDS),
+                    new DataSize(12100, BYTE),
                     35L,
                     new Duration(36, NANOSECONDS),
                     new Duration(37, NANOSECONDS),
@@ -527,6 +539,10 @@ private static OperatorStats createOperatorStats(int stageId, int stageExecution
                 new Duration(0, NANOSECONDS),
                 new Duration(0, NANOSECONDS),
                 new DataSize(0, BYTE),
+                0L,
+                new Duration(0, NANOSECONDS),
+                new Duration(0, NANOSECONDS),
+                new DataSize(0, BYTE),
                 rawInputDataSize,
                 rawInputPositions,
                 inputDataSize,