[1/3] carbondata git commit: [CARBONDATA-940] alter table add/split partition for spark 2.1

[jackylk]

Repository: carbondata
Updated Branches:
  refs/heads/master 3efd33072 -> 874764f95


http://git-wip-us.apache.org/repos/asf/carbondata/blob/874764f9/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java
----------------------------------------------------------------------
diff --git 
a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java
 
b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java
index c059030..544a26a 100644
--- 
a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java
+++ 
b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java
@@ -504,6 +504,8 @@ public class CarbonFactDataHandlerModel {
     return bucketId;
   }
 
+  public void setBucketId(Integer bucketId) { this.bucketId = bucketId; }
+
   public long getSchemaUpdatedTimeStamp() {
     return schemaUpdatedTimeStamp;
   }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/874764f9/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
----------------------------------------------------------------------
diff --git 
a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
 
b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
index f823ade..45461e3 100644
--- 
a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
+++ 
b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java
@@ -181,9 +181,11 @@ public final class CarbonDataProcessorUtil {
    * @return
    */
   public static String[] getLocalDataFolderLocation(String databaseName, 
String tableName,
-      String taskId, String partitionId, String segmentId, boolean 
isCompactionFlow) {
+      String taskId, String partitionId, String segmentId, boolean 
isCompactionFlow,
+      boolean isAltPartitionFlow) {
     String tempLocationKey =
-        getTempStoreLocationKey(databaseName, tableName, segmentId, taskId, 
isCompactionFlow);
+        getTempStoreLocationKey(databaseName, tableName, segmentId, taskId, 
isCompactionFlow,
+            isAltPartitionFlow);
     String baseTempStorePath = CarbonProperties.getInstance()
         .getProperty(tempLocationKey);
     if (baseTempStorePath == null) {
@@ -221,13 +223,17 @@ public final class CarbonDataProcessorUtil {
    * @return
    */
   public static String getTempStoreLocationKey(String databaseName, String 
tableName,
-      String segmentId, String taskId, boolean isCompactionFlow) {
+      String segmentId, String taskId, boolean isCompactionFlow, boolean 
isAltPartitionFlow) {
     String tempLocationKey = databaseName + CarbonCommonConstants.UNDERSCORE + 
tableName
         + CarbonCommonConstants.UNDERSCORE + segmentId + 
CarbonCommonConstants.UNDERSCORE + taskId;
     if (isCompactionFlow) {
       tempLocationKey = CarbonCommonConstants.COMPACTION_KEY_WORD + 
CarbonCommonConstants.UNDERSCORE
           + tempLocationKey;
     }
+    if (isAltPartitionFlow) {
+      tempLocationKey = CarbonCommonConstants.ALTER_PARTITION_KEY_WORD +
+          CarbonCommonConstants.UNDERSCORE + tempLocationKey;
+    }
     return tempLocationKey;
   }