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 2016/11/17 14:57:47 UTC
[1/2] incubator-carbondata git commit: Time Stamp Filter issue with
other than yyyy-mm-dd format
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 221c57506 -> 2f24b523f
Time Stamp Filter issue with other than yyyy-mm-dd format
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/f6f0d4ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/f6f0d4ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/f6f0d4ca
Branch: refs/heads/master
Commit: f6f0d4caecd7e3fd326de309e3bf43b7095d1e9c
Parents: 221c575
Author: kumarvishal <ku...@gmail.com>
Authored: Thu Nov 17 18:29:49 2016 +0530
Committer: kumarvishal <ku...@gmail.com>
Committed: Thu Nov 17 18:29:49 2016 +0530
----------------------------------------------------------------------
.../resolverinfo/visitor/CustomTypeDictionaryVisitor.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f6f0d4ca/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
index 3b2ec99..5cc5170 100644
--- a/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
+++ b/core/src/main/java/org/apache/carbondata/scan/filter/resolver/resolverinfo/visitor/CustomTypeDictionaryVisitor.java
@@ -28,6 +28,7 @@ import org.apache.carbondata.core.carbon.AbsoluteTableIdentifier;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator;
import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryKeyGeneratorFactory;
+import org.apache.carbondata.core.util.CarbonProperties;
import org.apache.carbondata.scan.expression.ColumnExpression;
import org.apache.carbondata.scan.expression.exception.FilterIllegalMemberException;
import org.apache.carbondata.scan.expression.exception.FilterUnsupportedException;
@@ -98,7 +99,9 @@ public class CustomTypeDictionaryVisitor implements ResolvedFilterInfoVisitorInt
private void getSurrogateValuesForDictionary(List<String> evaluateResultListFinal,
List<Integer> surrogates, boolean isNotTimestampType,
DirectDictionaryGenerator directDictionaryGenerator) {
- String timeFormat = CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT;
+ String timeFormat = CarbonProperties.getInstance()
+ .getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
+ CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT);
if (isNotTimestampType) {
timeFormat = null;
}
[2/2] incubator-carbondata git commit: [CARBONDATA-421]Time Stamp
Filter issue with other than yyyy-mm-dd format This closes #327
Posted by ja...@apache.org.
[CARBONDATA-421]Time Stamp Filter issue with other than yyyy-mm-dd format This closes #327
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/2f24b523
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/2f24b523
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/2f24b523
Branch: refs/heads/master
Commit: 2f24b523f3c2d986ac1154b78ff044050d87fcce
Parents: 221c575 f6f0d4c
Author: jackylk <ja...@huawei.com>
Authored: Thu Nov 17 22:57:26 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Nov 17 22:57:26 2016 +0800
----------------------------------------------------------------------
.../resolverinfo/visitor/CustomTypeDictionaryVisitor.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------