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 6e031c04ec [ISSUE-4305] Optimize the constants and variable style
(#4311)
6e031c04ec is described below
commit 6e031c04eca48e4d2e9aaeba7fcee7629fbd05b6
Author: Bo Xu <[email protected]>
AuthorDate: Mon Jun 26 21:37:03 2023 +0800
[ISSUE-4305] Optimize the constants and variable style (#4311)
CONSTANTS should be like: UPPER_NAME;
variable should be lowerCamelCase
---
.../java/org/apache/carbondata/sdk/file/CarbonIUD.java | 14 +++++++-------
.../org/apache/carbondata/sdk/file/CarbonSchemaReader.java | 4 ++--
.../main/java/org/apache/carbondata/sdk/file/TestUtil.java | 3 ---
.../apache/carbondata/sdk/file/arrow/ArrowConverter.java | 2 +-
.../org/apache/carbondata/sdk/file/arrow/ArrowUtils.java | 2 +-
.../org/apache/carbondata/sdk/file/arrow/ArrowWriter.java | 2 +-
.../apache/carbondata/sdk/file/ArrowCarbonReaderTest.java | 7 ++++---
7 files changed, 16 insertions(+), 18 deletions(-)
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonIUD.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonIUD.java
index 1a35f143f6..3681b5d6e5 100644
--- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonIUD.java
+++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonIUD.java
@@ -132,9 +132,9 @@ public class CarbonIUD {
if (!StringUtils.isEmpty(path)) {
path = path + CarbonCommonConstants.FILE_SEPARATOR +
CarbonCommonConstants.CARBON_SDK_EMPTY_METADATA_PATH;
- CarbonFile emptySDKDirectory = FileFactory.getCarbonFile(path);
- if (!emptySDKDirectory.exists()) {
- emptySDKDirectory.mkdirs();
+ CarbonFile emptySdkDirectory = FileFactory.getCarbonFile(path);
+ if (!emptySdkDirectory.exists()) {
+ emptySdkDirectory.mkdirs();
}
}
}
@@ -317,14 +317,14 @@ public class CarbonIUD {
new EqualToExpression(new ColumnExpression(column.getKey(),
dataType),
new LiteralExpression(value, dataType)));
}
- Expression OrFilterExpression = null;
+ Expression orFilterExpression = null;
if (listOfOrExpressions.size() > 0) {
- OrFilterExpression = listOfOrExpressions.get(0);
+ orFilterExpression = listOfOrExpressions.get(0);
}
for (int i = 1; i < listOfOrExpressions.size(); i++) {
- OrFilterExpression = new OrExpression(OrFilterExpression,
listOfOrExpressions.get(i));
+ orFilterExpression = new OrExpression(orFilterExpression,
listOfOrExpressions.get(i));
}
- listOfExpressions.add(OrFilterExpression);
+ listOfExpressions.add(orFilterExpression);
}
Expression filterExpression = null;
if (listOfExpressions.size() > 0) {
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
index 10fa4cf067..f2d594ba24 100644
---
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
+++
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonSchemaReader.java
@@ -375,9 +375,9 @@ public class CarbonSchemaReader {
private static Schema readSchemaFromIndexFile(String indexFilePath,
Configuration conf) {
IndexHeader readIndexHeader =
SegmentIndexFileStore.readIndexHeader(indexFilePath, conf);
List<ColumnSchema> columnSchemaList = new ArrayList<ColumnSchema>();
- List<org.apache.carbondata.format.ColumnSchema> table_columns =
+ List<org.apache.carbondata.format.ColumnSchema> tableColumns =
readIndexHeader.getTable_columns();
- for (org.apache.carbondata.format.ColumnSchema columnSchema :
table_columns) {
+ for (org.apache.carbondata.format.ColumnSchema columnSchema :
tableColumns) {
if (!(columnSchema.column_name.contains("."))) {
columnSchemaList.add(thriftColumnSchemaToWrapperColumnSchema(columnSchema));
}
diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
index a4279b4706..bf0c67ddb1 100644
--- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
+++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/TestUtil.java
@@ -34,13 +34,10 @@ import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.generic.GenericDatumWriter;
import org.apache.avro.io.DecoderFactory;
import org.apache.avro.io.JsonDecoder;
-import org.apache.hadoop.conf.Configuration;
@InterfaceAudience.Developer("Test")
public class TestUtil {
- public static final Configuration configuration = new Configuration();
-
public static GenericData.Record jsonToAvro(String json, String avroSchema)
throws IOException {
InputStream input = null;
DataFileWriter writer = null;
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
index 268d06b12b..d037e02cce 100644
---
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
+++
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowConverter.java
@@ -44,7 +44,7 @@ public class ArrowConverter {
public ArrowConverter(Schema schema, int initialSize) {
this.arrowSchema = ArrowUtils.toArrowSchema(schema,
TimeZone.getDefault().getID());
this.allocator =
- ArrowUtils.rootAllocator.newChildAllocator("toArrowBuffer",
initialSize, Long.MAX_VALUE);
+ ArrowUtils.ROOT_ALLOCATOR.newChildAllocator("toArrowBuffer",
initialSize, Long.MAX_VALUE);
this.root = VectorSchemaRoot.create(arrowSchema, allocator);
this.arrowWriter = ArrowWriter.create(root);
// currently blocklet level read and set initial value to 32 MB.
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
index 1f1cae76be..559297528c 100644
--- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
+++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowUtils.java
@@ -38,7 +38,7 @@ import org.apache.arrow.vector.types.pojo.FieldType;
public class ArrowUtils {
- public static final RootAllocator rootAllocator = new
RootAllocator(Long.MAX_VALUE);
+ public static final RootAllocator ROOT_ALLOCATOR = new
RootAllocator(Long.MAX_VALUE);
public static ArrowType toArrowType(DataType carbonDataType, String
timeZoneId) {
if (carbonDataType == DataTypes.STRING || carbonDataType ==
DataTypes.VARCHAR
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
index 1800164433..224028e18f 100644
---
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
+++
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowWriter.java
@@ -82,7 +82,7 @@ public class ArrowWriter {
public static ArrowWriter create(Schema schema, String timeZoneId) {
org.apache.arrow.vector.types.pojo.Schema arrowSchema =
ArrowUtils.toArrowSchema(schema, timeZoneId);
- VectorSchemaRoot root = VectorSchemaRoot.create(arrowSchema,
ArrowUtils.rootAllocator);
+ VectorSchemaRoot root = VectorSchemaRoot.create(arrowSchema,
ArrowUtils.ROOT_ALLOCATOR);
return create(root);
}
diff --git
a/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
index 5b85f0f690..9f55bfa84e 100644
---
a/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
+++
b/sdk/sdk/src/test/java/org/apache/carbondata/sdk/file/ArrowCarbonReaderTest.java
@@ -101,7 +101,8 @@ public class ArrowCarbonReaderTest extends TestCase {
CarbonReader.builder(path,
"_temp").withRowRecordReader().buildArrowReader();
Schema carbonSchema = CarbonSchemaReader.readSchema(path);
byte[] data = reader.readArrowBatch(carbonSchema);
- BufferAllocator bufferAllocator =
ArrowUtils.rootAllocator.newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
+ BufferAllocator bufferAllocator = ArrowUtils.ROOT_ALLOCATOR
+ .newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
ArrowRecordBatch arrowRecordBatch =
ArrowConverter.byteArrayToArrowBatch(data, bufferAllocator);
VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot
@@ -142,7 +143,7 @@ public class ArrowCarbonReaderTest extends TestCase {
int length = CarbonUnsafe.getUnsafe().getInt(address);
byte[] data1 = new byte[length];
CarbonUnsafe.getUnsafe().copyMemory(null, address + 4 , data1,
CarbonUnsafe.BYTE_ARRAY_OFFSET, length);
- bufferAllocator =
ArrowUtils.rootAllocator.newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
+ bufferAllocator =
ArrowUtils.ROOT_ALLOCATOR.newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
arrowRecordBatch =
ArrowConverter.byteArrayToArrowBatch(data1, bufferAllocator);
vectorSchemaRoot = VectorSchemaRoot
@@ -189,7 +190,7 @@ public class ArrowCarbonReaderTest extends TestCase {
// Read arrowSchema
byte[] schema = CarbonSchemaReader.getArrowSchemaAsBytes(path);
- bufferAllocator =
ArrowUtils.rootAllocator.newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
+ bufferAllocator =
ArrowUtils.ROOT_ALLOCATOR.newChildAllocator("toArrowBuffer", 0, Long.MAX_VALUE);
arrowRecordBatch =
ArrowConverter.byteArrayToArrowBatch(schema, bufferAllocator);
vectorSchemaRoot = VectorSchemaRoot
