carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kumarvisha...@apache.org
Subject carbondata git commit: [CARBONDATA-2753] Fix Compatibility issue with Preaggregate table
Date Fri, 20 Jul 2018 10:25:50 GMT
Repository: carbondata
Updated Branches:
  refs/heads/master 4da03f2dd -> ce2d1a3da


[CARBONDATA-2753] Fix Compatibility issue with Preaggregate table

Problem: User creates maintable and load data and create preaggregate datamap on maintable
using old version
and loads data into maintable using new version and dataload fails.

This closes #2523


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/ce2d1a3d
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/ce2d1a3d
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/ce2d1a3d

Branch: refs/heads/master
Commit: ce2d1a3da148ec19c60c15ec13c2a84c2805b479
Parents: 4da03f2
Author: Indhumathi27 <indhumathim27@gmail.com>
Authored: Wed Jul 18 20:47:06 2018 +0530
Committer: kumarvishal09 <kumarvishal1802@gmail.com>
Committed: Fri Jul 20 15:55:09 2018 +0530

----------------------------------------------------------------------
 .../core/metadata/schema/table/DataMapSchemaFactory.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/ce2d1a3d/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchemaFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchemaFactory.java
b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchemaFactory.java
index e8022cc..99fc403 100644
--- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchemaFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/DataMapSchemaFactory.java
@@ -28,9 +28,11 @@ public class DataMapSchemaFactory {
    * @return data map schema
    */
   public DataMapSchema getDataMapSchema(String dataMapName, String providerName) {
-    if (providerName.equalsIgnoreCase(DataMapClassProvider.PREAGGREGATE.toString())) {
+    if (providerName.equalsIgnoreCase(DataMapClassProvider.PREAGGREGATE.toString()) || providerName
+        .equalsIgnoreCase(DataMapClassProvider.PREAGGREGATE.getClassName())) {
       return new AggregationDataMapSchema(dataMapName, providerName);
-    } else if (providerName.equalsIgnoreCase(DataMapClassProvider.TIMESERIES.toString()))
{
+    } else if (providerName.equalsIgnoreCase(DataMapClassProvider.TIMESERIES.toString())
+        || providerName.equalsIgnoreCase(DataMapClassProvider.TIMESERIES.getClassName()))
{
       return new AggregationDataMapSchema(dataMapName, providerName);
     } else {
       return new DataMapSchema(dataMapName, providerName);


Mime
View raw message