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/27 20:22:05 UTC
[1/2] incubator-carbondata git commit: change columnSchenma to
columnSchema
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 53a0a0725 -> 61d3f3c2e
change columnSchenma to columnSchema
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/4a11fbd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/4a11fbd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/4a11fbd2
Branch: refs/heads/master
Commit: 4a11fbd2c0aaa2a7808c18efba5926c5dd001c1b
Parents: 53a0a07
Author: mayun <si...@163.com>
Authored: Tue Apr 25 18:03:30 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Apr 27 13:21:32 2017 -0700
----------------------------------------------------------------------
.../core/util/CarbonMetadataUtil.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/4a11fbd2/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 23d8baa..6398f30 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
@@ -324,7 +324,7 @@ public class CarbonMetadataUtil {
}
private static BlockletInfo getBlockletInfo(BlockletInfoColumnar blockletInfoColumnar,
- List<ColumnSchema> columnSchenma, SegmentProperties segmentProperties) throws IOException {
+ List<ColumnSchema> columnSchema, SegmentProperties segmentProperties) throws IOException {
BlockletInfo blockletInfo = new BlockletInfo();
blockletInfo.setNum_rows(blockletInfoColumnar.getNumberOfKeys());
@@ -339,10 +339,10 @@ public class CarbonMetadataUtil {
DataChunk dataChunk = new DataChunk();
dataChunk.setChunk_meta(getChunkCompressionMeta());
List<Encoding> encodings = new ArrayList<Encoding>();
- if (containsEncoding(i, Encoding.DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DICTIONARY);
}
- if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DIRECT_DICTIONARY);
}
dataChunk.setRowMajor(colGrpblock[i]);
@@ -642,13 +642,13 @@ public class CarbonMetadataUtil {
* Below method will be used to get the data chunk object for all the columns
*
* @param blockletInfoColumnar blocklet info
- * @param columnSchenma list of columns
+ * @param columnSchema list of columns
* @param segmentProperties segment properties
* @return list of data chunks
* @throws IOException
*/
public static List<DataChunk2> getDatachunk2(BlockletInfoColumnar blockletInfoColumnar,
- List<ColumnSchema> columnSchenma, SegmentProperties segmentProperties) throws IOException {
+ List<ColumnSchema> columnSchema, SegmentProperties segmentProperties) throws IOException {
List<DataChunk2> colDataChunks = new ArrayList<DataChunk2>();
int rowIdIndex = 0;
int aggregateIndex = 0;
@@ -659,10 +659,10 @@ public class CarbonMetadataUtil {
DataChunk2 dataChunk = new DataChunk2();
dataChunk.setChunk_meta(getChunkCompressionMeta());
List<Encoding> encodings = new ArrayList<Encoding>();
- if (containsEncoding(i, Encoding.DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DICTIONARY);
}
- if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DIRECT_DICTIONARY);
}
dataChunk.setRowMajor(colGrpblock[i]);
@@ -725,13 +725,13 @@ public class CarbonMetadataUtil {
* Below method will be used to get the data chunk object for all the columns
*
* @param nodeHolderList blocklet info
- * @param columnSchenma list of columns
+ * @param columnSchema list of columns
* @param segmentProperties segment properties
* @return list of data chunks
* @throws IOException
*/
private static List<DataChunk2> getDatachunk2(List<NodeHolder> nodeHolderList,
- List<ColumnSchema> columnSchenma, SegmentProperties segmentProperties, int index,
+ List<ColumnSchema> columnSchema, SegmentProperties segmentProperties, int index,
boolean isDimensionColumn) throws IOException {
List<DataChunk2> colDataChunks = new ArrayList<DataChunk2>();
DataChunk2 dataChunk = null;
@@ -745,10 +745,10 @@ public class CarbonMetadataUtil {
List<Encoding> encodings = new ArrayList<Encoding>();
if (isDimensionColumn) {
dataChunk.setData_page_length(nodeHolder.getKeyLengths()[index]);
- if (containsEncoding(index, Encoding.DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(index, Encoding.DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DICTIONARY);
}
- if (containsEncoding(index, Encoding.DIRECT_DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(index, Encoding.DIRECT_DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DIRECT_DICTIONARY);
}
dataChunk.setRowMajor(nodeHolder.getColGrpBlocks()[index]);
@@ -802,10 +802,10 @@ public class CarbonMetadataUtil {
}
public static DataChunk3 getDataChunk3(List<NodeHolder> nodeHolderList,
- List<ColumnSchema> columnSchenma, SegmentProperties segmentProperties, int index,
+ List<ColumnSchema> columnSchema, SegmentProperties segmentProperties, int index,
boolean isDimensionColumn) throws IOException {
List<DataChunk2> dataChunksList =
- getDatachunk2(nodeHolderList, columnSchenma, segmentProperties, index, isDimensionColumn);
+ getDatachunk2(nodeHolderList, columnSchema, segmentProperties, index, isDimensionColumn);
int offset = 0;
DataChunk3 dataChunk = new DataChunk3();
List<Integer> pageOffsets = new ArrayList<>();
@@ -928,13 +928,13 @@ public class CarbonMetadataUtil {
* Below method will be used to get the data chunk2 serialize object list
*
* @param nodeHolder node holder
- * @param columnSchenma table columns
+ * @param columnSchema table columns
* @param segmentProperties segment properties
* @param isDimensionColumn to get the list of dimension column or measure column
* @return list of data chunk2
* @throws IOException
*/
- public static List<byte[]> getDataChunk2(NodeHolder nodeHolder, List<ColumnSchema> columnSchenma,
+ public static List<byte[]> getDataChunk2(NodeHolder nodeHolder, List<ColumnSchema> columnSchema,
SegmentProperties segmentProperties, boolean isDimensionColumn) throws IOException {
List<byte[]> dataChunkBuffer = new ArrayList<>();
if (isDimensionColumn) {
@@ -945,10 +945,10 @@ public class CarbonMetadataUtil {
dataChunk.setNumberOfRowsInpage(nodeHolder.getEntryCount());
List<Encoding> encodings = new ArrayList<Encoding>();
dataChunk.setData_page_length(nodeHolder.getKeyLengths()[i]);
- if (containsEncoding(i, Encoding.DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DICTIONARY);
}
- if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchenma, segmentProperties)) {
+ if (containsEncoding(i, Encoding.DIRECT_DICTIONARY, columnSchema, segmentProperties)) {
encodings.add(Encoding.DIRECT_DICTIONARY);
}
dataChunk.setRowMajor(nodeHolder.getColGrpBlocks()[i]);
[2/2] incubator-carbondata git commit: [CARBONDATA-984] change
columnSchenma to columnSchema This closes #848
Posted by ja...@apache.org.
[CARBONDATA-984] change columnSchenma to columnSchema This closes #848
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/61d3f3c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/61d3f3c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/61d3f3c2
Branch: refs/heads/master
Commit: 61d3f3c2e439d2de63f01b8b07dce6cf29b065f8
Parents: 53a0a07 4a11fbd
Author: jackylk <ja...@huawei.com>
Authored: Thu Apr 27 13:21:55 2017 -0700
Committer: jackylk <ja...@huawei.com>
Committed: Thu Apr 27 13:21:55 2017 -0700
----------------------------------------------------------------------
.../core/util/CarbonMetadataUtil.java | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------