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 2017/04/09 06:49:51 UTC
[05/11] incubator-carbondata git commit: clean issue in java/scala doc
clean issue in java/scala doc
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/086b06d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/086b06d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/086b06d1
Branch: refs/heads/12-dev
Commit: 086b06d119d4fb855fa944ecf79f3f637855cb56
Parents: 1e5db53
Author: QiangCai <qi...@qq.com>
Authored: Fri Apr 7 21:53:00 2017 +0530
Committer: jackylk <ja...@huawei.com>
Committed: Sat Apr 8 00:56:08 2017 +0800
----------------------------------------------------------------------
.../impl/ColumnGroupDimensionDataChunk.java | 7 +-
.../impl/VariableLengthDimensionDataChunk.java | 7 +-
.../chunk/reader/MeasureColumnChunkReader.java | 8 +-
...mpressedDimensionChunkFileBasedReaderV3.java | 2 +-
...CompressedMeasureChunkFileBasedReaderV3.java | 8 +-
.../chunk/store/DimensionDataChunkStore.java | 4 +-
.../SafeAbsractDimensionDataChunkStore.java | 2 -
.../SafeFixedLengthDimensionDataChunkStore.java | 4 +-
...nsafeFixedLengthDimensionDataChunkStore.java | 4 +-
...afeVariableLengthDimesionDataChunkStore.java | 2 +-
.../TimeStampDirectDictionaryGenerator.java | 2 +-
.../core/scan/executor/util/QueryUtil.java | 2 +-
.../visitor/RangeDirectDictionaryVisitor.java | 1 -
.../core/scan/model/CarbonQueryPlan.java | 3 -
.../core/scan/processor/BlockletIterator.java | 4 +-
.../core/scan/scanner/impl/FilterScanner.java | 9 +-
.../core/util/CarbonMetadataUtil.java | 9 +-
.../apache/carbondata/core/util/CarbonUtil.java | 2 +-
.../carbondata/core/util/DataTypeUtil.java | 2 +-
.../dictionary/ForwardDictionaryCacheTest.java | 2 +-
.../impl/ColumnGroupDimensionDataChunkTest.java | 2 +-
.../impl/btree/BTreeBlockFinderTest.java | 3 +-
.../hadoop/util/CarbonInputSplitTaskInfo.java | 2 +-
.../spark/load/DeleteLoadFolders.java | 12 +-
.../carbondata/spark/splits/TableSplit.java | 3 -
.../carbondata/spark/util/LoadMetadataUtil.java | 6 +-
.../processing/merger/CarbonDataMergerUtil.java | 2 +-
.../processing/model/CarbonLoadModel.java | 3 -
.../newflow/sort/unsafe/sort/TimSort.java | 2 +-
.../store/colgroup/ColGroupDataHolder.java | 5 +-
.../processing/util/NonDictionaryUtil.java | 3 -
processing/src/test/resources/CSV.ktr | 1 -
.../src/test/resources/DATA_FACT_SMALL1.ktr | 1 -
.../src/test/resources/Vishal5SecondsTest1.xml | Bin 12280 -> 0 bytes
.../Vishal5SecondsTest1_en_Invalid.xml | 150 -------------------
35 files changed, 52 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunk.java
index dc5f93f..8234f67 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunk.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunk.java
@@ -30,7 +30,8 @@ public class ColumnGroupDimensionDataChunk extends AbstractDimensionDataChunk {
* Constructor for this class
*
* @param dataChunk data chunk
- * @param chunkAttributes chunk attributes
+ * @param columnValueSize chunk attributes
+ * @param numberOfRows
*/
public ColumnGroupDimensionDataChunk(byte[] dataChunk, int columnValueSize, int numberOfRows) {
this.dataChunkStore = DimensionChunkStoreFactory.INSTANCE
@@ -62,7 +63,8 @@ public class ColumnGroupDimensionDataChunk extends AbstractDimensionDataChunk {
* @param rowId
* @param columnIndex
* @param row
- * @param restructuringInfo @return
+ * @param info KeyStructureInfo
+ * @return
*/
@Override public int fillConvertedChunkData(int rowId, int columnIndex, int[] row,
KeyStructureInfo info) {
@@ -79,7 +81,6 @@ public class ColumnGroupDimensionDataChunk extends AbstractDimensionDataChunk {
* Below method will be used to get the masked key
*
* @param data data
- * @param offset offset of
* @param info
* @return
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java
index 92c1e2f..eac06f4 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java
@@ -32,9 +32,10 @@ public class VariableLengthDimensionDataChunk extends AbstractDimensionDataChunk
/**
* Constructor for this class
- *
- * @param dataChunkStore data chunk
- * @param chunkAttributes chunk attributes
+ * @param dataChunks
+ * @param invertedIndex
+ * @param invertedIndexReverse
+ * @param numberOfRows
*/
public VariableLengthDimensionDataChunk(byte[] dataChunks, int[] invertedIndex,
int[] invertedIndexReverse, int numberOfRows) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java
index ef7875b..39789b1 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java
@@ -49,12 +49,8 @@ public interface MeasureColumnChunkReader {
/**
* Covert raw data to measure chunk
- *
- * @param fileReader
- * @param blockIndex
- * @param rawData
- * @param offset
- * @param length
+ * @param measureRawColumnChunk
+ * @param pageNumber
* @return
* @throws IOException
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
index 79b75e4..8bea132 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v3/CompressedDimensionChunkFileBasedReaderV3.java
@@ -197,7 +197,7 @@ public class CompressedDimensionChunkFileBasedReaderV3 extends AbstractChunkRead
* Below method will be used to convert the compressed dimension chunk raw data to actual data
*
* @param dimensionRawColumnChunk dimension raw chunk
- * @param page number
+ * @param pageNumber number
* @return DimensionColumnDataChunk
*/
@Override public DimensionColumnDataChunk convertToDimensionChunk(
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
index 58b2937..570c0c8 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v3/CompressedMeasureChunkFileBasedReaderV3.java
@@ -69,7 +69,7 @@ public class CompressedMeasureChunkFileBasedReaderV3 extends AbstractMeasureChun
* 5. Create the raw chunk object and fill the details
*
* @param fileReader reader for reading the column from carbon data file
- * @param blockletColumnIndex blocklet index of the column in carbon data file
+ * @param blockIndex blocklet index of the column in carbon data file
* @return measure raw chunk
*/
@Override public MeasureRawColumnChunk readRawMeasureChunk(FileHolder fileReader, int blockIndex)
@@ -136,9 +136,9 @@ public class CompressedMeasureChunkFileBasedReaderV3 extends AbstractMeasureChun
*
* @param fileReader
* reader which will be used to read the measure columns data from file
- * @param startBlockletColumnIndex
+ * @param startColumnBlockletIndex
* blocklet index of the first measure column
- * @param endBlockletColumnIndex
+ * @param endColumnBlockletIndex
* blocklet index of the last measure column
* @return MeasureRawColumnChunk array
*/
@@ -201,7 +201,7 @@ public class CompressedMeasureChunkFileBasedReaderV3 extends AbstractMeasureChun
* Below method will be used to convert the compressed measure chunk raw data to actual data
*
* @param measureRawColumnChunk measure raw chunk
- * @param page number
+ * @param pageNumber number
* @return DimensionColumnDataChunk
*/
@Override public MeasureColumnDataChunk convertToMeasureChunk(
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionDataChunkStore.java
index df29943..a3f7ac3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionDataChunkStore.java
@@ -36,7 +36,7 @@ public interface DimensionDataChunkStore {
* Below method will be used to get the row
* based on row id passed
*
- * @param index
+ * @param rowId
* @return row
*/
byte[] getRow(int rowId);
@@ -45,7 +45,7 @@ public interface DimensionDataChunkStore {
* Below method will be used to fill the row values to buffer array
*
* @param rowId row id of the data to be filled
- * @param data buffer in which data will be filled
+ * @param buffer buffer in which data will be filled
* @param offset off the of the buffer
*/
void fillRow(int rowId, byte[] buffer, int offset);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
index 2f969b1..cb10d3e 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeAbsractDimensionDataChunkStore.java
@@ -47,9 +47,7 @@ public abstract class SafeAbsractDimensionDataChunkStore implements DimensionDat
/**
* Constructor
*
- * @param totalSize total size of the data to be kept
* @param isInvertedIdex is inverted index present
- * @param numberOfRows total number of rows
*/
public SafeAbsractDimensionDataChunkStore(boolean isInvertedIdex) {
this.isExplictSorted = isInvertedIdex;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
index 23af707..8656878 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/safe/SafeFixedLengthDimensionDataChunkStore.java
@@ -57,7 +57,7 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
* Below method will be used to get the surrogate key of the based on the row
* id passed
*
- * @param rowId row id
+ * @param index row id
* @return surrogate key
*/
@Override public int getSurrogate(int index) {
@@ -74,7 +74,7 @@ public class SafeFixedLengthDimensionDataChunkStore extends SafeAbsractDimension
* Below method will be used to fill the row values to buffer array
*
* @param rowId row id of the data to be filled
- * @param data buffer in which data will be filled
+ * @param buffer buffer in which data will be filled
* @param offset off the of the buffer
*/
@Override public void fillRow(int rowId, byte[] buffer, int offset) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
index e666282..4ff9c77 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeFixedLengthDimensionDataChunkStore.java
@@ -71,7 +71,7 @@ public class UnsafeFixedLengthDimensionDataChunkStore
* Below method will be used to get the surrogate key of the based on the row
* id passed
*
- * @param rowId row id
+ * @param index row id
* @return surrogate key
*/
@Override public int getSurrogate(int index) {
@@ -97,7 +97,7 @@ public class UnsafeFixedLengthDimensionDataChunkStore
* Below method will be used to fill the row values to buffer array
*
* @param rowId row id of the data to be filled
- * @param data buffer in which data will be filled
+ * @param buffer buffer in which data will be filled
* @param offset off the of the buffer
*/
@Override public void fillRow(int rowId, byte[] buffer, int offset) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
index 10ac5cd..82ec205 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeVariableLengthDimesionDataChunkStore.java
@@ -118,7 +118,7 @@ public class UnsafeVariableLengthDimesionDataChunkStore
/**
* Below method will be used to get the row based on row id passed
*
- * @param index
+ * @param rowId
* @return row
*/
@Override public byte[] getRow(int rowId) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
index a139f4c..7d3d6c8 100644
--- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
+++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java
@@ -62,7 +62,7 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener
private static final LogService LOGGER =
LogServiceFactory.getLogService(TimeStampDirectDictionaryGenerator.class.getName());
- /**
+ /*
* initialization block for granularityFactor and cutOffTimeStamp
*/
static {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
index be5e8a4..130b4fb 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/util/QueryUtil.java
@@ -520,7 +520,7 @@ public class QueryUtil {
List<QueryDimension> dimensions = new ArrayList<QueryDimension>(origdimensions.size());
dimensions.addAll(origdimensions);
- /**
+ /*
* sort based on column group id
*/
Collections.sort(dimensions, new Comparator<QueryDimension>() {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/RangeDirectDictionaryVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/RangeDirectDictionaryVisitor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/RangeDirectDictionaryVisitor.java
index 263fa9c..0fefaf0 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/RangeDirectDictionaryVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/resolver/resolverinfo/visitor/RangeDirectDictionaryVisitor.java
@@ -41,7 +41,6 @@ public class RangeDirectDictionaryVisitor extends CustomTypeDictionaryVisitor
* @param metadata
* @throws FilterUnsupportedException,if exception occurs while evaluating
* filter models.
- * @throws IOException
* @throws FilterUnsupportedException
*/
public void populateFilterResolvedInfo(DimColumnResolvedFilterInfo visitableObj,
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/scan/model/CarbonQueryPlan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/model/CarbonQueryPlan.java b/core/src/main/java/org/apache/carbondata/core/scan/model/CarbonQueryPlan.java
index fd747e2..5a5b042 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/model/CarbonQueryPlan.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/model/CarbonQueryPlan.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- *
- */
package org.apache.carbondata.core.scan.model;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/scan/processor/BlockletIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/processor/BlockletIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/processor/BlockletIterator.java
index 8e7d8c7..3ea4e1d 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/processor/BlockletIterator.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/processor/BlockletIterator.java
@@ -61,13 +61,13 @@ public class BlockletIterator extends CarbonIterator<DataRefNode> {
return hasNext;
}
- @Override
+
/**
* To get the next block
* @return next data block
*
*/
- public DataRefNode next() {
+ @Override public DataRefNode next() {
// get the current blocks
DataRefNode datablockTemp = datablock;
// store the next data block
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/FilterScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/FilterScanner.java b/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/FilterScanner.java
index 32b7bff..86a2e8b 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/FilterScanner.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/scanner/impl/FilterScanner.java
@@ -216,7 +216,8 @@ public class FilterScanner extends AbstractBlockletScanner {
dimensionRawColumnChunks[j] = projectionListDimensionChunk[j];
}
}
- /**
+
+ /*
* in case projection if the projected dimension are not loaded in the dimensionColumnDataChunk
* then loading them
*/
@@ -247,9 +248,9 @@ public class FilterScanner extends AbstractBlockletScanner {
measureRawColumnChunks[j] = projectionListMeasureChunk[j];
}
}
- /**
- * in case projection if the projected measure are not loaded in the measureColumnDataChunk
- * then loading them
+ /*
+ in case projection if the projected measure are not loaded in the measureColumnDataChunk
+ then loading them
*/
int[] projectionListMeasureIndexes = blockExecutionInfo.getProjectionListMeasureIndexes();
int projectionListMeasureIndexesLength = projectionListMeasureIndexes.length;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
index e60d675..23d8baa 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java
@@ -119,8 +119,10 @@ public class CarbonMetadataUtil {
* Below method prepares the file footer object for carbon data file version 3
*
* @param infoList
- * @param numCols
+ * @param blockletIndexs
* @param cardinalities
+ * @param numberOfColumns
+ * @param segmentProperties
* @return FileFooter
*/
public static FileFooter3 convertFileFooterVersion3(List<BlockletInfo3> infoList,
@@ -137,8 +139,9 @@ public class CarbonMetadataUtil {
* Below method will be used to get the file footer object
*
* @param infoList blocklet info
+ * @param blockletIndexs
* @param cardinalities cardinlaity of dimension columns
- * @param columnSchemaList column schema list
+ * @param numberOfColumns
* @return file footer
*/
private static FileFooter3 getFileFooter3(List<BlockletInfo3> infoList,
@@ -721,7 +724,7 @@ public class CarbonMetadataUtil {
/**
* Below method will be used to get the data chunk object for all the columns
*
- * @param blockletInfoColumnar blocklet info
+ * @param nodeHolderList blocklet info
* @param columnSchenma list of columns
* @param segmentProperties segment properties
* @return list of data chunks
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/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 a442087..e10bd02 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
@@ -819,7 +819,7 @@ public final class CarbonUtil {
char[] type = new char[encodeMetaList.size()];
byte[] dataTypeSelected = new byte[encodeMetaList.size()];
- /**
+ /*
* to fill the meta data required for value compression model
*/
for (int i = 0; i < dataTypeSelected.length; i++) { // always 1
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
index 76df425..d8e0c82 100644
--- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
+++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
@@ -573,7 +573,7 @@ public final class DataTypeUtil {
* Below method will be used to convert the data into byte[]
*
* @param data
- * @param ColumnSchema
+ * @param columnSchema
* @return actual data in byte[]
*/
public static byte[] convertDataToBytesBasedOnDataType(String data, ColumnSchema columnSchema) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java
index 8ceaf1c..4efb093 100644
--- a/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCacheTest.java
@@ -204,7 +204,7 @@ public class ForwardDictionaryCacheTest extends AbstractDictionaryCacheTest {
* it to a sort index file
*
* @param data
- * @param columnIdentifier
+ * @param columnId
* @throws IOException
*/
private void writeSortIndexFile(List<String> data, String columnId) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/test/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunkTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunkTest.java b/core/src/test/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunkTest.java
index 5915655..5affed8 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunkTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastore/chunk/impl/ColumnGroupDimensionDataChunkTest.java
@@ -86,7 +86,7 @@ public class ColumnGroupDimensionDataChunkTest {
/**
* Below method will be used to get the key structure info for the query
*
- * @param queryModel query model
+ * @param ordinals query model
* @param keyGenerator
* @return key structure info
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/core/src/test/java/org/apache/carbondata/core/datastore/impl/btree/BTreeBlockFinderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/datastore/impl/btree/BTreeBlockFinderTest.java b/core/src/test/java/org/apache/carbondata/core/datastore/impl/btree/BTreeBlockFinderTest.java
index a4adf92..54bbe06 100644
--- a/core/src/test/java/org/apache/carbondata/core/datastore/impl/btree/BTreeBlockFinderTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/datastore/impl/btree/BTreeBlockFinderTest.java
@@ -146,13 +146,12 @@ public class BTreeBlockFinderTest extends TestCase {
assertEquals(0, findLastBlock.nodeNumber());
}
- @Test
/**
* Below method will test when key which is not present and key which is
* more than
* last node key is passes for searching it should give first block
*/
- public void testBtreeSearchIsWorkingAndGivingPorperBlockletWithDictionaryKey()
+ @Test public void testBtreeSearchIsWorkingAndGivingPorperBlockletWithDictionaryKey()
throws KeyGenException {
BtreeBuilder builder = new BlockBTreeBuilder();
List<DataFileFooter> footerList = getFileFooterListWithOnlyDictionaryKey();
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputSplitTaskInfo.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputSplitTaskInfo.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputSplitTaskInfo.java
index 3a53765..8abc1f9 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputSplitTaskInfo.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/util/CarbonInputSplitTaskInfo.java
@@ -70,7 +70,7 @@ public class CarbonInputSplitTaskInfo implements Distributable {
/**
* Finding which node has the maximum number of blocks for it.
*
- * @param blockList
+ * @param splitList
* @return
*/
public static List<String> maxNoNodes(List<CarbonInputSplit> splitList) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
index 917de23..6266c82 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/DeleteLoadFolders.java
@@ -15,15 +15,6 @@
* limitations under the License.
*/
-/**
- * Project Name : Carbon
- * Module Name : CARBON spark interface
- * Created Date : 22-Sep-2015
- * FileName : DeleteLoadFolders.java
- * Description : for physical deletion of load folders.
- * Class Version : 1.0
- */
-
package org.apache.carbondata.spark.load;
import java.io.IOException;
@@ -54,7 +45,8 @@ public final class DeleteLoadFolders {
/**
* returns segment path
*
- * @param loadModel
+ * @param dbName
+ * @param tableName
* @param storeLocation
* @param partitionId
* @param oneLoad
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/integration/spark-common/src/main/java/org/apache/carbondata/spark/splits/TableSplit.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/splits/TableSplit.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/splits/TableSplit.java
index 3062a69..733aae9 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/splits/TableSplit.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/splits/TableSplit.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- *
- */
package org.apache.carbondata.spark.splits;
import java.io.ByteArrayInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java b/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
index 297bd7d..0eec314 100644
--- a/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
+++ b/integration/spark-common/src/main/java/org/apache/carbondata/spark/util/LoadMetadataUtil.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- * Utility for load data
- */
package org.apache.carbondata.spark.util;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
@@ -26,6 +23,9 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
import org.apache.carbondata.core.statusmanager.LoadMetadataDetails;
import org.apache.carbondata.core.statusmanager.SegmentStatusManager;
+/**
+ * Utility for load data
+ */
public final class LoadMetadataUtil {
private LoadMetadataUtil() {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java
index ee667c2..2414993 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java
@@ -893,8 +893,8 @@ public final class CarbonDataMergerUtil {
/**
* method to identify the segments qualified for merging in case of IUD Compaction.
*
+ * @param segments
* @param carbonLoadModel
- * @param compactionType
* @return
*/
private static List<LoadMetadataDetails> identifySegmentsToBeMergedBasedOnIUD(
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
index 5f8c141..525874f 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/model/CarbonLoadModel.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- *
- */
package org.apache.carbondata.processing.model;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
index 6700327..683696e 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/sort/TimSort.java
@@ -113,7 +113,7 @@ public class TimSort<K, Buffer> {
return;
}
- /**
+ /*
* March over the array once, left to right, finding natural runs,
* extending short natural runs to minRun elements, and merging runs
* to maintain stack invariant.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/processing/src/main/java/org/apache/carbondata/processing/store/colgroup/ColGroupDataHolder.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/colgroup/ColGroupDataHolder.java b/processing/src/main/java/org/apache/carbondata/processing/store/colgroup/ColGroupDataHolder.java
index 893a3ae..a2e22c2 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/store/colgroup/ColGroupDataHolder.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/store/colgroup/ColGroupDataHolder.java
@@ -40,10 +40,9 @@ public class ColGroupDataHolder implements DataHolder {
private int keyBlockSize;
/**
- * @param colGrpModel
- * @param columnarSplitter
- * @param colGroupId
+ * @param keyBlockSize
* @param noOfRecords
+ * @param colGrpMinMax
*/
public ColGroupDataHolder(int keyBlockSize,
int noOfRecords,ColGroupMinMax colGrpMinMax) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/086b06d1/processing/src/main/java/org/apache/carbondata/processing/util/NonDictionaryUtil.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/NonDictionaryUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/NonDictionaryUtil.java
index db3f9da..54b4951 100644
--- a/processing/src/main/java/org/apache/carbondata/processing/util/NonDictionaryUtil.java
+++ b/processing/src/main/java/org/apache/carbondata/processing/util/NonDictionaryUtil.java
@@ -15,9 +15,6 @@
* limitations under the License.
*/
-/**
- *
- */
package org.apache.carbondata.processing.util;
import java.nio.ByteBuffer;