lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-444] Refactor the codes based on scala codestyle ReturnChecker rule (#1121)

Browse Source
This commit is contained in:
lamber-ken
2019-12-24 07:05:54 +08:00
committed by leesf
parent b284091783
commit 313fab5fd1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hudi-cli/src/main/scala/org/apache/hudi/cli/DedupeSparkJob.scala
View File

@@ -60,7 +60,7 @@ class DedupeSparkJob(basePath: String,
group by `${HoodieRecord.RECORD_KEY_METADATA_FIELD}` group by `${HoodieRecord.RECORD_KEY_METADATA_FIELD}`
having dupe_cnt > 1 having dupe_cnt > 1
""" """
return sqlContext.sql(dupeSql) sqlContext.sql(dupeSql)
} }
@@ -122,7 +122,7 @@ class DedupeSparkJob(basePath: String,
} }
}) })
}) })
return fileToDeleteKeyMap fileToDeleteKeyMap
} }

4
hudi-spark/src/main/scala/org/apache/hudi/HoodieSparkSqlWriter.scala
View File

@@ -113,7 +113,7 @@ private[hudi] object HoodieSparkSqlWriter {
} }
if (mode == SaveMode.Ignore && exists) { if (mode == SaveMode.Ignore && exists) {
log.warn(s"hoodie dataset at $basePath already exists. Ignoring & not performing actual writes.") log.warn(s"hoodie dataset at $basePath already exists. Ignoring & not performing actual writes.")
return (true, common.util.Option.empty()) (true, common.util.Option.empty())
} }
if (mode == SaveMode.Overwrite && exists) { if (mode == SaveMode.Overwrite && exists) {
log.warn(s"hoodie dataset at $basePath already exists. Deleting existing data & overwriting with new data.") log.warn(s"hoodie dataset at $basePath already exists. Deleting existing data & overwriting with new data.")
@@ -144,7 +144,7 @@ private[hudi] object HoodieSparkSqlWriter {
if (hoodieRecords.isEmpty()) { if (hoodieRecords.isEmpty()) {
log.info("new batch has no new records, skipping...") log.info("new batch has no new records, skipping...")
return (true, common.util.Option.empty()) (true, common.util.Option.empty())
} }
client.startCommitWithTime(commitTime) client.startCommitWithTime(commitTime)
writeStatuses = DataSourceUtils.doWriteOperation(client, hoodieRecords, commitTime, operation) writeStatuses = DataSourceUtils.doWriteOperation(client, hoodieRecords, commitTime, operation)

2
style/scalastyle.xml
View File

@@ -72,7 +72,7 @@
</check> </check>
<check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"/> <check level="error" class="org.scalastyle.scalariform.NoWhitespaceBeforeLeftBracketChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"/> <check level="error" class="org.scalastyle.scalariform.NoWhitespaceAfterLeftBracketChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="false"/> <check level="error" class="org.scalastyle.scalariform.ReturnChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.NullChecker" enabled="false"/> <check level="error" class="org.scalastyle.scalariform.NullChecker" enabled="false"/>
<check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"/> <check level="error" class="org.scalastyle.scalariform.NoCloneChecker" enabled="true"/>
<check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"/> <check level="error" class="org.scalastyle.scalariform.NoFinalizeChecker" enabled="true"/>