This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 82e70bd9a4d [Chore](dependency)Upgrade some dependencies of FE #31667
(#31714)
82e70bd9a4d is described below
commit 82e70bd9a4d4b6263f4ca870dcc74affa9c9bdec
Author: Calvin Kirs <[email protected]>
AuthorDate: Mon Mar 4 14:18:51 2024 +0800
[Chore](dependency)Upgrade some dependencies of FE #31667 (#31714)
cherry pick #31667
---
.../catalog/metastore/AWSGlueDecoratorBase.java | 78 +++++++++++++++++++++-
fe/pom.xml | 32 ++++++++-
2 files changed, 107 insertions(+), 3 deletions(-)
diff --git
a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
index 027dec347a9..c2eeff4f1f4 100644
---
a/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
+++
b/fe/fe-core/src/main/java/com/amazonaws/glue/catalog/metastore/AWSGlueDecoratorBase.java
@@ -48,6 +48,8 @@ import com.amazonaws.services.glue.model.BatchGetJobsRequest;
import com.amazonaws.services.glue.model.BatchGetJobsResult;
import com.amazonaws.services.glue.model.BatchGetPartitionRequest;
import com.amazonaws.services.glue.model.BatchGetPartitionResult;
+import com.amazonaws.services.glue.model.BatchGetTableOptimizerRequest;
+import com.amazonaws.services.glue.model.BatchGetTableOptimizerResult;
import com.amazonaws.services.glue.model.BatchGetTriggersRequest;
import com.amazonaws.services.glue.model.BatchGetTriggersResult;
import com.amazonaws.services.glue.model.BatchGetWorkflowsRequest;
@@ -100,6 +102,8 @@ import
com.amazonaws.services.glue.model.CreateSecurityConfigurationRequest;
import com.amazonaws.services.glue.model.CreateSecurityConfigurationResult;
import com.amazonaws.services.glue.model.CreateSessionRequest;
import com.amazonaws.services.glue.model.CreateSessionResult;
+import com.amazonaws.services.glue.model.CreateTableOptimizerRequest;
+import com.amazonaws.services.glue.model.CreateTableOptimizerResult;
import com.amazonaws.services.glue.model.CreateTableRequest;
import com.amazonaws.services.glue.model.CreateTableResult;
import com.amazonaws.services.glue.model.CreateTriggerRequest;
@@ -148,6 +152,8 @@ import
com.amazonaws.services.glue.model.DeleteSecurityConfigurationRequest;
import com.amazonaws.services.glue.model.DeleteSecurityConfigurationResult;
import com.amazonaws.services.glue.model.DeleteSessionRequest;
import com.amazonaws.services.glue.model.DeleteSessionResult;
+import com.amazonaws.services.glue.model.DeleteTableOptimizerRequest;
+import com.amazonaws.services.glue.model.DeleteTableOptimizerResult;
import com.amazonaws.services.glue.model.DeleteTableRequest;
import com.amazonaws.services.glue.model.DeleteTableResult;
import com.amazonaws.services.glue.model.DeleteTableVersionRequest;
@@ -170,6 +176,10 @@ import
com.amazonaws.services.glue.model.GetClassifierRequest;
import com.amazonaws.services.glue.model.GetClassifierResult;
import com.amazonaws.services.glue.model.GetClassifiersRequest;
import com.amazonaws.services.glue.model.GetClassifiersResult;
+import com.amazonaws.services.glue.model.GetColumnStatisticsTaskRunRequest;
+import com.amazonaws.services.glue.model.GetColumnStatisticsTaskRunResult;
+import com.amazonaws.services.glue.model.GetColumnStatisticsTaskRunsRequest;
+import com.amazonaws.services.glue.model.GetColumnStatisticsTaskRunsResult;
import com.amazonaws.services.glue.model.GetConnectionRequest;
import com.amazonaws.services.glue.model.GetColumnStatisticsForPartitionResult;
import
com.amazonaws.services.glue.model.GetColumnStatisticsForPartitionRequest;
@@ -256,6 +266,8 @@ import com.amazonaws.services.glue.model.GetSessionRequest;
import com.amazonaws.services.glue.model.GetSessionResult;
import com.amazonaws.services.glue.model.GetStatementRequest;
import com.amazonaws.services.glue.model.GetStatementResult;
+import com.amazonaws.services.glue.model.GetTableOptimizerRequest;
+import com.amazonaws.services.glue.model.GetTableOptimizerResult;
import com.amazonaws.services.glue.model.GetTableRequest;
import com.amazonaws.services.glue.model.GetTableResult;
import com.amazonaws.services.glue.model.GetTableVersionRequest;
@@ -292,6 +304,8 @@ import
com.amazonaws.services.glue.model.ImportCatalogToGlueRequest;
import com.amazonaws.services.glue.model.ImportCatalogToGlueResult;
import com.amazonaws.services.glue.model.ListBlueprintsRequest;
import com.amazonaws.services.glue.model.ListBlueprintsResult;
+import com.amazonaws.services.glue.model.ListColumnStatisticsTaskRunsRequest;
+import com.amazonaws.services.glue.model.ListColumnStatisticsTaskRunsResult;
import com.amazonaws.services.glue.model.ListCrawlersRequest;
import com.amazonaws.services.glue.model.ListCrawlersResult;
import com.amazonaws.services.glue.model.ListCrawlsRequest;
@@ -322,6 +336,8 @@ import
com.amazonaws.services.glue.model.ListSessionsRequest;
import com.amazonaws.services.glue.model.ListSessionsResult;
import com.amazonaws.services.glue.model.ListStatementsRequest;
import com.amazonaws.services.glue.model.ListStatementsResult;
+import com.amazonaws.services.glue.model.ListTableOptimizerRunsRequest;
+import com.amazonaws.services.glue.model.ListTableOptimizerRunsResult;
import com.amazonaws.services.glue.model.ListTriggersRequest;
import com.amazonaws.services.glue.model.ListTriggersResult;
import com.amazonaws.services.glue.model.ListWorkflowsRequest;
@@ -350,6 +366,8 @@ import
com.amazonaws.services.glue.model.SearchTablesRequest;
import com.amazonaws.services.glue.model.SearchTablesResult;
import com.amazonaws.services.glue.model.StartBlueprintRunRequest;
import com.amazonaws.services.glue.model.StartBlueprintRunResult;
+import com.amazonaws.services.glue.model.StartColumnStatisticsTaskRunRequest;
+import com.amazonaws.services.glue.model.StartColumnStatisticsTaskRunResult;
import com.amazonaws.services.glue.model.StartCrawlerRequest;
import com.amazonaws.services.glue.model.StartCrawlerResult;
import com.amazonaws.services.glue.model.StartCrawlerScheduleRequest;
@@ -372,6 +390,8 @@ import
com.amazonaws.services.glue.model.StartTriggerRequest;
import com.amazonaws.services.glue.model.StartTriggerResult;
import com.amazonaws.services.glue.model.StartWorkflowRunRequest;
import com.amazonaws.services.glue.model.StartWorkflowRunResult;
+import com.amazonaws.services.glue.model.StopColumnStatisticsTaskRunRequest;
+import com.amazonaws.services.glue.model.StopColumnStatisticsTaskRunResult;
import com.amazonaws.services.glue.model.StopCrawlerRequest;
import com.amazonaws.services.glue.model.StopCrawlerResult;
import com.amazonaws.services.glue.model.StopCrawlerScheduleRequest;
@@ -420,6 +440,8 @@ import
com.amazonaws.services.glue.model.UpdateSchemaRequest;
import com.amazonaws.services.glue.model.UpdateSchemaResult;
import com.amazonaws.services.glue.model.UpdateSourceControlFromJobRequest;
import com.amazonaws.services.glue.model.UpdateSourceControlFromJobResult;
+import com.amazonaws.services.glue.model.UpdateTableOptimizerRequest;
+import com.amazonaws.services.glue.model.UpdateTableOptimizerResult;
import com.amazonaws.services.glue.model.UpdateTableRequest;
import com.amazonaws.services.glue.model.UpdateTableResult;
import com.amazonaws.services.glue.model.UpdateTriggerRequest;
@@ -495,6 +517,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.batchGetPartition(batchGetPartitionRequest);
}
+ @Override
+ public BatchGetTableOptimizerResult
batchGetTableOptimizer(BatchGetTableOptimizerRequest
batchGetTableOptimizerRequest) {
+ return null;
+ }
+
@Override
public BatchGetTriggersResult batchGetTriggers(BatchGetTriggersRequest
batchGetTriggersRequest) {
return decoratedAwsGlue.batchGetTriggers(batchGetTriggersRequest);
@@ -615,6 +642,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.createTable(createTableRequest);
}
+ @Override
+ public CreateTableOptimizerResult
createTableOptimizer(CreateTableOptimizerRequest createTableOptimizerRequest) {
+ return null;
+ }
+
@Override
public CreateTriggerResult createTrigger(CreateTriggerRequest
createTriggerRequest) {
return decoratedAwsGlue.createTrigger(createTriggerRequest);
@@ -720,6 +752,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.deleteTable(deleteTableRequest);
}
+ @Override
+ public DeleteTableOptimizerResult
deleteTableOptimizer(DeleteTableOptimizerRequest deleteTableOptimizerRequest) {
+ return null;
+ }
+
@Override
public DeleteTableVersionResult
deleteTableVersion(DeleteTableVersionRequest deleteTableVersionRequest) {
return decoratedAwsGlue.deleteTableVersion(deleteTableVersionRequest);
@@ -955,6 +992,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.getTable(getTableRequest);
}
+ @Override
+ public GetTableOptimizerResult getTableOptimizer(GetTableOptimizerRequest
getTableOptimizerRequest) {
+ return null;
+ }
+
@Override
public GetTableVersionResult getTableVersion(GetTableVersionRequest
getTableVersionRequest) {
return decoratedAwsGlue.getTableVersion(getTableVersionRequest);
@@ -1040,6 +1082,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.listBlueprints(listBlueprintsRequest);
}
+ @Override
+ public ListColumnStatisticsTaskRunsResult
listColumnStatisticsTaskRuns(ListColumnStatisticsTaskRunsRequest
listColumnStatisticsTaskRunsRequest) {
+ return null;
+ }
+
@Override
public ListCrawlersResult listCrawlers(ListCrawlersRequest
listCrawlersRequest) {
return decoratedAwsGlue.listCrawlers(listCrawlersRequest);
@@ -1095,6 +1142,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.listStatements(listStatementsRequest);
}
+ @Override
+ public ListTableOptimizerRunsResult
listTableOptimizerRuns(ListTableOptimizerRunsRequest
listTableOptimizerRunsRequest) {
+ return null;
+ }
+
@Override
public ListTriggersResult listTriggers(ListTriggersRequest
listTriggersRequest) {
return decoratedAwsGlue.listTriggers(listTriggersRequest);
@@ -1155,6 +1207,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.startBlueprintRun(startBlueprintRunRequest);
}
+ @Override
+ public StartColumnStatisticsTaskRunResult
startColumnStatisticsTaskRun(StartColumnStatisticsTaskRunRequest
startColumnStatisticsTaskRunRequest) {
+ return null;
+ }
+
@Override
public StartCrawlerResult startCrawler(StartCrawlerRequest
startCrawlerRequest) {
return decoratedAwsGlue.startCrawler(startCrawlerRequest);
@@ -1200,6 +1257,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.startWorkflowRun(startWorkflowRunRequest);
}
+ @Override
+ public StopColumnStatisticsTaskRunResult
stopColumnStatisticsTaskRun(StopColumnStatisticsTaskRunRequest
stopColumnStatisticsTaskRunRequest) {
+ return null;
+ }
+
@Override
public StopCrawlerResult stopCrawler(StopCrawlerRequest
stopCrawlerRequest) {
return decoratedAwsGlue.stopCrawler(stopCrawlerRequest);
@@ -1300,6 +1362,11 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return decoratedAwsGlue.updateTable(updateTableRequest);
}
+ @Override
+ public UpdateTableOptimizerResult
updateTableOptimizer(UpdateTableOptimizerRequest updateTableOptimizerRequest) {
+ return null;
+ }
+
@Override
public UpdateTriggerResult updateTrigger(UpdateTriggerRequest
updateTriggerRequest) {
return decoratedAwsGlue.updateTrigger(updateTriggerRequest);
@@ -1356,6 +1423,16 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return
decoratedAwsGlue.getColumnStatisticsForTable(getColumnStatisticsForTableRequest);
}
+ @Override
+ public GetColumnStatisticsTaskRunResult
getColumnStatisticsTaskRun(GetColumnStatisticsTaskRunRequest
getColumnStatisticsTaskRunRequest) {
+ return null;
+ }
+
+ @Override
+ public GetColumnStatisticsTaskRunsResult
getColumnStatisticsTaskRuns(GetColumnStatisticsTaskRunsRequest
getColumnStatisticsTaskRunsRequest) {
+ return null;
+ }
+
@Override
public GetColumnStatisticsForPartitionResult
getColumnStatisticsForPartition(GetColumnStatisticsForPartitionRequest
getColumnStatisticsForPartitionRequest) {
return
decoratedAwsGlue.getColumnStatisticsForPartition(getColumnStatisticsForPartitionRequest);
@@ -1466,4 +1543,3 @@ public class AWSGlueDecoratorBase implements AWSGlue {
return null;
}
}
-
diff --git a/fe/pom.xml b/fe/pom.xml
index 51a9644a76c..b03aa1ba7cf 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -321,7 +321,7 @@ under the License.
<hamcrest.version>2.1</hamcrest.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
- <aws-java-sdk.version>1.12.519</aws-java-sdk.version>
+ <aws-java-sdk.version>1.12.669</aws-java-sdk.version>
<mariadb-java-client.version>3.0.4</mariadb-java-client.version>
<dlf-metastore-client-hive.version>0.2.14</dlf-metastore-client-hive.version>
<hadoop.version>3.3.6</hadoop.version>
@@ -869,6 +869,22 @@ under the License.
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty-all.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-sctp</artifactId>
+ <version>${netty-all.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
+ <version>${netty-all.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <classifier>linux-x86_64</classifier>
+ <version>${netty-all.version}</version>
+ </dependency>
<!-- velocity-engine-core dependency-->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -889,9 +905,21 @@ under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.elasticsearch.client</groupId>
-
<artifactId>elasticsearch-rest-high-level-client</artifactId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.elasticsearch.plugin</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.elasticsearch</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<!--ranger audit only depends on aws logs, which is
provided alone-->
<exclusion>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
