You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ch...@apache.org on 2017/03/21 14:46:31 UTC
[1/2] incubator-carbondata git commit: change currenr to current
Repository: incubator-carbondata
Updated Branches:
refs/heads/master a1b8afaff -> 47bdb4d02
change currenr to current
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/040982b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/040982b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/040982b6
Branch: refs/heads/master
Commit: 040982b6a04ac6a195cbb4738398b24e9c38f851
Parents: a1b8afa
Author: mayun <si...@163.com>
Authored: Tue Mar 21 15:40:31 2017 +0800
Committer: mayun <si...@163.com>
Committed: Tue Mar 21 15:40:31 2017 +0800
----------------------------------------------------------------------
.../core/scan/collector/impl/AbstractScannedResultCollector.java | 2 +-
.../core/scan/collector/impl/DictionaryBasedResultCollector.java | 4 ++--
.../core/scan/collector/impl/RawBasedResultCollector.java | 2 +-
.../impl/RestructureBasedDictionaryResultCollector.java | 2 +-
.../scan/collector/impl/RestructureBasedRawResultCollector.java | 2 +-
.../carbondata/core/scan/result/AbstractScannedResult.java | 2 +-
.../core/scan/result/impl/FilterQueryScannedResult.java | 2 +-
.../core/scan/result/impl/NonFilterQueryScannedResult.java | 2 +-
.../core/scan/result/impl/FilterQueryScannedResultTest.java | 4 ++--
.../core/scan/result/impl/NonFilterQueryScannedResultTest.java | 4 ++--
10 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/AbstractScannedResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/AbstractScannedResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/AbstractScannedResultCollector.java
index 3c487ae..c46d46c 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/AbstractScannedResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/AbstractScannedResultCollector.java
@@ -77,7 +77,7 @@ public abstract class AbstractScannedResultCollector implements ScannedResultCol
QueryMeasure queryMeasure = tableBlockExecutionInfos.getQueryMeasures()[measureExistIndex];
msrValues[i + offset] = getMeasureData(
scannedResult.getMeasureChunk(measureInfo.getMeasureOrdinals()[measureExistIndex]),
- scannedResult.getCurrenrRowId(), queryMeasure.getMeasure());
+ scannedResult.getCurrentRowId(), queryMeasure.getMeasure());
measureExistIndex++;
} else {
// if not then get the default value and use that value in aggregation
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java
index c5539b4..6077d13 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java
@@ -105,7 +105,7 @@ public class DictionaryBasedResultCollector extends AbstractScannedResultCollect
scannedResult.incrementCounter();
}
if (null != deleteDeltaDataCache && deleteDeltaDataCache
- .contains(scannedResult.getCurrenrRowId())) {
+ .contains(scannedResult.getCurrentRowId())) {
continue;
}
fillMeasureData(scannedResult, row);
@@ -124,7 +124,7 @@ public class DictionaryBasedResultCollector extends AbstractScannedResultCollect
.equals(queryDimensions[i].getDimension().getColName())) {
row[order[i]] = DataTypeUtil.getDataBasedOnDataType(
scannedResult.getBlockletId() + CarbonCommonConstants.FILE_SEPARATOR
- + scannedResult.getCurrenrRowId(), DataType.STRING);
+ + scannedResult.getCurrentRowId(), DataType.STRING);
} else {
row[order[i]] = DataTypeUtil
.getDataBasedOnDataType(scannedResult.getBlockletId(), DataType.STRING);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RawBasedResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RawBasedResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RawBasedResultCollector.java
index bdaffc8..0af4957 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RawBasedResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RawBasedResultCollector.java
@@ -61,7 +61,7 @@ public class RawBasedResultCollector extends AbstractScannedResultCollector {
while (scannedResult.hasNext() && rowCounter < batchSize) {
scanResultAndGetData(scannedResult);
if (null != deleteDeltaDataCache && deleteDeltaDataCache
- .contains(scannedResult.getCurrenrRowId())) {
+ .contains(scannedResult.getCurrentRowId())) {
continue;
}
prepareRow(scannedResult, listBasedResult, queryMeasures);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedDictionaryResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedDictionaryResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedDictionaryResultCollector.java
index 5ab400a..89fa7c3 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedDictionaryResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedDictionaryResultCollector.java
@@ -80,7 +80,7 @@ public class RestructureBasedDictionaryResultCollector extends DictionaryBasedRe
scannedResult.incrementCounter();
}
if (null != deleteDeltaDataCache && deleteDeltaDataCache
- .contains(scannedResult.getCurrenrRowId())) {
+ .contains(scannedResult.getCurrentRowId())) {
continue;
}
fillMeasureData(scannedResult, row);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java
index 77dc3db..782ffb2 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java
@@ -161,7 +161,7 @@ public class RestructureBasedRawResultCollector extends RawBasedResultCollector
while (scannedResult.hasNext() && rowCounter < batchSize) {
scanResultAndGetData(scannedResult);
if (null != deleteDeltaDataCache && deleteDeltaDataCache
- .contains(scannedResult.getCurrenrRowId())) {
+ .contains(scannedResult.getCurrentRowId())) {
continue;
}
// re-fill dictionary and no dictionary key arrays for the newly added columns
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/result/AbstractScannedResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/AbstractScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/AbstractScannedResult.java
index eec9077..ac4a85e 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/AbstractScannedResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/AbstractScannedResult.java
@@ -563,7 +563,7 @@ public abstract class AbstractScannedResult {
*
* @return valid row id
*/
- public abstract int getCurrenrRowId();
+ public abstract int getCurrentRowId();
/**
* @return dictionary key array for all the dictionary dimension
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
index d1f8b7e..d9eda6a 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResult.java
@@ -83,7 +83,7 @@ public class FilterQueryScannedResult extends AbstractScannedResult {
*
* @return valid row id
*/
- @Override public int getCurrenrRowId() {
+ @Override public int getCurrentRowId() {
return rowMapping[pageCounter][currentRow];
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
index 6527930..3978f9e 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResult.java
@@ -82,7 +82,7 @@ public class NonFilterQueryScannedResult extends AbstractScannedResult {
*
* @return valid row id
*/
- @Override public int getCurrenrRowId() {
+ @Override public int getCurrentRowId() {
return currentRow;
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/test/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResultTest.java b/core/src/test/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResultTest.java
index 3cc69cb..6753afc 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResultTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/result/impl/FilterQueryScannedResultTest.java
@@ -114,8 +114,8 @@ public class FilterQueryScannedResultTest {
// assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
// }
//
-// @Test public void testToGetCurrenrRowId() {
-// int rowId = filterQueryScannedResult.getCurrenrRowId();
+// @Test public void testToGetCurrentRowId() {
+// int rowId = filterQueryScannedResult.getCurrentRowId();
// int expectedResult = 3;
// assertThat(expectedResult, is(equalTo(rowId)));
// }
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/040982b6/core/src/test/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResultTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResultTest.java b/core/src/test/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResultTest.java
index 2e7095f..cbac11b 100644
--- a/core/src/test/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResultTest.java
+++ b/core/src/test/java/org/apache/carbondata/core/scan/result/impl/NonFilterQueryScannedResultTest.java
@@ -113,8 +113,8 @@ public class NonFilterQueryScannedResultTest {
// assertThat(expectedResult, is(equalTo(dictionaryKeyStringArray)));
// }
//
-// @Test public void testToGetCurrenrRowId() {
-// int rowId = filterQueryScannedResult.getCurrenrRowId();
+// @Test public void testToGetCurrentRowId() {
+// int rowId = filterQueryScannedResult.getCurrentRowId();
// int expectedResult = 2;
// assertThat(expectedResult, is(equalTo(rowId)));
// }
[2/2] incubator-carbondata git commit: [CARBONDATA-799] change word
from currenr to current This closes #679
Posted by ch...@apache.org.
[CARBONDATA-799] change word from currenr to current This closes #679
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/47bdb4d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/47bdb4d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/47bdb4d0
Branch: refs/heads/master
Commit: 47bdb4d021553582e4ea5eec4f3f6dd22f18c118
Parents: a1b8afa 040982b
Author: chenliang613 <ch...@huawei.com>
Authored: Tue Mar 21 20:16:11 2017 +0530
Committer: chenliang613 <ch...@huawei.com>
Committed: Tue Mar 21 20:16:11 2017 +0530
----------------------------------------------------------------------
.../core/scan/collector/impl/AbstractScannedResultCollector.java | 2 +-
.../core/scan/collector/impl/DictionaryBasedResultCollector.java | 4 ++--
.../core/scan/collector/impl/RawBasedResultCollector.java | 2 +-
.../impl/RestructureBasedDictionaryResultCollector.java | 2 +-
.../scan/collector/impl/RestructureBasedRawResultCollector.java | 2 +-
.../carbondata/core/scan/result/AbstractScannedResult.java | 2 +-
.../core/scan/result/impl/FilterQueryScannedResult.java | 2 +-
.../core/scan/result/impl/NonFilterQueryScannedResult.java | 2 +-
.../core/scan/result/impl/FilterQueryScannedResultTest.java | 4 ++--
.../core/scan/result/impl/NonFilterQueryScannedResultTest.java | 4 ++--
10 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------