From 1260d64c43d801286375894aacf2ef1eed17c7d9 Mon Sep 17 00:00:00 2001
From: MariamAlmesfer <Mariamalmesfer22@gmail.com>
Date: Mon, 30 Sep 2024 17:28:58 +0300
Subject: [PATCH 1/4]   Upgraded jackson-core to 2.15.4

---
 pom.xml                 | 53 +++++++++++++++++++++++++++++++++++++++--
 presto-bigquery/pom.xml |  1 +
 presto-hive/pom.xml     | 13 ++++++++++
 presto-hudi/pom.xml     |  1 -
 presto-iceberg/pom.xml  |  1 -
 5 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a2dc8d37c01e4..c079959e752a6 100644
--- a/pom.xml
+++ b/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>
@@ -211,7 +211,7 @@
                 <artifactId>netty-handler</artifactId>
                 <version>4.1.107.Final</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>com.facebook.presto</groupId>
                 <artifactId>presto-testing-docker</artifactId>
@@ -791,12 +791,48 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jdk8</artifactId>
+                <version>${dep.jackson.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.fasterxml.jackson.module</groupId>
                 <artifactId>jackson-module-afterburner</artifactId>
                 <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.dataformat</groupId>
+                <artifactId>jackson-dataformat-smile</artifactId>
+                <version>${dep.jackson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</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>
@@ -1782,6 +1818,10 @@
                         <groupId>joda-time</groupId>
                         <artifactId>joda-time</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.fasterxml.jackson.core</groupId>
+                        <artifactId>jackson-databind</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -2366,6 +2406,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>
@@ -2390,6 +2438,7 @@
                         <ignoredClassPatterns combine.children="append">
                             <!-- Duplicate class is being brought in by commons-io & log4j-api -->
                             <ignoredClassPattern>META-INF.versions.9.module-info</ignoredClassPattern>
+                            <ignoredClassPattern>module-info</ignoredClassPattern>
                         </ignoredClassPatterns>
                     </configuration>
                 </plugin>
diff --git a/presto-bigquery/pom.xml b/presto-bigquery/pom.xml
index 2af6770914fe6..7c09837be4142 100644
--- a/presto-bigquery/pom.xml
+++ b/presto-bigquery/pom.xml
@@ -358,6 +358,7 @@
                                 <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
                                 <exclude>javax.annotation:javax.annotation-api</exclude>
                                 <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
+                                <exclude>com.google.api.grpc:proto-google-common-protos</exclude>
                             </excludes>
                         </requireUpperBoundDeps>
                     </rules>
diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml
index 8a756083122a9..5c3d8c1c23e2d 100644
--- a/presto-hive/pom.xml
+++ b/presto-hive/pom.xml
@@ -199,6 +199,19 @@
             <artifactId>joda-time</artifactId>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.fasterxml.jackson.datatype</groupId>-->
+<!--            <artifactId>jackson-datatype-jdk8</artifactId>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-cbor</artifactId>
+            <version>2.15.4</version>
+            <scope>runtime</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-core</artifactId>
diff --git a/presto-hudi/pom.xml b/presto-hudi/pom.xml
index a8206b4fdd5b6..4cc363a9f6e4c 100644
--- a/presto-hudi/pom.xml
+++ b/presto-hudi/pom.xml
@@ -217,7 +217,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.10.2</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml
index 9287d6640631e..7372a8956f93f 100644
--- a/presto-iceberg/pom.xml
+++ b/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>
 

From d2f6aa0c5aee070638ab21fa1d34f9a3da6d8471 Mon Sep 17 00:00:00 2001
From: Mariam AlMesfer <65206318+Mariamalmesfer@users.noreply.github.com>
Date: Wed, 13 Nov 2024 23:46:24 +0300
Subject: [PATCH 2/4] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ad583ff90b98..fe6d3fe446db8 100644
--- a/pom.xml
+++ b/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.15.4</dep.jackson.version>
+        <dep.jackson.version>2.17.2</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>

From e01ce5002891800f0d72ba373daa08728068d835 Mon Sep 17 00:00:00 2001
From: Mariam AlMesfer <65206318+Mariamalmesfer@users.noreply.github.com>
Date: Mon, 25 Nov 2024 12:58:21 +0300
Subject: [PATCH 3/4] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5c664bb8b0a3b..5b17d6d86c8eb 100644
--- a/pom.xml
+++ b/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.17.2</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.4</dep.avro.version>
         <dep.commons.compress.version>1.26.2</dep.commons.compress.version>

From 3fdb61d6c5901d87c9bf66195f5776e9b8c74e82 Mon Sep 17 00:00:00 2001
From: Mariam Almesfer <mariamalmesfer22@gamil.com>
Date: Wed, 27 Nov 2024 18:24:21 +0300
Subject: [PATCH 4/4] Temp

---
 .../presto/spi/MaterializedViewDefinition.java         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/MaterializedViewDefinition.java b/presto-spi/src/main/java/com/facebook/presto/spi/MaterializedViewDefinition.java
index b5762854f7276..4304c4877dd50 100644
--- a/presto-spi/src/main/java/com/facebook/presto/spi/MaterializedViewDefinition.java
+++ b/presto-spi/src/main/java/com/facebook/presto/spi/MaterializedViewDefinition.java
@@ -243,11 +243,15 @@ public static final class TableColumn
         public TableColumn(
                 @JsonProperty("tableName") SchemaTableName tableName,
                 @JsonProperty("columnName") String columnName,
-                @JsonProperty("isDirectMapped") Optional<Boolean> isDirectMapped)
+                @JsonProperty("isDirectMapped") Optional<Boolean> isDirectMapped,
+                @JsonProperty("directMapped") Optional<Boolean> backportDirectMapped)
         {
             this.tableName = requireNonNull(tableName, "tableName is null");
             this.columnName = requireNonNull(columnName, "columnName is null");
-            this.isDirectMapped = requireNonNull(isDirectMapped, "isDirectMapped is null");
+            if (isDirectMapped.isPresent())
+                this.isDirectMapped = requireNonNull(isDirectMapped, "isDirectMapped is null");
+            else
+                this.isDirectMapped = requireNonNull(backportDirectMapped, "isDirectMapped is null");
         }
 
         public TableColumn(
@@ -255,7 +259,7 @@ public TableColumn(
                 String columnName,
                 boolean isDirectMapped)
         {
-            this(tableName, columnName, Optional.of(isDirectMapped));
+            this(tableName, columnName, Optional.of(isDirectMapped), Optional.of(isDirectMapped));
         }
 
         @JsonProperty