From 688279f1a62c41fd36fed863e36ac9bc569c4769 Mon Sep 17 00:00:00 2001 From: fengli Date: Sat, 4 Dec 2021 13:56:25 +0800 Subject: [PATCH 1/3] [HUDI-2934] Optimize RequestHandler code style --- .../hudi/timeline/service/RequestHandler.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java index c4edc18554701..e4d9a47c45a14 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/RequestHandler.java @@ -500,14 +500,14 @@ public void handle(@NotNull Context context) throws Exception { if (refreshCheck) { long beginFinalCheck = System.currentTimeMillis(); - String errMsg = - "Last known instant from client was " - + context.queryParam(RemoteHoodieTableFileSystemView.LAST_INSTANT_TS, - HoodieTimeline.INVALID_INSTANT_TS) - + " but server has the following timeline " - + viewManager.getFileSystemView(context.queryParam(RemoteHoodieTableFileSystemView.BASEPATH_PARAM)) - .getTimeline().getInstants().collect(Collectors.toList()); if (isLocalViewBehind(context)) { + String errMsg = + "Last known instant from client was " + + context.queryParam(RemoteHoodieTableFileSystemView.LAST_INSTANT_TS, + HoodieTimeline.INVALID_INSTANT_TS) + + " but server has the following timeline " + + viewManager.getFileSystemView(context.queryParam(RemoteHoodieTableFileSystemView.BASEPATH_PARAM)) + .getTimeline().getInstants().collect(Collectors.toList()); throw new BadRequestResponse(errMsg); } long endFinalCheck = System.currentTimeMillis(); From 16371f921523739ee7b61b19166cd43402122771 Mon Sep 17 00:00:00 2001 From: fengli Date: Sat, 4 Dec 2021 14:12:16 +0800 Subject: [PATCH 2/3] Improve QueryBasedDDLExecutor annotation --- .../java/org/apache/hudi/hive/ddl/QueryBasedDDLExecutor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/ddl/QueryBasedDDLExecutor.java b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/ddl/QueryBasedDDLExecutor.java index 6fbcfa93752e0..aed2bbedd45b1 100644 --- a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/ddl/QueryBasedDDLExecutor.java +++ b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/ddl/QueryBasedDDLExecutor.java @@ -39,8 +39,9 @@ import java.util.Map; import static org.apache.hudi.hive.util.HiveSchemaUtil.HIVE_ESCAPE_CHARACTER; -/* -This class adds functionality for all query based DDLExecutors. The classes extending it only have to provide runSQL(sql) functions. + +/** + * This class adds functionality for all query based DDLExecutors. The classes extending it only have to provide runSQL(sql) functions. */ public abstract class QueryBasedDDLExecutor implements DDLExecutor { private static final Logger LOG = LogManager.getLogger(QueryBasedDDLExecutor.class); From 628a7f884323559ea27bd5b71c567673d7523c16 Mon Sep 17 00:00:00 2001 From: fengli Date: Sat, 4 Dec 2021 14:17:28 +0800 Subject: [PATCH 3/3] Improve SchemaDifference code style --- .../src/main/java/org/apache/hudi/hive/SchemaDifference.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java index e207b85f88259..f48208a439fd6 100644 --- a/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java +++ b/hudi-sync/hudi-hive-sync/src/main/java/org/apache/hudi/hive/SchemaDifference.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.StringJoiner; - /** * Represents the schema difference between the storage schema and hive table schema. */