You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2023/04/10 16:21:26 UTC
[carbondata] branch master updated: [ISSUE-4313] Variable should use LowerCamelCase style (#4315)
This is an automated email from the ASF dual-hosted git repository.
chenliang613 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new 44c2bca3a3 [ISSUE-4313] Variable should use LowerCamelCase style (#4315)
44c2bca3a3 is described below
commit 44c2bca3a349a1ba49e0c9ee6951e4b507a6b519
Author: Bo Xu <60...@qq.com>
AuthorDate: Tue Apr 11 00:21:21 2023 +0800
[ISSUE-4313] Variable should use LowerCamelCase style (#4315)
---
.../loading/BadRecordsLoggerProvider.java | 6 +--
.../loading/model/CarbonLoadModelBuilder.java | 58 +++++++++++-----------
.../apache/carbondata/processing/util/Auditor.java | 4 +-
.../processing/util/CarbonDataProcessorUtil.java | 6 +--
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/BadRecordsLoggerProvider.java b/processing/src/main/java/org/apache/carbondata/processing/loading/BadRecordsLoggerProvider.java
index dbc4ff9970..2fe3f73c0b 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/loading/BadRecordsLoggerProvider.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/loading/BadRecordsLoggerProvider.java
@@ -49,13 +49,13 @@ public class BadRecordsLoggerProvider {
boolean badRecordsLoggerEnable = Boolean.parseBoolean(
configuration.getDataLoadProperty(DataLoadProcessorConstants.BAD_RECORDS_LOGGER_ENABLE)
.toString());
- Object bad_records_action =
+ Object badRecordsAction =
configuration.getDataLoadProperty(DataLoadProcessorConstants.BAD_RECORDS_LOGGER_ACTION)
.toString();
- if (null != bad_records_action) {
+ if (null != badRecordsAction) {
LoggerAction loggerAction = null;
try {
- loggerAction = LoggerAction.valueOf(bad_records_action.toString().toUpperCase());
+ loggerAction = LoggerAction.valueOf(badRecordsAction.toString().toUpperCase());
} catch (IllegalArgumentException e) {
loggerAction = LoggerAction.FORCE;
}
diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java
index 199b5dfe5d..36ef3ed7fb 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/loading/model/CarbonLoadModelBuilder.java
@@ -159,34 +159,34 @@ public class CarbonLoadModelBuilder {
CarbonDataLoadSchema dataLoadSchema = new CarbonDataLoadSchema(table);
// Need to fill dimension relation
carbonLoadModel.setCarbonDataLoadSchema(dataLoadSchema);
- String sort_scope = optionsFinal.get("sort_scope");
- String bad_records_logger_enable = optionsFinal.get("bad_records_logger_enable");
- String bad_records_action = optionsFinal.get("bad_records_action");
- String bad_record_path = optionsFinal.get("bad_record_path");
- String global_sort_partitions = optionsFinal.get("global_sort_partitions");
+ String sortScope = optionsFinal.get("sort_scope");
+ String badRecordsLoggerEnable = optionsFinal.get("bad_records_logger_enable");
+ String badRecordsAction = optionsFinal.get("bad_records_action");
+ String badRecordPath = optionsFinal.get("bad_record_path");
+ String globalSortPartitions = optionsFinal.get("global_sort_partitions");
String timestampformat = optionsFinal.get("timestampformat");
String dateFormat = optionsFinal.get("dateformat");
String delimiter = optionsFinal.get("delimiter");
- String complex_delimiter_level1 = optionsFinal.get("complex_delimiter_level_1");
- String complex_delimiter_level2 = optionsFinal.get("complex_delimiter_level_2");
- String complex_delimiter_level3 = optionsFinal.get("complex_delimiter_level_3");
- String complex_delimiter_level4 = optionsFinal.get("complex_delimiter_level_4");
+ String complexDelimiterLevel1 = optionsFinal.get("complex_delimiter_level_1");
+ String complexDelimiterLevel2 = optionsFinal.get("complex_delimiter_level_2");
+ String complexDelimiterLevel3 = optionsFinal.get("complex_delimiter_level_3");
+ String complexDelimiterLevel4 = optionsFinal.get("complex_delimiter_level_4");
validateDateTimeFormat(timestampformat, "TimestampFormat");
validateDateTimeFormat(dateFormat, "DateFormat");
- if (Boolean.parseBoolean(bad_records_logger_enable) ||
- LoggerAction.REDIRECT.name().equalsIgnoreCase(bad_records_action)) {
- if (!StringUtils.isEmpty(bad_record_path)) {
- bad_record_path = CarbonUtil.checkAndAppendHDFSUrl(bad_record_path);
+ if (Boolean.parseBoolean(badRecordsLoggerEnable) ||
+ LoggerAction.REDIRECT.name().equalsIgnoreCase(badRecordsAction)) {
+ if (!StringUtils.isEmpty(badRecordPath)) {
+ badRecordPath = CarbonUtil.checkAndAppendHDFSUrl(badRecordPath);
} else {
throw new InvalidLoadOptionException(
"Cannot redirect bad records as bad record location is not provided.");
}
}
- carbonLoadModel.setBadRecordsLocation(bad_record_path);
+ carbonLoadModel.setBadRecordsLocation(badRecordPath);
- validateGlobalSortPartitions(global_sort_partitions);
+ validateGlobalSortPartitions(globalSortPartitions);
carbonLoadModel.setEscapeChar(checkDefaultValue(optionsFinal.get("escapechar"), "\\"));
carbonLoadModel.setQuoteChar(
CarbonUtil.unescapeChar(checkDefaultValue(optionsFinal.get("quotechar"), "\"")));
@@ -245,10 +245,10 @@ public class CarbonLoadModelBuilder {
optionsFinal.get("serialization_null_format"));
carbonLoadModel.setBadRecordsLoggerEnable(
- TableOptionConstant.BAD_RECORDS_LOGGER_ENABLE.getName() + "," + bad_records_logger_enable);
+ TableOptionConstant.BAD_RECORDS_LOGGER_ENABLE.getName() + "," + badRecordsLoggerEnable);
carbonLoadModel.setBadRecordsAction(
- TableOptionConstant.BAD_RECORDS_ACTION.getName() + "," + bad_records_action.toUpperCase());
+ TableOptionConstant.BAD_RECORDS_ACTION.getName() + "," + badRecordsAction.toUpperCase());
carbonLoadModel.setIsEmptyDataBadRecord(
DataLoadProcessorConstants.IS_EMPTY_DATA_BAD_RECORD + "," +
@@ -256,22 +256,22 @@ public class CarbonLoadModelBuilder {
carbonLoadModel.setSkipEmptyLine(optionsFinal.get("skip_empty_line"));
- carbonLoadModel.setSortScope(sort_scope);
- if (global_sort_partitions == null) {
- global_sort_partitions = table.getGlobalSortPartitions();
+ carbonLoadModel.setSortScope(sortScope);
+ if (globalSortPartitions == null) {
+ globalSortPartitions = table.getGlobalSortPartitions();
}
- carbonLoadModel.setGlobalSortPartitions(global_sort_partitions);
+ carbonLoadModel.setGlobalSortPartitions(globalSortPartitions);
- if (delimiter.equalsIgnoreCase(complex_delimiter_level1) ||
- complex_delimiter_level1.equalsIgnoreCase(complex_delimiter_level2) ||
- delimiter.equalsIgnoreCase(complex_delimiter_level2) ||
- delimiter.equalsIgnoreCase(complex_delimiter_level3)) {
+ if (delimiter.equalsIgnoreCase(complexDelimiterLevel1) ||
+ complexDelimiterLevel1.equalsIgnoreCase(complexDelimiterLevel2) ||
+ delimiter.equalsIgnoreCase(complexDelimiterLevel2) ||
+ delimiter.equalsIgnoreCase(complexDelimiterLevel3)) {
throw new InvalidLoadOptionException("Field Delimiter and Complex types delimiter are same");
} else {
- carbonLoadModel.setComplexDelimiter(complex_delimiter_level1);
- carbonLoadModel.setComplexDelimiter(complex_delimiter_level2);
- carbonLoadModel.setComplexDelimiter(complex_delimiter_level3);
- carbonLoadModel.setComplexDelimiter(complex_delimiter_level4);
+ carbonLoadModel.setComplexDelimiter(complexDelimiterLevel1);
+ carbonLoadModel.setComplexDelimiter(complexDelimiterLevel2);
+ carbonLoadModel.setComplexDelimiter(complexDelimiterLevel3);
+ carbonLoadModel.setComplexDelimiter(complexDelimiterLevel4);
}
carbonLoadModel.setCsvDelimiter(CarbonUtil.unescapeChar(delimiter));
carbonLoadModel.setCsvHeader(fileHeader);
diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/Auditor.java b/processing/src/main/java/org/apache/carbondata/processing/util/Auditor.java
index bd027d4a3c..40303dceee 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/util/Auditor.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/util/Auditor.java
@@ -48,7 +48,7 @@ import org.apache.log4j.Logger;
@InterfaceAudience.Internal
public class Auditor {
private static final Logger LOGGER = Logger.getLogger("carbon.audit");
- private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+ private static final Gson GSON = new GsonBuilder().disableHtmlEscaping().create();
private static String username;
static {
@@ -93,7 +93,7 @@ public class Auditor {
OpEndMessage message = new OpEndMessage(opName, opId, table, opTime,
success ? OpStatus.SUCCESS : OpStatus.FAILED,
extraInfo != null ? extraInfo : new HashMap<String, String>());
- String json = gson.toJson(message);
+ String json = GSON.toJson(message);
LOGGER.log(AuditLevel.AUDIT, json);
}
}
diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
index 2be5729579..cb5b215f62 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
@@ -840,12 +840,12 @@ public final class CarbonDataProcessorUtil {
.toString());
// if logger is disabled then check if action is redirect then raw data will be required.
if (!isRawDataRequired) {
- Object bad_records_action =
+ Object badRecordsAction =
configuration.getDataLoadProperty(DataLoadProcessorConstants.BAD_RECORDS_LOGGER_ACTION);
- if (null != bad_records_action) {
+ if (null != badRecordsAction) {
LoggerAction loggerAction = null;
try {
- loggerAction = LoggerAction.valueOf(bad_records_action.toString().toUpperCase());
+ loggerAction = LoggerAction.valueOf(badRecordsAction.toString().toUpperCase());
} catch (IllegalArgumentException e) {
loggerAction = LoggerAction.FORCE;
}