From def18a5086cac23266dec4e285cc7850ef8ac011 Mon Sep 17 00:00:00 2001 From: SteNicholas Date: Thu, 26 Dec 2019 06:40:25 +0800 Subject: [PATCH] [MINOR] optimize hudi timeline service (#1137) --- .../hudi/timeline/service/FileSystemViewHandler.java | 10 ++++------ .../apache/hudi/timeline/service/TimelineService.java | 2 +- .../timeline/service/handlers/DataFileHandler.java | 2 +- .../timeline/service/handlers/FileSliceHandler.java | 2 +- .../timeline/service/handlers/TimelineHandler.java | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java index 56cfe2362..b202106c7 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/FileSystemViewHandler.java @@ -58,7 +58,6 @@ public class FileSystemViewHandler { private final FileSystemViewManager viewManager; private final Javalin app; - private final Configuration conf; private final TimelineHandler instantHandler; private final FileSliceHandler sliceHandler; private final DataFileHandler dataFileHandler; @@ -66,7 +65,6 @@ public class FileSystemViewHandler { public FileSystemViewHandler(Javalin app, Configuration conf, FileSystemViewManager viewManager) throws IOException { this.viewManager = viewManager; this.app = app; - this.conf = conf; this.instantHandler = new TimelineHandler(conf, viewManager); this.sliceHandler = new FileSliceHandler(conf, viewManager); this.dataFileHandler = new DataFileHandler(conf, viewManager); @@ -94,7 +92,7 @@ public class FileSystemViewHandler { } if ((localTimeline.getInstants().count() == 0) - && lastKnownInstantFromClient.equals(HoodieTimeline.INVALID_INSTANT_TS)) { + && HoodieTimeline.INVALID_INSTANT_TS.equals(lastKnownInstantFromClient)) { return false; } @@ -131,7 +129,7 @@ public class FileSystemViewHandler { } private void writeValueAsString(Context ctx, Object obj) throws JsonProcessingException { - boolean prettyPrint = ctx.queryParam("pretty") != null ? true : false; + boolean prettyPrint = ctx.queryParam("pretty") != null; long beginJsonTs = System.currentTimeMillis(); String result = prettyPrint ? OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(obj) : OBJECT_MAPPER.writeValueAsString(obj); @@ -267,7 +265,7 @@ public class FileSystemViewHandler { ctx.validatedQueryParam(RemoteHoodieTableFileSystemView.BASEPATH_PARAM).getOrThrow(), ctx.validatedQueryParam(RemoteHoodieTableFileSystemView.PARTITION_PARAM).getOrThrow(), ctx.validatedQueryParam(RemoteHoodieTableFileSystemView.MAX_INSTANT_PARAM).getOrThrow(), - Boolean.valueOf( + Boolean.parseBoolean( ctx.validatedQueryParam(RemoteHoodieTableFileSystemView.INCLUDE_FILES_IN_PENDING_COMPACTION_PARAM) .getOrThrow())); writeValueAsString(ctx, dtos); @@ -294,7 +292,7 @@ public class FileSystemViewHandler { } private static boolean isRefreshCheckDisabledInQuery(Context ctxt) { - return Boolean.valueOf(ctxt.queryParam(RemoteHoodieTableFileSystemView.REFRESH_OFF)); + return Boolean.parseBoolean(ctxt.queryParam(RemoteHoodieTableFileSystemView.REFRESH_OFF)); } /** diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java index b62591ac5..9ea576ea1 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/TimelineService.java @@ -74,7 +74,7 @@ public class TimelineService { @Parameter(names = {"--server-port", "-p"}, description = " Server Port") public Integer serverPort = 26754; - @Parameter(names = {"--view-storage", "-st"}, description = "View Storage Type. Defaut - SPILLABLE_DISK") + @Parameter(names = {"--view-storage", "-st"}, description = "View Storage Type. Default - SPILLABLE_DISK") public FileSystemViewStorageType viewStorageType = FileSystemViewStorageType.SPILLABLE_DISK; @Parameter(names = {"--max-view-mem-per-table", "-mv"}, diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/DataFileHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/DataFileHandler.java index d18c20ba8..39a667ad1 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/DataFileHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/DataFileHandler.java @@ -45,7 +45,7 @@ public class DataFileHandler extends Handler { public List getLatestDataFile(String basePath, String partitionPath, String fileId) { return viewManager.getFileSystemView(basePath).getLatestDataFile(partitionPath, fileId) - .map(DataFileDTO::fromHoodieDataFile).map(dto -> Arrays.asList(dto)).orElse(new ArrayList<>()); + .map(DataFileDTO::fromHoodieDataFile).map(Arrays::asList).orElse(new ArrayList<>()); } public List getLatestDataFiles(String basePath) { diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/FileSliceHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/FileSliceHandler.java index 7cca939cf..022d17039 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/FileSliceHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/FileSliceHandler.java @@ -75,7 +75,7 @@ public class FileSliceHandler extends Handler { public List getLatestFileSlice(String basePath, String partitionPath, String fileId) { return viewManager.getFileSystemView(basePath).getLatestFileSlice(partitionPath, fileId) - .map(FileSliceDTO::fromFileSlice).map(dto -> Arrays.asList(dto)).orElse(new ArrayList<>()); + .map(FileSliceDTO::fromFileSlice).map(Arrays::asList).orElse(new ArrayList<>()); } public List getPendingCompactionOperations(String basePath) { diff --git a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/TimelineHandler.java b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/TimelineHandler.java index 75f53a0fb..208e70dbc 100644 --- a/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/TimelineHandler.java +++ b/hudi-timeline-service/src/main/java/org/apache/hudi/timeline/service/handlers/TimelineHandler.java @@ -40,7 +40,7 @@ public class TimelineHandler extends Handler { public List getLastInstant(String basePath) { return viewManager.getFileSystemView(basePath).getLastInstant().map(InstantDTO::fromInstant) - .map(dto -> Arrays.asList(dto)).orElse(new ArrayList<>()); + .map(Arrays::asList).orElse(new ArrayList<>()); } public TimelineDTO getTimeline(String basePath) {