Update pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java

walterddr · Jackie-Jiang · web-flow · commit 5540a33c6a2c · 2022-02-17T17:56:28.000-08:00
Co-authored-by: Xiaotian (Jackie) Jiang &lt;17555551+Jackie-Jiang@users.noreply.github.com&gt;
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/SegmentDeletionManager.java
@@ -330,7 +330,8 @@ private long getDeletionTimeMsFromFile(String targetFile, long lastModifiedTime)
     return lastModifiedTime + _defaultDeletedSegmentsRetentionMs;
   }
 
-  private static @Nullable Long getRetentionMsFromTableConfig(@Nullable TableConfig tableConfig) {
+  @Nullable
+  private static Long getRetentionMsFromTableConfig(@Nullable TableConfig tableConfig) {
     if (tableConfig != null) {
       SegmentsValidationAndRetentionConfig validationConfig = tableConfig.getValidationConfig();
       if (!StringUtils.isEmpty(validationConfig.getDeletedSegmentsRetentionPeriod())) {

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,8 @@ private long getDeletionTimeMsFromFile(String targetFile, long lastModifiedTime)`
`330`	`330`	`return lastModifiedTime + _defaultDeletedSegmentsRetentionMs;`
`331`	`331`	`}`
`332`	`332`
`333`		`- private static @Nullable Long getRetentionMsFromTableConfig(@Nullable TableConfig tableConfig) {`
	`333`	`+ @Nullable`
	`334`	`+ private static Long getRetentionMsFromTableConfig(@Nullable TableConfig tableConfig) {`
`334`	`335`	`if (tableConfig != null) {`
`335`	`336`	`SegmentsValidationAndRetentionConfig validationConfig = tableConfig.getValidationConfig();`
`336`	`337`	`if (!StringUtils.isEmpty(validationConfig.getDeletedSegmentsRetentionPeriod())) {`