You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2018/10/29 06:37:38 UTC
carbondata git commit: [CARBONDATA-3002] Fix some spell error
Repository: carbondata
Updated Branches:
refs/heads/master 46d7595f4 -> 9d468f0c7
[CARBONDATA-3002] Fix some spell error
This closes #2865
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/9d468f0c
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/9d468f0c
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/9d468f0c
Branch: refs/heads/master
Commit: 9d468f0c783ec06c1bcdcfeeacbc1a5695e0e001
Parents: 46d7595
Author: xubo245 <xu...@huawei.com>
Authored: Sat Oct 27 17:47:11 2018 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Mon Oct 29 14:37:14 2018 +0800
----------------------------------------------------------------------
.../filesystem/AbstractDFSCarbonFile.java | 4 +-
.../datastore/filesystem/AlluxioCarbonFile.java | 4 +-
.../core/datastore/filesystem/CarbonFile.java | 4 +-
.../datastore/filesystem/HDFSCarbonFile.java | 6 +--
.../datastore/filesystem/LocalCarbonFile.java | 14 +++----
.../core/datastore/filesystem/S3CarbonFile.java | 6 +--
.../datastore/filesystem/ViewFSCarbonFile.java | 6 +--
.../core/datastore/impl/DFSFileReaderImpl.java | 12 +++---
.../core/datastore/impl/FileReaderImpl.java | 40 ++++++++++----------
.../blockletindex/SegmentIndexFileStore.java | 2 +-
.../executor/impl/AbstractQueryExecutor.java | 10 ++---
.../carbondata/core/util/CarbonProperty.java | 2 +-
.../apache/carbondata/core/util/CarbonUtil.java | 4 +-
.../filesystem/LocalCarbonFileTest.java | 2 +-
.../carbondata/core/util/CarbonUtilTest.java | 8 ++--
.../carbondata/spark/rdd/CarbonMergerRDD.scala | 6 +--
.../org/apache/spark/util/PartitionUtils.scala | 2 +-
.../loading/sort/unsafe/UnsafeSortDataRows.java | 2 +-
.../processing/merger/CarbonCompactionUtil.java | 4 +-
19 files changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
index d03aaf8..24efb70 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java
@@ -146,12 +146,12 @@ public abstract class AbstractDFSCarbonFile implements CarbonFile {
return fileStatus.getLen();
}
- public boolean renameTo(String changetoName) {
+ public boolean renameTo(String changeToName) {
FileSystem fs;
try {
if (null != fileStatus) {
fs = fileStatus.getPath().getFileSystem(hadoopConf);
- return fs.rename(fileStatus.getPath(), new Path(changetoName));
+ return fs.rename(fileStatus.getPath(), new Path(changeToName));
}
} catch (IOException e) {
LOGGER.error("Exception occurred:" + e.getMessage());
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java
index 03fc353..587f094 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java
@@ -91,12 +91,12 @@ public class AlluxioCarbonFile extends AbstractDFSCarbonFile {
}
@Override
- public boolean renameForce(String changetoName) {
+ public boolean renameForce(String changeToName) {
FileSystem fs;
try {
fs = fileStatus.getPath().getFileSystem(FileFactory.getConfiguration());
if (fs instanceof DistributedFileSystem) {
- ((DistributedFileSystem) fs).rename(fileStatus.getPath(), new Path(changetoName),
+ ((DistributedFileSystem) fs).rename(fileStatus.getPath(), new Path(changeToName),
org.apache.hadoop.fs.Options.Rename.OVERWRITE);
return true;
} else {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/CarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/CarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/CarbonFile.java
index abfed37..bc8e707 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/CarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/CarbonFile.java
@@ -58,9 +58,9 @@ public interface CarbonFile {
long getSize();
- boolean renameTo(String changetoName);
+ boolean renameTo(String changeToName);
- boolean renameForce(String changetoName);
+ boolean renameForce(String changeToName);
boolean delete();
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java
index a0cc462..35b0f0f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java
@@ -99,16 +99,16 @@ public class HDFSCarbonFile extends AbstractDFSCarbonFile {
}
@Override
- public boolean renameForce(String changetoName) {
+ public boolean renameForce(String changeToName) {
FileSystem fs;
try {
fs = fileStatus.getPath().getFileSystem(hadoopConf);
if (fs instanceof DistributedFileSystem) {
- ((DistributedFileSystem) fs).rename(fileStatus.getPath(), new Path(changetoName),
+ ((DistributedFileSystem) fs).rename(fileStatus.getPath(), new Path(changeToName),
org.apache.hadoop.fs.Options.Rename.OVERWRITE);
return true;
} else {
- return fs.rename(fileStatus.getPath(), new Path(changetoName));
+ return fs.rename(fileStatus.getPath(), new Path(changeToName));
}
} catch (IOException e) {
LOGGER.error("Exception occured: " + e.getMessage());
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
index e026b27..edcd38f 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java
@@ -135,9 +135,9 @@ public class LocalCarbonFile implements CarbonFile {
return file.length();
}
- public boolean renameTo(String changetoName) {
- changetoName = FileFactory.getUpdatedFilePath(changetoName, FileFactory.FileType.LOCAL);
- return file.renameTo(new File(changetoName));
+ public boolean renameTo(String changeToName) {
+ changeToName = FileFactory.getUpdatedFilePath(changeToName, FileFactory.FileType.LOCAL);
+ return file.renameTo(new File(changeToName));
}
public boolean delete() {
@@ -253,14 +253,14 @@ public class LocalCarbonFile implements CarbonFile {
}
- @Override public boolean renameForce(String changetoName) {
- File destFile = new File(changetoName);
+ @Override public boolean renameForce(String changeToName) {
+ File destFile = new File(changeToName);
if (destFile.exists() && !file.getAbsolutePath().equals(destFile.getAbsolutePath())) {
if (destFile.delete()) {
- return file.renameTo(new File(changetoName));
+ return file.renameTo(new File(changeToName));
}
}
- return file.renameTo(new File(changetoName));
+ return file.renameTo(new File(changeToName));
}
@Override public DataOutputStream getDataOutputStream(String path, FileFactory.FileType fileType,
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
index c23ba69..f1f9fd2 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java
@@ -59,12 +59,12 @@ public class S3CarbonFile extends HDFSCarbonFile {
Refer CARBONDATA-2670 for tracking this.
*/
@Override
- public boolean renameForce(String changetoName) {
+ public boolean renameForce(String changeToName) {
FileSystem fs;
try {
- deleteFile(changetoName, FileFactory.getFileType(changetoName));
+ deleteFile(changeToName, FileFactory.getFileType(changeToName));
fs = fileStatus.getPath().getFileSystem(hadoopConf);
- return fs.rename(fileStatus.getPath(), new Path(changetoName));
+ return fs.rename(fileStatus.getPath(), new Path(changeToName));
} catch (IOException e) {
LOGGER.error("Exception occured: " + e.getMessage());
return false;
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
index b86b139..84a5abd 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java
@@ -89,13 +89,13 @@ public class ViewFSCarbonFile extends AbstractDFSCarbonFile {
}
@Override
- public boolean renameForce(String changetoName) {
+ public boolean renameForce(String changeToName) {
FileSystem fs;
try {
fs = fileStatus.getPath().getFileSystem(FileFactory.getConfiguration());
if (fs instanceof ViewFileSystem) {
- fs.delete(new Path(changetoName), true);
- fs.rename(fileStatus.getPath(), new Path(changetoName));
+ fs.delete(new Path(changeToName), true);
+ fs.rename(fileStatus.getPath(), new Path(changeToName));
return true;
} else {
return false;
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
index e86fa12..0138dcf 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DFSFileReaderImpl.java
@@ -80,10 +80,10 @@ public class DFSFileReaderImpl implements FileReader {
* @return byte buffer
*/
private byte[] read(FSDataInputStream channel, int size, long offset) throws IOException {
- byte[] byteBffer = new byte[size];
+ byte[] byteBuffer = new byte[size];
channel.seek(offset);
- channel.readFully(byteBffer);
- return byteBffer;
+ channel.readFully(byteBuffer);
+ return byteBuffer;
}
/**
@@ -94,9 +94,9 @@ public class DFSFileReaderImpl implements FileReader {
* @return byte buffer
*/
private byte[] read(FSDataInputStream channel, int size) throws IOException {
- byte[] byteBffer = new byte[size];
- channel.readFully(byteBffer);
- return byteBffer;
+ byte[] byteBuffer = new byte[size];
+ channel.readFully(byteBuffer);
+ return byteBuffer;
}
@Override public int readInt(String filePath, long offset) throws IOException {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
index 9f0abd9..0c1b2b0 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileReaderImpl.java
@@ -62,8 +62,8 @@ public class FileReaderImpl implements FileReader {
@Override public byte[] readByteArray(String filePath, long offset, int length)
throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, length, offset);
- return byteBffer.array();
+ ByteBuffer byteBuffer = read(fileChannel, length, offset);
+ return byteBuffer.array();
}
/**
@@ -89,8 +89,8 @@ public class FileReaderImpl implements FileReader {
*/
@Override public int readInt(String filePath, long offset) throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE, offset);
- return byteBffer.getInt();
+ ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE, offset);
+ return byteBuffer.getInt();
}
/**
@@ -102,8 +102,8 @@ public class FileReaderImpl implements FileReader {
*/
@Override public int readInt(String filePath) throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE);
- return byteBffer.getInt();
+ ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.INT_SIZE_IN_BYTE);
+ return byteBuffer.getInt();
}
/**
@@ -116,8 +116,8 @@ public class FileReaderImpl implements FileReader {
*/
@Override public long readDouble(String filePath, long offset) throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
- return byteBffer.getLong();
+ ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
+ return byteBuffer.getLong();
}
/**
@@ -147,11 +147,11 @@ public class FileReaderImpl implements FileReader {
* @return byte buffer
*/
private ByteBuffer read(FileChannel channel, int size, long offset) throws IOException {
- ByteBuffer byteBffer = ByteBuffer.allocate(size);
+ ByteBuffer byteBuffer = ByteBuffer.allocate(size);
channel.position(offset);
- channel.read(byteBffer);
- byteBffer.rewind();
- return byteBffer;
+ channel.read(byteBuffer);
+ byteBuffer.rewind();
+ return byteBuffer;
}
/**
@@ -162,10 +162,10 @@ public class FileReaderImpl implements FileReader {
* @return byte buffer
*/
private ByteBuffer read(FileChannel channel, int size) throws IOException {
- ByteBuffer byteBffer = ByteBuffer.allocate(size);
- channel.read(byteBffer);
- byteBffer.rewind();
- return byteBffer;
+ ByteBuffer byteBuffer = ByteBuffer.allocate(size);
+ channel.read(byteBuffer);
+ byteBuffer.rewind();
+ return byteBuffer;
}
@@ -178,8 +178,8 @@ public class FileReaderImpl implements FileReader {
*/
@Override public byte[] readByteArray(String filePath, int length) throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, length);
- return byteBffer.array();
+ ByteBuffer byteBuffer = read(fileChannel, length);
+ return byteBuffer.array();
}
/**
@@ -192,8 +192,8 @@ public class FileReaderImpl implements FileReader {
*/
@Override public long readLong(String filePath, long offset) throws IOException {
FileChannel fileChannel = updateCache(filePath);
- ByteBuffer byteBffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
- return byteBffer.getLong();
+ ByteBuffer byteBuffer = read(fileChannel, CarbonCommonConstants.LONG_SIZE_IN_BYTE, offset);
+ return byteBuffer.getLong();
}
@Override public ByteBuffer readByteBuffer(String filePath, long offset, int length)
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
index 909d79f..ae5be68 100644
--- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java
@@ -505,7 +505,7 @@ public class SegmentIndexFileStore {
private List<BlockletInfo> getBlockletInfoFromIndexInfo(TableBlockInfo blockInfo)
throws IOException {
long startTime = System.currentTimeMillis();
- DataFileFooter carbondataFileFooter = CarbonUtil.readMetadatFile(blockInfo);
+ DataFileFooter carbondataFileFooter = CarbonUtil.readMetadataFile(blockInfo);
LOGGER.info(
"Time taken to read carbondata file footer to get blocklet info " + blockInfo.getFilePath()
+ " is " + (System.currentTimeMillis() - startTime));
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
index fed0faf..2bd243b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java
@@ -138,7 +138,7 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> {
queryStatistic
.addStatistics(QueryStatisticsConstants.LOAD_BLOCKS_EXECUTOR, System.currentTimeMillis());
queryProperties.queryStatisticsRecorder.recordStatistics(queryStatistic);
- // calculating the total number of aggeragted columns
+ // calculating the total number of aggregated columns
int measureCount = queryModel.getProjectionMeasures().size();
int currentIndex = 0;
@@ -213,10 +213,10 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> {
DataFileFooter fileFooter = filePathToFileFooterMapping.get(blockInfo.getFilePath());
if (null == fileFooter) {
blockInfo.setDetailInfo(null);
- fileFooter = CarbonUtil.readMetadatFile(blockInfo);
- // In case of non transactional table just set columnuniqueid as columnName to support
- // backward compatabiity. non transactional tables column uniqueid is always equal to
- // columnname
+ fileFooter = CarbonUtil.readMetadataFile(blockInfo);
+ // In case of non transactional table just set columnUniqueId as columnName to support
+ // backward compatibility. non transactional tables column uniqueId is always equal to
+ // columnName
if (!queryModel.getTable().isTransactionalTable()) {
QueryUtil.updateColumnUniqueIdForNonTransactionTable(fileFooter.getColumnInTable());
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/util/CarbonProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperty.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperty.java
index 2970a89..6d453a6 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperty.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperty.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
/**
- * CarbonProperty Anotation
+ * CarbonProperty annotation
*/
@Retention(RetentionPolicy.RUNTIME)
public @interface CarbonProperty {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
index 77ad96d..f401a97 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java
@@ -936,7 +936,7 @@ public final class CarbonUtil {
/**
* Below method will be used to read the data file matadata
*/
- public static DataFileFooter readMetadatFile(TableBlockInfo tableBlockInfo) throws IOException {
+ public static DataFileFooter readMetadataFile(TableBlockInfo tableBlockInfo) throws IOException {
return getDataFileFooter(tableBlockInfo, false);
}
@@ -949,7 +949,7 @@ public final class CarbonUtil {
* @return
* @throws IOException
*/
- public static DataFileFooter readMetadatFile(TableBlockInfo tableBlockInfo,
+ public static DataFileFooter readMetadataFile(TableBlockInfo tableBlockInfo,
boolean forceReadDataFileFooter) throws IOException {
return getDataFileFooter(tableBlockInfo, forceReadDataFileFooter);
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/test/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFileTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFileTest.java b/core/src/test/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFileTest.java
index 14f9fe2..c60c3fa 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFileTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFileTest.java
@@ -210,7 +210,7 @@ public class LocalCarbonFileTest {
};
new MockUp<CarbonFile>() {
@Mock
- boolean renameForce(String changetoName) {
+ boolean renameForce(String changeToName) {
return true;
}
};
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/core/src/test/java/org/apache/carbondata/core/util/CarbonUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/util/CarbonUtilTest.java b/core/src/test/java/org/apache/carbondata/core/util/CarbonUtilTest.java
index ecd61bd..4a5d1b3 100644
--- a/core/src/test/java/org/apache/carbondata/core/util/CarbonUtilTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/util/CarbonUtilTest.java
@@ -566,7 +566,7 @@ public class CarbonUtilTest {
}
}
- @Test public void testToReadMetadatFile() throws IOException {
+ @Test public void testToReadMetadataFile() throws IOException {
new MockUp<DataFileFooterConverter>() {
@SuppressWarnings("unused") @Mock
public DataFileFooter readDataFileFooter(TableBlockInfo info) {
@@ -578,15 +578,15 @@ public class CarbonUtilTest {
TableBlockInfo info =
new TableBlockInfo("file:/", 1, "0", new String[0], 1, ColumnarFormatVersion.V1, null);
- assertEquals(CarbonUtil.readMetadatFile(info).getVersionId().number(), 1);
+ assertEquals(CarbonUtil.readMetadataFile(info).getVersionId().number(), 1);
}
@Test(expected = IOException.class)
- public void testToReadMetadatFileWithException()
+ public void testToReadMetadataFileWithException()
throws Exception {
TableBlockInfo info =
new TableBlockInfo("file:/", 1, "0", new String[0], 1, ColumnarFormatVersion.V1, null);
- CarbonUtil.readMetadatFile(info);
+ CarbonUtil.readMetadataFile(info);
}
@Test public void testToFindDimension() {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala
index d01caee..07f6964 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/CarbonMergerRDD.scala
@@ -121,7 +121,7 @@ class CarbonMergerRDD[K, V](
// Blocks are sorted by order of updation using TableBlockInfo.compare method so
// the last block after the sort will be the latest one.
dataFileFooter = CarbonUtil
- .readMetadatFile(tableBlockInfoList.get(tableBlockInfoList.size() - 1))
+ .readMetadataFile(tableBlockInfoList.get(tableBlockInfoList.size() - 1))
} catch {
case e: IOException =>
logError("Exception in preparing the data file footer for compaction " + e.getMessage)
@@ -345,7 +345,7 @@ class CarbonMergerRDD[K, V](
var dataFileFooter: DataFileFooter = null
try {
- dataFileFooter = CarbonUtil.readMetadatFile(
+ dataFileFooter = CarbonUtil.readMetadataFile(
CarbonInputSplit.getTableBlockInfo(carbonInputSplit))
} catch {
case e: IOException =>
@@ -373,7 +373,7 @@ class CarbonMergerRDD[K, V](
// Check the cardinality of each columns and set the highest.
try {
- dataFileFooter = CarbonUtil.readMetadatFile(
+ dataFileFooter = CarbonUtil.readMetadataFile(
CarbonInputSplit.getTableBlockInfo(split))
} catch {
case e: IOException =>
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/integration/spark-common/src/main/scala/org/apache/spark/util/PartitionUtils.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/util/PartitionUtils.scala b/integration/spark-common/src/main/scala/org/apache/spark/util/PartitionUtils.scala
index e2aa9ae..1782cdf 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/util/PartitionUtils.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/util/PartitionUtils.scala
@@ -149,7 +149,7 @@ object PartitionUtils {
oldPartitionIdList,
partitionInfo,
carbonTable)
- val footer = CarbonUtil.readMetadatFile(tableBlockInfoList.get(0))
+ val footer = CarbonUtil.readMetadataFile(tableBlockInfoList.get(0))
val segmentProperties = new SegmentProperties(footer.getColumnInTable,
footer.getSegmentInfo.getColumnCardinality)
segmentProperties
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/UnsafeSortDataRows.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/UnsafeSortDataRows.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/UnsafeSortDataRows.java
index e199c89..24faa51 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/UnsafeSortDataRows.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/UnsafeSortDataRows.java
@@ -417,7 +417,7 @@ public class UnsafeSortDataRows {
page.getBuffer().loadToUnsafe();
unsafeInMemoryIntermediateFileMerger.addDataChunkToMerge(page);
LOGGER.info(
- "Time taken to sort row page with size: " + page.getBuffer().getActualSize() + "is: "
+ "Time taken to sort row page with size: " + page.getBuffer().getActualSize() + " is: "
+ (System.currentTimeMillis() - startTime));
}
} catch (Throwable e) {
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9d468f0c/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java
index 74efdcb..63f464e 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java
@@ -124,9 +124,9 @@ public class CarbonCompactionUtil {
// This decision will impact the compaction performance so it needs to be decided carefully
if (null != blockInfo.getDetailInfo()
&& blockInfo.getDetailInfo().getSchemaUpdatedTimeStamp() == 0L) {
- dataFileMatadata = CarbonUtil.readMetadatFile(blockInfo, true);
+ dataFileMatadata = CarbonUtil.readMetadataFile(blockInfo, true);
} else {
- dataFileMatadata = CarbonUtil.readMetadatFile(blockInfo);
+ dataFileMatadata = CarbonUtil.readMetadataFile(blockInfo);
}
if (null == metadataList) {
// if it is not present