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 13a2c97bc5 optimize code smell in presto module, (#4332)
13a2c97bc5 is described below
commit 13a2c97bc5d2d9e78ecc4d9b1cb3ba98b2214a85
Author: Bo Xu <[email protected]>
AuthorDate: Sun Oct 1 15:26:32 2023 +0800
optimize code smell in presto module, (#4332)
optimize equal
---
.../java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java | 4 ++--
.../org/apache/carbondata/presto/CarbondataConnectorFactory.java | 2 +-
.../org/apache/carbondata/presto/CarbondataPageSourceProvider.java | 4 ++--
.../org/apache/carbondata/presto/CarbondataConnectorFactory.java | 4 ++--
.../org/apache/carbondata/presto/CarbondataPageSourceProvider.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
index e0c9fb8215..e09e162b72 100755
---
a/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
+++
b/integration/presto/src/main/java/org/apache/carbondata/presto/impl/CarbonLocalInputSplit.java
@@ -138,8 +138,8 @@ public class CarbonLocalInputSplit {
carbonLocalInputSplit.getDeleteDeltaFiles());
inputSplit.setFormat(carbonLocalInputSplit.getFileFormat());
if (FileFormat.COLUMNAR_V3.ordinal() ==
inputSplit.getFileFormat().ordinal()
- && null != carbonLocalInputSplit.detailInfo &&
!carbonLocalInputSplit.detailInfo
- .equalsIgnoreCase("null")) {
+ && null != carbonLocalInputSplit.detailInfo && !"null"
+ .equalsIgnoreCase(carbonLocalInputSplit.detailInfo)) {
GsonBuilder gsonBuilder = new GsonBuilder();
// add typeAdapter for DataType Class for deserialization
gsonBuilder.registerTypeAdapter(DataType.class, new
DataTypeDeserializer());
diff --git
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataConnectorFactory.java
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataConnectorFactory.java
index 12842379e0..78d6589d6b 100755
---
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataConnectorFactory.java
+++
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataConnectorFactory.java
@@ -166,7 +166,7 @@ public class CarbondataConnectorFactory extends
HiveConnectorFactory {
*/
private void setCarbonEnum() throws Exception {
for (HiveStorageFormat format : HiveStorageFormat.values()) {
- if (format.name().equals("CARBON")) {
+ if ("CARBON".equals(format.name())) {
return;
}
}
diff --git
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
index f0e65a0e73..8f57227e50 100644
---
a/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
+++
b/integration/presto/src/main/prestodb/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
@@ -87,8 +87,8 @@ public class CarbondataPageSourceProvider extends
HivePageSourceProvider {
configuration.set(entry.getKey().toString(),
entry.getValue().toString());
}
CarbonTable carbonTable = getCarbonTable(carbonSplit, configuration);
- boolean isDirectVectorFill = carbonTableReader.config.getPushRowFilter()
== null ||
- carbonTableReader.config.getPushRowFilter().equalsIgnoreCase("false");
+ boolean isDirectVectorFill = carbonTableReader.config.getPushRowFilter()
== null || "false"
+ .equalsIgnoreCase(carbonTableReader.config.getPushRowFilter());
return new CarbondataPageSource(
carbonTable, queryId, carbonSplit, columns, configuration,
isDirectVectorFill);
}
diff --git
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataConnectorFactory.java
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataConnectorFactory.java
index 569d79d6d5..803390e990 100755
---
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataConnectorFactory.java
+++
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataConnectorFactory.java
@@ -74,8 +74,8 @@ public class CarbondataConnectorFactory extends
HiveConnectorFactory {
*/
private static void setCarbonEnum() throws Exception {
for (HiveStorageFormat format : HiveStorageFormat.values()) {
- if (format.name().equals("CARBON") ||
format.name().equals("ORG.APACHE.CARBONDATA.FORMAT")
- || format.name().equals("CARBONDATA")) {
+ if ("CARBON".equals(format.name()) ||
"ORG.APACHE.CARBONDATA.FORMAT".equals(format.name())
+ || "CARBONDATA".equals(format.name())) {
return;
}
}
diff --git
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
index ef4fad2eb0..2b07e36afa 100644
---
a/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
+++
b/integration/presto/src/main/prestosql/org/apache/carbondata/presto/CarbondataPageSourceProvider.java
@@ -94,8 +94,8 @@ public class CarbondataPageSourceProvider extends
HivePageSourceProvider {
}
CarbonTable carbonTable = getCarbonTable(carbonSplit, configuration);
boolean isDirectVectorFill =
- carbonTableReader.config.getPushRowFilter() == null ||
carbonTableReader.config
- .getPushRowFilter().equalsIgnoreCase("false");
+ carbonTableReader.config.getPushRowFilter() == null || "false"
+ .equalsIgnoreCase(carbonTableReader.config.getPushRowFilter());
return new CarbondataPageSource(carbonTable, queryId, carbonSplit,
columns, table,
configuration, isDirectVectorFill);
}
