[2/2] incubator-carbondata git commit: [CARBONDATA-849] Correcting the error message for alter table as per HIVE message for non existing table. This closes #725

[ravipesala]

[CARBONDATA-849] Correcting the error message for alter table as per HIVE 
message for non existing table. This closes #725


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

Branch: refs/heads/master
Commit: bd044c20895e338884ceeb6ba4bdd5fb15649201
Parents: c62b299 8245e5d
Author: ravipesala 
Authored: Wed Apr 5 13:17:31 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 13:17:31 2017 +0530

--
 .../apache/spark/sql/execution/command/carbonTableSchema.scala| 2 +-
 .../org/apache/spark/sql/execution/command/DDLStrategy.scala  | 3 ++-
 .../scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
--

[1/2] incubator-carbondata git commit: Issue : https://issues.apache.org/jira/browse/CARBONDATA-849

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master c62b29979 -> bd044c208


Issue : https://issues.apache.org/jira/browse/CARBONDATA-849


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

Branch: refs/heads/master
Commit: 8245e5dbc324e1998fc64e0061018695a49bc088
Parents: c62b299
Author: ravikiran 
Authored: Tue Apr 4 15:13:25 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 13:16:59 2017 +0530

--
 .../apache/spark/sql/execution/command/carbonTableSchema.scala| 2 +-
 .../org/apache/spark/sql/execution/command/DDLStrategy.scala  | 3 ++-
 .../scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
index 3346743..6c44264 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
@@ -104,7 +104,7 @@ case class AlterTableModel(dbName: Option[String],
segmentUpdateStatusManager: 
Option[SegmentUpdateStatusManager],
compactionType: String,
factTimeStamp: Option[Long],
-   alterSql: String)
+   var alterSql: String)
 
 case class UpdateTableModel(isUpdate: Boolean,
 updatedTimeStamp: Long,

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
--
diff --git 
a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
 
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
index fb15d6d..2916a9f 100644
--- 
a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
+++ 
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
@@ -72,7 +72,8 @@ class DDLStrategy(sparkSession: SparkSession) extends 
SparkStrategy {
   "Unsupported alter operation on carbon table")
   }
 } else {
-  throw new MalformedCarbonCommandException("Unsupported alter 
operation on hive table")
+  throw new MalformedCarbonCommandException(
+"Operation not allowed : " + altertablemodel.alterSql)
 }
   case 
dataTypeChange@AlterTableDataTypeChange(alterTableChangeDataTypeModel) =>
 val isCarbonTable = CarbonEnv.get.carbonMetastore

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
--
diff --git 
a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
 
b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
index dbc3124..695f5fc 100644
--- 
a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
+++ 
b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
@@ -43,6 +43,9 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser {
   case x: LoadTable =>
 x.inputSqlString = input
 x
+  case x: AlterTableCompaction =>
+x.alterTableModel.alterSql = input
+x
   case logicalPlan => logicalPlan
 }
 case failureOrError =>

[2/2] incubator-carbondata git commit: [CARBONDATA-823] Refactory data write step This closes #702

[ravipesala]

[CARBONDATA-823] Refactory data write step This closes #702


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

Branch: refs/heads/master
Commit: 950a6d0f5ab8323aa0feedda48c8c95b323975c8
Parents: bd044c2 8cca0af
Author: ravipesala 
Authored: Wed Apr 5 14:37:18 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:37:18 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--

[1/2] incubator-carbondata git commit: refactor write step

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master bd044c208 -> 950a6d0f5


refactor write step


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

Branch: refs/heads/master
Commit: 8cca0afc5db16557146dfaa33e14c2823d895966
Parents: bd044c2
Author: jackylk 
Authored: Thu Mar 30 11:21:21 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:36:47 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 789c321..b82d53c 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -631,7 +631,7 @@ public final class CarbonCommonConstants {
   /**
* DOUBLE_VALUE_MEASURE
*/
-  public static final char SUM_COUNT_VALUE_MEASURE = 'n';
+  public static final char DOUBLE_MEASURE = 'n';
   /**
* BYTE_VALUE_MEASURE
*/

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
 
b/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
deleted file mode 100644
index 2f54847..000
--- 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.carbondata.core.datastore;
-
-import org.apache.carbondata.core.datastore.dataholder.CarbonWriteDataHolder;
-
-public interface NodeMeasureDataStore {
-  /**
-   * This method will be used to get the writable key array.
-   * writable measure data array will hold below information:
-   * 
-   * total length will be 4 bytes for size + measure data array length
-   *
-   * @return writable array (compressed or normal)
-   */
-  byte[][] getWritableMeasureDataArray(CarbonWriteDataHolder[] 
dataHolderArray);
-}
\ No newline at end of file

[11/12] incubator-carbondata git commit: refactor write step

[ravipesala]

refactor write step


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

Branch: refs/heads/branch-1.1
Commit: 8cca0afc5db16557146dfaa33e14c2823d895966
Parents: bd044c2
Author: jackylk 
Authored: Thu Mar 30 11:21:21 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:36:47 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 789c321..b82d53c 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -631,7 +631,7 @@ public final class CarbonCommonConstants {
   /**
* DOUBLE_VALUE_MEASURE
*/
-  public static final char SUM_COUNT_VALUE_MEASURE = 'n';
+  public static final char DOUBLE_MEASURE = 'n';
   /**
* BYTE_VALUE_MEASURE
*/

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
 
b/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
deleted file mode 100644
index 2f54847..000
--- 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.carbondata.core.datastore;
-
-import org.apache.carbondata.core.datastore.dataholder.CarbonWriteDataHolder;
-
-public interface NodeMeasureDataStore {
-  /**
-   * This method will be used to get the writable key array.
-   * writable measure data array will hold below information:
-   * 
-   * total length will be 4 bytes for size + measure data array length
-   *
-   * @return writable array (compressed or normal)
-   */
-  byte[][] getWritableMeasureDataArray(CarbonWriteDataHolder[] 
dataHolderArray);
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java

[08/12] incubator-carbondata git commit: [CARBONDATA-843]null pointer exception was thrown when floor operation is done on decimal column This closes #718

[ravipesala]

[CARBONDATA-843]null pointer exception was thrown when floor operation is done 
on decimal column This closes #718


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

Branch: refs/heads/branch-1.1
Commit: c62b29979c38b8c30c2169a98b0f204ccae93d07
Parents: 9e721a8 4331929
Author: jackylk 
Authored: Wed Apr 5 09:48:32 2017 +0800
Committer: jackylk 
Committed: Wed Apr 5 09:48:32 2017 +0800

--
 .../core/scan/collector/impl/AbstractScannedResultCollector.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[09/12] incubator-carbondata git commit: Issue : https://issues.apache.org/jira/browse/CARBONDATA-849

[ravipesala]

Issue : https://issues.apache.org/jira/browse/CARBONDATA-849


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

Branch: refs/heads/branch-1.1
Commit: 8245e5dbc324e1998fc64e0061018695a49bc088
Parents: c62b299
Author: ravikiran 
Authored: Tue Apr 4 15:13:25 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 13:16:59 2017 +0530

--
 .../apache/spark/sql/execution/command/carbonTableSchema.scala| 2 +-
 .../org/apache/spark/sql/execution/command/DDLStrategy.scala  | 3 ++-
 .../scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
index 3346743..6c44264 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
@@ -104,7 +104,7 @@ case class AlterTableModel(dbName: Option[String],
segmentUpdateStatusManager: 
Option[SegmentUpdateStatusManager],
compactionType: String,
factTimeStamp: Option[Long],
-   alterSql: String)
+   var alterSql: String)
 
 case class UpdateTableModel(isUpdate: Boolean,
 updatedTimeStamp: Long,

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
--
diff --git 
a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
 
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
index fb15d6d..2916a9f 100644
--- 
a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
+++ 
b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala
@@ -72,7 +72,8 @@ class DDLStrategy(sparkSession: SparkSession) extends 
SparkStrategy {
   "Unsupported alter operation on carbon table")
   }
 } else {
-  throw new MalformedCarbonCommandException("Unsupported alter 
operation on hive table")
+  throw new MalformedCarbonCommandException(
+"Operation not allowed : " + altertablemodel.alterSql)
 }
   case 
dataTypeChange@AlterTableDataTypeChange(alterTableChangeDataTypeModel) =>
 val isCarbonTable = CarbonEnv.get.carbonMetastore

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
--
diff --git 
a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
 
b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
index dbc3124..695f5fc 100644
--- 
a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
+++ 
b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
@@ -43,6 +43,9 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser {
   case x: LoadTable =>
 x.inputSqlString = input
 x
+  case x: AlterTableCompaction =>
+x.alterTableModel.alterSql = input
+x
   case logicalPlan => logicalPlan
 }
 case failureOrError =>

[07/12] incubator-carbondata git commit: CARBONDATA-843 problem: null pointer exception was thrown when floor operation is done on decimal column. analysis: when floor operation was done on decimal co

[ravipesala]

CARBONDATA-843
problem: null pointer exception was thrown when floor operation is done on 
decimal column.
analysis: when floor operation was done on decimal column, scale was greater 
than precision.During floor operation , we tried to change the precision of the 
data.
solution: When sending to the spark layer for performing floor operation, we 
need to send the precision and scale to the spark layer which are taken from 
the CarbonMeasure


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

Branch: refs/heads/branch-1.1
Commit: 43319298eb122846286e16fdbd145594e4633aa4
Parents: 9e721a8
Author: akash 
Authored: Fri Mar 31 18:10:31 2017 +0530
Committer: jackylk 
Committed: Wed Apr 5 09:46:56 2017 +0800

--
 .../core/scan/collector/impl/AbstractScannedResultCollector.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/43319298/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 c46d46c..1ecfbc8 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
@@ -106,7 +106,8 @@ public abstract class AbstractScannedResultCollector 
implements ScannedResultCol
 bigDecimalMsrValue =
 bigDecimalMsrValue.setScale(carbonMeasure.getScale(), 
RoundingMode.HALF_UP);
   }
-  return org.apache.spark.sql.types.Decimal.apply(bigDecimalMsrValue);
+  return org.apache.spark.sql.types.Decimal
+  .apply(bigDecimalMsrValue, carbonMeasure.getPrecision(), 
carbonMeasure.getScale());
 default:
   return 
dataChunk.getMeasureDataHolder().getReadableDoubleValueByIndex(index);
   }

[06/12] incubator-carbondata git commit: makes trivial change for sync up apache git to github

[ravipesala]

makes trivial change for sync up apache git to github


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

Branch: refs/heads/branch-1.1
Commit: 9e721a81beb970c72f64c14615d8d5bddbf74de2
Parents: 5c4868e 2c2c7c9
Author: chenliang613 
Authored: Tue Apr 4 20:44:09 2017 +0530
Committer: chenliang613 
Committed: Tue Apr 4 20:44:09 2017 +0530

--
 .../scala/org/apache/carbondata/examples/AllDictionaryExample.scala | 1 +
 1 file changed, 1 insertion(+)
--

[02/12] incubator-carbondata git commit: [CARBONDATA-838]Add decimal column without scale and precision is failing. This closes #713

[ravipesala]

[CARBONDATA-838]Add decimal column without scale and precision is failing. This 
closes #713


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

Branch: refs/heads/branch-1.1
Commit: 4d0d2d600fe8271817e43e109878caf51394b888
Parents: 3b62d25 f0fe41b
Author: ravipesala 
Authored: Tue Apr 4 16:28:14 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 16:28:14 2017 +0530

--
 .../org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala  | 9 ++---
 .../restructure/AlterTableValidationTestCase.scala  | 8 
 2 files changed, 14 insertions(+), 3 deletions(-)
--

[12/12] incubator-carbondata git commit: [CARBONDATA-823] Refactory data write step This closes #702

[ravipesala]

[CARBONDATA-823] Refactory data write step This closes #702


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

Branch: refs/heads/branch-1.1
Commit: 950a6d0f5ab8323aa0feedda48c8c95b323975c8
Parents: bd044c2 8cca0af
Author: ravipesala 
Authored: Wed Apr 5 14:37:18 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:37:18 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--

[03/12] incubator-carbondata git commit: [CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files

[ravipesala]

[CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files

fix comments


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

Branch: refs/heads/branch-1.1
Commit: 970dfd99fbb36940c8feb0de07bed503ec859a41
Parents: 4d0d2d6
Author: chenliang613 
Authored: Tue Apr 4 15:53:48 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 18:06:50 2017 +0530

--
 format/src/main/thrift/carbondata.thrift| 190 ++-
 format/src/main/thrift/carbondata_index.thrift  |  40 ++--
 format/src/main/thrift/dictionary.thrift|  30 ++-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 ++-
 format/src/main/thrift/schema.thrift| 100 +-
 format/src/main/thrift/sort_index.thrift|  32 ++--
 6 files changed, 208 insertions(+), 214 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/970dfd99/format/src/main/thrift/carbondata.thrift
--
diff --git a/format/src/main/thrift/carbondata.thrift 
b/format/src/main/thrift/carbondata.thrift
index 21ff29d..937108c 100644
--- a/format/src/main/thrift/carbondata.thrift
+++ b/format/src/main/thrift/carbondata.thrift
@@ -1,24 +1,22 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
- * File format description for the carbon file format
+ * File format description for the CarbonData file format
  */
 namespace java org.apache.carbondata.format
 
@@ -26,40 +24,40 @@ include "schema.thrift"
 include "dictionary.thrift"
 
 /**
-* Information about a segment, that represents one data load
-*/
+ * Information about a segment, that represents one data load
+ */
 struct SegmentInfo{
-1: required i32 num_cols; // Number of columns in this load, because 
schema can evolve . TODO: Check whether this is really required
+1: required i32 num_cols; // Number of columns in this load, because 
schema can evolve, different segments may have different columns
 2: required list column_cardinalities; // Cardinality of columns
 }
 
 /**
-*  Btree index of one blocklet
-*/
+ * Btree index of one blocklet
+ */
 struct BlockletBTreeIndex{
 1: required binary start_key; // Bit-packed start key of one blocklet
-2: required binary end_key;// Bit-packed start key of one blocklet
+2: required binary end_key;// Bit-packed end key of one blocklet
 }
 
 /**
-*  Min-max index of one blocklet
-*/
+ * Min-max index of one blocklet
+ */
 struct BlockletMinMaxIndex{
 1: required list min_values; //Min value of all columns of one 
blocklet Bit-Packed
 2: required list max_values; //Max value of all columns of one 
blocklet Bit-Packed
 }
 
 /**
-* Index of one blocklet
-**/
+ * Index of one blocklet
+ */
 struct BlockletIndex{
 1: optional BlockletMinMaxIndex min_max_index;
 2: optional BlockletBTreeIndex b_tree_index;
 }
 
 /**
-* Sort state of one column
-*/
+ * Sort state of one column
+ */
 

[04/12] incubator-carbondata git commit: [CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files This closes #729

[ravipesala]

[CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files 
This closes #729


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

Branch: refs/heads/branch-1.1
Commit: 5c4868e0df07bc0c04c8da45f37d42fcbcd4639f
Parents: 4d0d2d6 970dfd9
Author: ravipesala 
Authored: Tue Apr 4 18:07:24 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 18:07:24 2017 +0530

--
 format/src/main/thrift/carbondata.thrift| 190 ++-
 format/src/main/thrift/carbondata_index.thrift  |  40 ++--
 format/src/main/thrift/dictionary.thrift|  30 ++-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 ++-
 format/src/main/thrift/schema.thrift| 100 +-
 format/src/main/thrift/sort_index.thrift|  32 ++--
 6 files changed, 208 insertions(+), 214 deletions(-)
--

[10/12] incubator-carbondata git commit: [CARBONDATA-849] Correcting the error message for alter table as per HIVE message for non existing table. This closes #725

[ravipesala]

[CARBONDATA-849] Correcting the error message for alter table as per HIVE 
message for non existing table. This closes #725


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

Branch: refs/heads/branch-1.1
Commit: bd044c20895e338884ceeb6ba4bdd5fb15649201
Parents: c62b299 8245e5d
Author: ravipesala 
Authored: Wed Apr 5 13:17:31 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 13:17:31 2017 +0530

--
 .../apache/spark/sql/execution/command/carbonTableSchema.scala| 2 +-
 .../org/apache/spark/sql/execution/command/DDLStrategy.scala  | 3 ++-
 .../scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
--

[05/12] incubator-carbondata git commit: makes trivial change for sync up apache git to github

[ravipesala]

makes trivial change for sync up apache git to github


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

Branch: refs/heads/branch-1.1
Commit: 2c2c7c9660e1deef13b9aae71d94f2a439340ed7
Parents: 5c4868e
Author: chenliang613 
Authored: Tue Apr 4 20:42:44 2017 +0530
Committer: chenliang613 
Committed: Tue Apr 4 20:42:44 2017 +0530

--
 .../scala/org/apache/carbondata/examples/AllDictionaryExample.scala | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/2c2c7c96/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
--
diff --git 
a/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
 
b/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
index df5ee01..9012dcf 100644
--- 
a/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
+++ 
b/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.carbondata.examples
 
 import org.apache.carbondata.core.constants.CarbonCommonConstants

[01/12] incubator-carbondata git commit: add decimal column without scale and precision is failing. [Forced Update!]

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/branch-1.1 d3bb59749 -> 950a6d0f5 (forced update)


add decimal column without scale and precision is failing.


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

Branch: refs/heads/branch-1.1
Commit: f0fe41b9cc1b547062ede9557d6e397e1ce38974
Parents: 3b62d25
Author: nareshpr 
Authored: Thu Mar 30 16:52:51 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 16:27:34 2017 +0530

--
 .../org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala  | 9 ++---
 .../restructure/AlterTableValidationTestCase.scala  | 8 
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f0fe41b9/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
index 8120942..9d2c245 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
@@ -873,9 +873,12 @@ abstract class CarbonDDLSqlParser extends 
AbstractCarbonSparkSQLParser {
* Matching the decimal(10,0) data type and returning the same.
*/
   private lazy val decimalType =
-  DECIMAL ~ ("(" ~> numericLit <~ ",") ~ (numericLit <~ ")") ^^ {
-case decimal ~ precision ~ scale =>
-  s"$decimal($precision, $scale)"
+  DECIMAL ~ (("(" ~> numericLit <~ ",") ~ (numericLit <~ ")")).? ^^ {
+case decimal ~ precisionAndScale => if (precisionAndScale.isDefined) {
+  s"$decimal(${ precisionAndScale.get._1 }, ${ precisionAndScale.get._2 })"
+} else {
+  s"$decimal(10,0)"
+}
   }
 
   protected lazy val nestedType: Parser[Field] = structFieldType | 
arrayFieldType |

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f0fe41b9/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
--
diff --git 
a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
 
b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
index 0a59497..bd34913 100644
--- 
a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
+++ 
b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
@@ -104,6 +104,14 @@ class AlterTableValidationTestCase extends QueryTest with 
BeforeAndAfterAll {
 checkExistence(sql("desc restructure"), true, "dcmldecimal(5,4)")
   }
 
+  test(
+"test add decimal without scale and precision, default precision and scale 
(10,0) should be " +
+"used")
+  {
+sql("alter table restructure add columns(dcmldefault decimal)")
+checkExistence(sql("desc restructure"), true, "dcmldefaultdecimal(10,0)")
+  }
+
   test("test adding existing measure as dimension") {
 sql("alter table restructure add columns(dcmlfld decimal(5,4))")
 try {

incubator-carbondata git commit: [maven-release-plugin] prepare release apache-carbondata-1.1.0-incubating-rc1

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/branch-1.1 950a6d0f5 -> bf227081b


[maven-release-plugin] prepare release apache-carbondata-1.1.0-incubating-rc1


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

Branch: refs/heads/branch-1.1
Commit: bf227081b8c9b0c1eb0839f0f3a49c392baa84d7
Parents: 950a6d0
Author: ravipesala 
Authored: Wed Apr 5 15:34:37 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 15:34:37 2017 +0530

--
 assembly/pom.xml  | 2 +-
 common/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 examples/flink/pom.xml| 2 +-
 examples/spark/pom.xml| 2 +-
 examples/spark2/pom.xml   | 2 +-
 format/pom.xml| 2 +-
 hadoop/pom.xml| 2 +-
 integration/spark-common-test/pom.xml | 2 +-
 integration/spark-common/pom.xml  | 2 +-
 integration/spark/pom.xml | 2 +-
 integration/spark2/pom.xml| 2 +-
 pom.xml   | 4 ++--
 processing/pom.xml| 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c1b51f6..4d5f2dd 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 91dcb1f..71561b0 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 976f8d2..b589328 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/examples/flink/pom.xml
--
diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml
index d3e8997..5164315 100644
--- a/examples/flink/pom.xml
+++ b/examples/flink/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/examples/spark/pom.xml
--
diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
index 3b65185..10bdb93 100644
--- a/examples/spark/pom.xml
+++ b/examples/spark/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/examples/spark2/pom.xml
--
diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml
index 10c59e7..d28f606 100644
--- a/examples/spark2/pom.xml
+++ b/examples/spark2/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/format/pom.xml
--
diff --git a/format/pom.xml b/format/pom.xml
index c6c4b2a..a47b45b 100644
--- a/format/pom.xml
+++ b/format/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating-SNAPSHOT
+1.1.0-incubating
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/bf227081/hadoop/pom.xml
--
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index e62fa20..a31df27 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ 

[incubator-carbondata] Git Push Summary

[ravipesala]

Repository: incubator-carbondata
Updated Tags:  refs/tags/apache-carbondata-1.1.0-incubating-rc1 [created] 
647344ff0

incubator-carbondata git commit: [maven-release-plugin] prepare for next development iteration

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/branch-1.1 bf227081b -> 8e50b878f


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/branch-1.1
Commit: 8e50b878f8338306b68a8b735bea37ce71c97b3d
Parents: bf22708
Author: ravipesala 
Authored: Wed Apr 5 15:37:41 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 15:37:41 2017 +0530

--
 assembly/pom.xml  | 2 +-
 common/pom.xml| 2 +-
 core/pom.xml  | 2 +-
 examples/flink/pom.xml| 2 +-
 examples/spark/pom.xml| 2 +-
 examples/spark2/pom.xml   | 2 +-
 format/pom.xml| 2 +-
 hadoop/pom.xml| 2 +-
 integration/spark-common-test/pom.xml | 2 +-
 integration/spark-common/pom.xml  | 2 +-
 integration/spark/pom.xml | 2 +-
 integration/spark2/pom.xml| 2 +-
 pom.xml   | 4 ++--
 processing/pom.xml| 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4d5f2dd..fdcc9b1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/common/pom.xml
--
diff --git a/common/pom.xml b/common/pom.xml
index 71561b0..56ad112 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index b589328..4ed5b1f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/examples/flink/pom.xml
--
diff --git a/examples/flink/pom.xml b/examples/flink/pom.xml
index 5164315..4b7b4d9 100644
--- a/examples/flink/pom.xml
+++ b/examples/flink/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/examples/spark/pom.xml
--
diff --git a/examples/spark/pom.xml b/examples/spark/pom.xml
index 10bdb93..6cb5547 100644
--- a/examples/spark/pom.xml
+++ b/examples/spark/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/examples/spark2/pom.xml
--
diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml
index d28f606..df0a741 100644
--- a/examples/spark2/pom.xml
+++ b/examples/spark2/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/format/pom.xml
--
diff --git a/format/pom.xml b/format/pom.xml
index a47b45b..a0d69eb 100644
--- a/format/pom.xml
+++ b/format/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.carbondata
 carbondata-parent
-1.1.0-incubating
+1.1.1-incubating-SNAPSHOT
 ../pom.xml
   
 

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8e50b878/hadoop/pom.xml
--
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index a31df27..7b840b9 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -22,7 +22,7 @@
 

[07/13] incubator-carbondata git commit: CARBONDATA-843 problem: null pointer exception was thrown when floor operation is done on decimal column. analysis: when floor operation was done on decimal co

[jackylk]

CARBONDATA-843
problem: null pointer exception was thrown when floor operation is done on 
decimal column.
analysis: when floor operation was done on decimal column, scale was greater 
than precision.During floor operation , we tried to change the precision of the 
data.
solution: When sending to the spark layer for performing floor operation, we 
need to send the precision and scale to the spark layer which are taken from 
the CarbonMeasure


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

Branch: refs/heads/12-dev
Commit: 43319298eb122846286e16fdbd145594e4633aa4
Parents: 9e721a8
Author: akash 
Authored: Fri Mar 31 18:10:31 2017 +0530
Committer: jackylk 
Committed: Wed Apr 5 09:46:56 2017 +0800

--
 .../core/scan/collector/impl/AbstractScannedResultCollector.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/43319298/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 c46d46c..1ecfbc8 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
@@ -106,7 +106,8 @@ public abstract class AbstractScannedResultCollector 
implements ScannedResultCol
 bigDecimalMsrValue =
 bigDecimalMsrValue.setScale(carbonMeasure.getScale(), 
RoundingMode.HALF_UP);
   }
-  return org.apache.spark.sql.types.Decimal.apply(bigDecimalMsrValue);
+  return org.apache.spark.sql.types.Decimal
+  .apply(bigDecimalMsrValue, carbonMeasure.getPrecision(), 
carbonMeasure.getScale());
 default:
   return 
dataChunk.getMeasureDataHolder().getReadableDoubleValueByIndex(index);
   }

[11/13] incubator-carbondata git commit: refactor write step

[jackylk]

refactor write step


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

Branch: refs/heads/12-dev
Commit: 8cca0afc5db16557146dfaa33e14c2823d895966
Parents: bd044c2
Author: jackylk 
Authored: Thu Mar 30 11:21:21 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:36:47 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
index 789c321..b82d53c 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
@@ -631,7 +631,7 @@ public final class CarbonCommonConstants {
   /**
* DOUBLE_VALUE_MEASURE
*/
-  public static final char SUM_COUNT_VALUE_MEASURE = 'n';
+  public static final char DOUBLE_MEASURE = 'n';
   /**
* BYTE_VALUE_MEASURE
*/

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
 
b/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
deleted file mode 100644
index 2f54847..000
--- 
a/core/src/main/java/org/apache/carbondata/core/datastore/NodeMeasureDataStore.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.carbondata.core.datastore;
-
-import org.apache.carbondata.core.datastore.dataholder.CarbonWriteDataHolder;
-
-public interface NodeMeasureDataStore {
-  /**
-   * This method will be used to get the writable key array.
-   * writable measure data array will hold below information:
-   * 
-   * total length will be 4 bytes for size + measure data array length
-   *
-   * @return writable array (compressed or normal)
-   */
-  byte[][] getWritableMeasureDataArray(CarbonWriteDataHolder[] 
dataHolderArray);
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8cca0afc/core/src/main/java/org/apache/carbondata/core/datastore/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java

[02/13] incubator-carbondata git commit: [CARBONDATA-838]Add decimal column without scale and precision is failing. This closes #713

[jackylk]

[CARBONDATA-838]Add decimal column without scale and precision is failing. This 
closes #713


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

Branch: refs/heads/12-dev
Commit: 4d0d2d600fe8271817e43e109878caf51394b888
Parents: 3b62d25 f0fe41b
Author: ravipesala 
Authored: Tue Apr 4 16:28:14 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 16:28:14 2017 +0530

--
 .../org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala  | 9 ++---
 .../restructure/AlterTableValidationTestCase.scala  | 8 
 2 files changed, 14 insertions(+), 3 deletions(-)
--

[05/13] incubator-carbondata git commit: makes trivial change for sync up apache git to github

[jackylk]

makes trivial change for sync up apache git to github


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

Branch: refs/heads/12-dev
Commit: 2c2c7c9660e1deef13b9aae71d94f2a439340ed7
Parents: 5c4868e
Author: chenliang613 
Authored: Tue Apr 4 20:42:44 2017 +0530
Committer: chenliang613 
Committed: Tue Apr 4 20:42:44 2017 +0530

--
 .../scala/org/apache/carbondata/examples/AllDictionaryExample.scala | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/2c2c7c96/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
--
diff --git 
a/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
 
b/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
index df5ee01..9012dcf 100644
--- 
a/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
+++ 
b/examples/spark/src/main/scala/org/apache/carbondata/examples/AllDictionaryExample.scala
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.carbondata.examples
 
 import org.apache.carbondata.core.constants.CarbonCommonConstants

[03/13] incubator-carbondata git commit: [CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files

[jackylk]

[CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files

fix comments


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

Branch: refs/heads/12-dev
Commit: 970dfd99fbb36940c8feb0de07bed503ec859a41
Parents: 4d0d2d6
Author: chenliang613 
Authored: Tue Apr 4 15:53:48 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 18:06:50 2017 +0530

--
 format/src/main/thrift/carbondata.thrift| 190 ++-
 format/src/main/thrift/carbondata_index.thrift  |  40 ++--
 format/src/main/thrift/dictionary.thrift|  30 ++-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 ++-
 format/src/main/thrift/schema.thrift| 100 +-
 format/src/main/thrift/sort_index.thrift|  32 ++--
 6 files changed, 208 insertions(+), 214 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/970dfd99/format/src/main/thrift/carbondata.thrift
--
diff --git a/format/src/main/thrift/carbondata.thrift 
b/format/src/main/thrift/carbondata.thrift
index 21ff29d..937108c 100644
--- a/format/src/main/thrift/carbondata.thrift
+++ b/format/src/main/thrift/carbondata.thrift
@@ -1,24 +1,22 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
- * File format description for the carbon file format
+ * File format description for the CarbonData file format
  */
 namespace java org.apache.carbondata.format
 
@@ -26,40 +24,40 @@ include "schema.thrift"
 include "dictionary.thrift"
 
 /**
-* Information about a segment, that represents one data load
-*/
+ * Information about a segment, that represents one data load
+ */
 struct SegmentInfo{
-1: required i32 num_cols; // Number of columns in this load, because 
schema can evolve . TODO: Check whether this is really required
+1: required i32 num_cols; // Number of columns in this load, because 
schema can evolve, different segments may have different columns
 2: required list column_cardinalities; // Cardinality of columns
 }
 
 /**
-*  Btree index of one blocklet
-*/
+ * Btree index of one blocklet
+ */
 struct BlockletBTreeIndex{
 1: required binary start_key; // Bit-packed start key of one blocklet
-2: required binary end_key;// Bit-packed start key of one blocklet
+2: required binary end_key;// Bit-packed end key of one blocklet
 }
 
 /**
-*  Min-max index of one blocklet
-*/
+ * Min-max index of one blocklet
+ */
 struct BlockletMinMaxIndex{
 1: required list min_values; //Min value of all columns of one 
blocklet Bit-Packed
 2: required list max_values; //Max value of all columns of one 
blocklet Bit-Packed
 }
 
 /**
-* Index of one blocklet
-**/
+ * Index of one blocklet
+ */
 struct BlockletIndex{
 1: optional BlockletMinMaxIndex min_max_index;
 2: optional BlockletBTreeIndex b_tree_index;
 }
 
 /**
-* Sort state of one column
-*/
+ * Sort state of one column
+ */
 enum 

[04/13] incubator-carbondata git commit: [CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files This closes #729

[jackylk]

[CARBONDATA-850] Fix the comment definition issues of CarbonData thrift files 
This closes #729


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

Branch: refs/heads/12-dev
Commit: 5c4868e0df07bc0c04c8da45f37d42fcbcd4639f
Parents: 4d0d2d6 970dfd9
Author: ravipesala 
Authored: Tue Apr 4 18:07:24 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 18:07:24 2017 +0530

--
 format/src/main/thrift/carbondata.thrift| 190 ++-
 format/src/main/thrift/carbondata_index.thrift  |  40 ++--
 format/src/main/thrift/dictionary.thrift|  30 ++-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 ++-
 format/src/main/thrift/schema.thrift| 100 +-
 format/src/main/thrift/sort_index.thrift|  32 ++--
 6 files changed, 208 insertions(+), 214 deletions(-)
--

[06/13] incubator-carbondata git commit: makes trivial change for sync up apache git to github

[jackylk]

makes trivial change for sync up apache git to github


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

Branch: refs/heads/12-dev
Commit: 9e721a81beb970c72f64c14615d8d5bddbf74de2
Parents: 5c4868e 2c2c7c9
Author: chenliang613 
Authored: Tue Apr 4 20:44:09 2017 +0530
Committer: chenliang613 
Committed: Tue Apr 4 20:44:09 2017 +0530

--
 .../scala/org/apache/carbondata/examples/AllDictionaryExample.scala | 1 +
 1 file changed, 1 insertion(+)
--

[08/13] incubator-carbondata git commit: [CARBONDATA-843]null pointer exception was thrown when floor operation is done on decimal column This closes #718

[jackylk]

[CARBONDATA-843]null pointer exception was thrown when floor operation is done 
on decimal column This closes #718


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

Branch: refs/heads/12-dev
Commit: c62b29979c38b8c30c2169a98b0f204ccae93d07
Parents: 9e721a8 4331929
Author: jackylk 
Authored: Wed Apr 5 09:48:32 2017 +0800
Committer: jackylk 
Committed: Wed Apr 5 09:48:32 2017 +0800

--
 .../core/scan/collector/impl/AbstractScannedResultCollector.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[12/13] incubator-carbondata git commit: [CARBONDATA-823] Refactory data write step This closes #702

[jackylk]

[CARBONDATA-823] Refactory data write step This closes #702


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

Branch: refs/heads/12-dev
Commit: 950a6d0f5ab8323aa0feedda48c8c95b323975c8
Parents: bd044c2 8cca0af
Author: ravipesala 
Authored: Wed Apr 5 14:37:18 2017 +0530
Committer: ravipesala 
Committed: Wed Apr 5 14:37:18 2017 +0530

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 19 files changed, 287 insertions(+), 338 deletions(-)
--

[01/13] incubator-carbondata git commit: add decimal column without scale and precision is failing.

[jackylk]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/12-dev 5763f8c60 -> 3f19978c0


add decimal column without scale and precision is failing.


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

Branch: refs/heads/12-dev
Commit: f0fe41b9cc1b547062ede9557d6e397e1ce38974
Parents: 3b62d25
Author: nareshpr 
Authored: Thu Mar 30 16:52:51 2017 +0530
Committer: ravipesala 
Committed: Tue Apr 4 16:27:34 2017 +0530

--
 .../org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala  | 9 ++---
 .../restructure/AlterTableValidationTestCase.scala  | 8 
 2 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f0fe41b9/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
index 8120942..9d2c245 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
@@ -873,9 +873,12 @@ abstract class CarbonDDLSqlParser extends 
AbstractCarbonSparkSQLParser {
* Matching the decimal(10,0) data type and returning the same.
*/
   private lazy val decimalType =
-  DECIMAL ~ ("(" ~> numericLit <~ ",") ~ (numericLit <~ ")") ^^ {
-case decimal ~ precision ~ scale =>
-  s"$decimal($precision, $scale)"
+  DECIMAL ~ (("(" ~> numericLit <~ ",") ~ (numericLit <~ ")")).? ^^ {
+case decimal ~ precisionAndScale => if (precisionAndScale.isDefined) {
+  s"$decimal(${ precisionAndScale.get._1 }, ${ precisionAndScale.get._2 })"
+} else {
+  s"$decimal(10,0)"
+}
   }
 
   protected lazy val nestedType: Parser[Field] = structFieldType | 
arrayFieldType |

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/f0fe41b9/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
--
diff --git 
a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
 
b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
index 0a59497..bd34913 100644
--- 
a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
+++ 
b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/AlterTableValidationTestCase.scala
@@ -104,6 +104,14 @@ class AlterTableValidationTestCase extends QueryTest with 
BeforeAndAfterAll {
 checkExistence(sql("desc restructure"), true, "dcmldecimal(5,4)")
   }
 
+  test(
+"test add decimal without scale and precision, default precision and scale 
(10,0) should be " +
+"used")
+  {
+sql("alter table restructure add columns(dcmldefault decimal)")
+checkExistence(sql("desc restructure"), true, "dcmldefaultdecimal(10,0)")
+  }
+
   test("test adding existing measure as dimension") {
 sql("alter table restructure add columns(dcmlfld decimal(5,4))")
 try {

[13/13] incubator-carbondata git commit: Merge branch 'master' of https://github.com/apache/incubator-carbondata into 12-dev

[jackylk]

Merge branch 'master' of https://github.com/apache/incubator-carbondata into 
12-dev


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

Branch: refs/heads/12-dev
Commit: 3f19978c01f1c043a1a675125697f8f523f65fa2
Parents: 5763f8c 950a6d0
Author: jackylk 
Authored: Wed Apr 5 21:38:07 2017 +0800
Committer: jackylk 
Committed: Wed Apr 5 21:38:07 2017 +0800

--
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java|  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java|  57 
 .../impl/AbstractScannedResultCollector.java|   3 +-
 .../core/util/CarbonMetadataUtil.java   |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java  |   5 +-
 .../examples/AllDictionaryExample.scala |   1 +
 format/src/main/thrift/carbondata.thrift| 190 +--
 format/src/main/thrift/carbondata_index.thrift  |  40 ++-
 format/src/main/thrift/dictionary.thrift|  30 +-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 +-
 format/src/main/thrift/schema.thrift| 100 +++---
 format/src/main/thrift/sort_index.thrift|  32 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |   9 +-
 .../execution/command/carbonTableSchema.scala   |   2 +-
 .../sql/execution/command/DDLStrategy.scala |   3 +-
 .../sql/parser/CarbonSpark2SqlParser.scala  |   3 +
 .../AlterTableValidationTestCase.scala  |   8 +
 .../sort/unsafe/UnsafeCarbonRowPage.java|   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java|   2 +-
 .../sortdata/IntermediateFileMerger.java|   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java   |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java| 328 +++
 .../processing/store/StoreFactory.java  |  33 --
 .../store/writer/CarbonFactDataWriter.java  |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 32 files changed, 518 insertions(+), 558 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeCarbonRowPage.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
--

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortTempFileChunkHolder.java
--

[2/2] incubator-carbondata git commit: [CARBONDATA-863] Support creation and deletion of dictionary files through RDD during alter add and drop This closes #733

[ravipesala]

[CARBONDATA-863] Support creation and deletion of dictionary files through RDD 
during alter add and drop This closes #733


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

Branch: refs/heads/master
Commit: 65e6791873c019370eed54d164b69db6941e034d
Parents: 4a7adfa b5ba4c6
Author: ravipesala 
Authored: Thu Apr 6 10:54:16 2017 +0530
Committer: ravipesala 
Committed: Thu Apr 6 10:54:16 2017 +0530

--
 .../core/cache/dictionary/ManageDictionary.java |  85 +++---
 .../spark/rdd/AlterTableAddColumnRDD.scala  | 110 +++
 .../spark/rdd/AlterTableDropColumnRDD.scala |  96 
 .../execution/command/carbonTableSchema.scala   |  21 ++--
 .../execution/command/AlterTableCommands.scala  |  48 +---
 5 files changed, 286 insertions(+), 74 deletions(-)
--

[1/2] incubator-carbondata git commit: Changes done: 1. Clean up of folders created locally during data load and insert into operations. 2. Setting the load status properly for success, partial succes

[ravipesala]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/master ada081d89 -> 4a7adfa97


Changes done:
1. Clean up of folders created locally during data load and insert into 
operations.
2. Setting the load status properly for success, partial success and failure 
cases.
3. Printing load statistics in case of success and partial success.


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

Branch: refs/heads/master
Commit: 487e41ddd13d9e19813cc1b9c4eda73376f1c8ba
Parents: ada081d
Author: manishgupta88 
Authored: Wed Apr 5 19:04:14 2017 +0530
Committer: ravipesala 
Committed: Thu Apr 6 10:33:07 2017 +0530

--
 .../carbondata/spark/load/CarbonLoaderUtil.java | 30 
 .../spark/rdd/NewCarbonDataLoadRDD.scala| 30 
 2 files changed, 49 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/487e41dd/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
--
diff --git 
a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
 
b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
index cc16398..95f0b10 100644
--- 
a/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
+++ 
b/integration/spark-common/src/main/java/org/apache/carbondata/spark/load/CarbonLoaderUtil.java
@@ -36,6 +36,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import org.apache.carbondata.common.logging.LogService;
 import org.apache.carbondata.common.logging.LogServiceFactory;
@@ -171,13 +174,30 @@ public final class CarbonLoaderUtil {
   tempLocationKey = CarbonCommonConstants.COMPACTION_KEY_WORD + '_' + 
tempLocationKey;
 }
 // form local store location
-String localStoreLocation = CarbonProperties.getInstance()
+final String localStoreLocation = CarbonProperties.getInstance()
 .getProperty(tempLocationKey, 
CarbonCommonConstants.STORE_LOCATION_DEFAULT_VAL);
+// submit local folder clean up in another thread so that main thread 
execution is not blocked
+ExecutorService localFolderDeletionService = 
Executors.newFixedThreadPool(1);
 try {
-  CarbonUtil.deleteFoldersAndFiles(new 
File(localStoreLocation).getParentFile());
-  LOGGER.info("Deleted the local store location" + localStoreLocation);
-} catch (IOException | InterruptedException e) {
-  LOGGER.error(e, "Failed to delete local data load folder location");
+  localFolderDeletionService.submit(new Callable() {
+@Override public Void call() throws Exception {
+  try {
+long startTime = System.currentTimeMillis();
+File file = new File(localStoreLocation);
+CarbonUtil.deleteFoldersAndFiles(file.getParentFile());
+LOGGER.info(
+"Deleted the local store location" + localStoreLocation + " : 
TIme taken: " + (
+System.currentTimeMillis() - startTime));
+  } catch (IOException | InterruptedException e) {
+LOGGER.error(e, "Failed to delete local data load folder 
location");
+  }
+  return null;
+}
+  });
+} finally {
+  if (null != localFolderDeletionService) {
+localFolderDeletionService.shutdown();
+  }
 }
 
   }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/487e41dd/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
--
diff --git 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
index 0690ba1..72ee90f 100644
--- 
a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
+++ 
b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/NewCarbonDataLoadRDD.scala
@@ -223,7 +223,7 @@ class NewCarbonDataLoadRDD[K, V](
 carbonLoadModel.getTableName + CarbonCommonConstants.UNDERSCORE + 
theSplit.index
   try {
 

[1/2] incubator-carbondata git commit: add hive integration for carbon

[chenliang613]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/hive 4d0d2d600 -> 8e753a85b


add hive integration for carbon

add hive integration to assembly

alter CarbonInputFormat to implement mapred.InputFormat

add a hive serde for carbon

add hive integration to assembly

fix error in getQueryModel

add debug info

add debug info

add debug info

add debug info

fix error in CarbonRecordReader

use ArrayWritable for CarbonRecordReader

fix error in initializing CarbonRecordReader

fix error in initializing CarbonRecordReader

fix error in initializing CarbonRecordReader

fix error in initializing CarbonRecordReader

修改InputFormat的返回值

把需要查的列设置到carbon里去

fix nullpoint exception

add catalyst depedency

add catalyst depedency

add catalyst depedency

fix error in intializing carbon error

add a new hive carbon recordreader

添加把object序列化成ArrayWritable的代码

short/int等数据类型在Carbon当中实际上是Long类型

use right inspector

use right inspector

fix long can't cast int error

fix decimal cast error

column size is not equal to column type

column size is not equal to column type

column size is not equal to column type

column size is not equal to column type

fix ObjInspector error

fix ObjInspector error

fix ObjInspector error

add a new hive input split

should not combine path

add support for timestamp

clean codes

remove unused codes

support Date and TimeStamp type

add basic hive integration

alter code style

alter code style

alter code style

alter code style

change create table statement

alter CarbonSerde test case

alter CarbonSerde test case

add carbondata-hive to test classpath

add carbondata-hive to test classpath

use hive compatible schema

exclude kryo

exclude kryo

make a new profile for hive 1.2.1

remove carbon-hive from parent and assembly pom

use groupId to apache hive in pom.xml

remote hadoop-yarn-api, but HadoopFileExample will throw exception when 
debugging in IDEA

change profile name

add quick start guide for basic hive integration module

add private for properties

add some params for hive to read subdirectories recursively


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

Branch: refs/heads/hive
Commit: 96aeee85ddd1c5cc8a792d8cd749cfe7ff72d6b8
Parents: 4d0d2d6
Author: cenyuhai 
Authored: Sun Mar 12 23:17:40 2017 +0800
Committer: chenliang613 
Committed: Thu Apr 6 10:48:48 2017 +0530

--
 dev/java-code-format-template.xml   |   2 +-
 .../carbondata/hadoop/CarbonInputFormat.java|   2 +-
 .../carbondata/hadoop/CarbonRecordReader.java   |   8 +-
 integration/hive/hive-guide.md  | 106 +++
 integration/hive/pom.xml| 114 
 .../carbondata/hive/CarbonArrayInspector.java   | 192 
 .../carbondata/hive/CarbonHiveInputSplit.java   | 290 +++
 .../carbondata/hive/CarbonHiveRecordReader.java | 249 
 .../apache/carbondata/hive/CarbonHiveSerDe.java | 231 +++
 .../carbondata/hive/CarbonObjectInspector.java  | 221 ++
 .../hive/CarbonStorageFormatDescriptor.java |  47 +++
 .../hive/MapredCarbonInputFormat.java   |  99 +++
 .../hive/MapredCarbonOutputFormat.java  |  49 
 ...he.hadoop.hive.ql.io.StorageFormatDescriptor |   1 +
 .../apache/carbondata/hive/TestCarbonSerde.java | 133 +
 pom.xml |  17 ++
 16 files changed, 1755 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/96aeee85/dev/java-code-format-template.xml
--
diff --git a/dev/java-code-format-template.xml 
b/dev/java-code-format-template.xml
index d117313..b39ef1e 100644
--- a/dev/java-code-format-template.xml
+++ b/dev/java-code-format-template.xml
@@ -34,8 +34,8 @@
   
 
   
-  
   
+  
   
   
   

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/96aeee85/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
--
diff --git 
a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java 
b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
index b330f12..40f5f2c 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonInputFormat.java
+++ 

[2/2] incubator-carbondata git commit: [CARBONDATA-815] add hive integration for carbon This closes #740

[chenliang613]

[CARBONDATA-815] add hive integration for carbon This closes #740


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

Branch: refs/heads/hive
Commit: 8e753a85b8d5373e8907368d70f2aff2a0084882
Parents: 4d0d2d6 96aeee8
Author: chenliang613 
Authored: Thu Apr 6 10:56:48 2017 +0530
Committer: chenliang613 
Committed: Thu Apr 6 10:56:48 2017 +0530

--
 dev/java-code-format-template.xml   |   2 +-
 .../carbondata/hadoop/CarbonInputFormat.java|   2 +-
 .../carbondata/hadoop/CarbonRecordReader.java   |   8 +-
 integration/hive/hive-guide.md  | 106 +++
 integration/hive/pom.xml| 114 
 .../carbondata/hive/CarbonArrayInspector.java   | 192 
 .../carbondata/hive/CarbonHiveInputSplit.java   | 290 +++
 .../carbondata/hive/CarbonHiveRecordReader.java | 249 
 .../apache/carbondata/hive/CarbonHiveSerDe.java | 231 +++
 .../carbondata/hive/CarbonObjectInspector.java  | 221 ++
 .../hive/CarbonStorageFormatDescriptor.java |  47 +++
 .../hive/MapredCarbonInputFormat.java   |  99 +++
 .../hive/MapredCarbonOutputFormat.java  |  49 
 ...he.hadoop.hive.ql.io.StorageFormatDescriptor |   1 +
 .../apache/carbondata/hive/TestCarbonSerde.java | 133 +
 pom.xml |  17 ++
 16 files changed, 1755 insertions(+), 6 deletions(-)
--

[2/2] incubator-carbondata git commit: [CARBONDATA-845] Insert Select Into Same Table This closes #723

[ravipesala]

[CARBONDATA-845] Insert Select Into Same Table This closes #723


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

Branch: refs/heads/master
Commit: ada081d89be67ad28c31401acb71a84e3e97244a
Parents: 950a6d0 f527d3d
Author: ravipesala 
Authored: Thu Apr 6 10:18:50 2017 +0530
Committer: ravipesala 
Committed: Thu Apr 6 10:18:50 2017 +0530

--
 .../InsertIntoCarbonTableTestCase.scala | 28 +
 .../spark/sql/hive/CarbonAnalysisRules.scala| 43 +++---
 .../spark/sql/CarbonCatalystOperators.scala | 19 +++
 .../sql/CarbonDatasourceHadoopRelation.scala| 13 +
 .../sql/execution/command/DDLStrategy.scala |  5 +-
 .../execution/command/carbonTableSchema.scala   |  3 +-
 .../spark/sql/hive/CarbonAnalysisRules.scala| 60 
 .../spark/sql/hive/CarbonSessionState.scala | 30 +-
 8 files changed, 163 insertions(+), 38 deletions(-)
--

[1/2] incubator-carbondata git commit: no_sort_columns

[jackylk]

Repository: incubator-carbondata
Updated Branches:
  refs/heads/12-dev 3f19978c0 -> dccd2ad0d


no_sort_columns

fix comments


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

Branch: refs/heads/12-dev
Commit: dbd0cdd900e491d1e780ff6b84dbbabf781cf9c3
Parents: 3f19978
Author: QiangCai 
Authored: Mon Apr 3 00:42:55 2017 +0530
Committer: jackylk 
Committed: Wed Apr 5 21:44:56 2017 +0800

--
 .../core/datastore/block/SegmentProperties.java |  22 ++-
 .../impl/btree/BTreeDataRefNodeFinder.java  |  24 +--
 .../core/metadata/schema/table/CarbonTable.java |   4 -
 .../scan/filter/FilterExpressionProcessor.java  |   4 +-
 .../carbondata/core/scan/filter/FilterUtil.java |   8 +-
 ...velRangeLessThanEqualFilterExecuterImpl.java |   2 +-
 .../RowLevelRangeLessThanFiterExecuterImpl.java |   2 +-
 .../AbstractDetailQueryResultIterator.java  |   4 +-
 .../apache/carbondata/core/util/CarbonUtil.java |  18 +++
 .../impl/btree/BTreeBlockFinderTest.java|  10 +-
 .../carbondata/hadoop/CarbonInputFormat.java|   4 +-
 .../internal/index/impl/InMemoryBTreeIndex.java |   4 +-
 .../hadoop/util/BlockLevelTraverser.java|   4 +-
 .../testsuite/sortcolumns/TestSortColumns.scala |  79 ++
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |  11 +-
 .../org/apache/spark/sql/TableCreator.scala |  11 +-
 .../newflow/CarbonDataLoadConfiguration.java|   4 +
 .../newflow/DataLoadProcessBuilder.java |  22 +--
 .../newflow/steps/NoSortProcessorStepImpl.java  | 153 +++
 .../store/CarbonFactDataHandlerModel.java   |   7 +
 20 files changed, 350 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/dbd0cdd9/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java
--
diff --git 
a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java
 
b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java
index 3bef423..80785e0 100644
--- 
a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java
+++ 
b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java
@@ -55,6 +55,14 @@ public class SegmentProperties {
   private KeyGenerator dimensionKeyGenerator;
 
   /**
+   * key generator which was used to generate the mdkey for dimensions in 
SORT_COLUMNS
+   * if SORT_COLUMNS contains all dimensions, it is same with 
dimensionKeyGenerator
+   * otherwise, it is different with dimensionKeyGenerator, the number of its 
dimensions is less
+   * than dimensionKeyGenerator.
+   */
+  private KeyGenerator sortColumnsGenerator;
+
+  /**
* list of dimension present in the block
*/
   private List dimensions;
@@ -522,6 +530,14 @@ public class SegmentProperties {
 int[] bitLength = CarbonUtil.getDimensionBitLength(dimColumnsCardinality, 
dimensionPartitions);
 // create a key generator
 this.dimensionKeyGenerator = new MultiDimKeyVarLengthGenerator(bitLength);
+if (this.getNumberOfDictSortColumns() == bitLength.length) {
+  this.sortColumnsGenerator = this.dimensionKeyGenerator;
+} else {
+  int numberOfDictSortColumns = this.getNumberOfDictSortColumns();
+  int [] sortColumnBitLength = new int[numberOfDictSortColumns];
+  System.arraycopy(bitLength, 0, sortColumnBitLength, 0, 
numberOfDictSortColumns);
+  this.sortColumnsGenerator = new 
MultiDimKeyVarLengthGenerator(sortColumnBitLength);
+}
 this.fixedLengthKeySplitter =
 new MultiDimKeyVarLengthVariableSplitGenerator(bitLength, 
dimensionPartitions);
 // get the size of each value in file block
@@ -647,6 +663,10 @@ public class SegmentProperties {
 return dimensionKeyGenerator;
   }
 
+  public KeyGenerator getSortColumnsGenerator() {
+return sortColumnsGenerator;
+  }
+
   /**
* @return the dimensions
*/
@@ -817,6 +837,6 @@ public class SegmentProperties {
   }
 
   public int getNumberOfDictSortColumns() {
-return this.numberOfSortColumns - this.numberOfNoDictionaryDimension;
+return this.numberOfSortColumns - this.numberOfNoDictSortColumns;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/dbd0cdd9/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeDataRefNodeFinder.java
--
diff --git 

[2/2] incubator-carbondata git commit: [CARBONDATA-782]support unsorted table (when SORT_COLUMNS is empty) This closes #722

[jackylk]

[CARBONDATA-782]support unsorted table (when SORT_COLUMNS is empty)  This 
closes #722


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

Branch: refs/heads/12-dev
Commit: dccd2ad0d0909561bbe5433b28be5012ae8f6425
Parents: 3f19978 dbd0cdd
Author: jackylk 
Authored: Wed Apr 5 21:46:16 2017 +0800
Committer: jackylk 
Committed: Wed Apr 5 21:46:16 2017 +0800

--
 .../core/datastore/block/SegmentProperties.java |  22 ++-
 .../impl/btree/BTreeDataRefNodeFinder.java  |  24 +--
 .../core/metadata/schema/table/CarbonTable.java |   4 -
 .../scan/filter/FilterExpressionProcessor.java  |   4 +-
 .../carbondata/core/scan/filter/FilterUtil.java |   8 +-
 ...velRangeLessThanEqualFilterExecuterImpl.java |   2 +-
 .../RowLevelRangeLessThanFiterExecuterImpl.java |   2 +-
 .../AbstractDetailQueryResultIterator.java  |   4 +-
 .../apache/carbondata/core/util/CarbonUtil.java |  18 +++
 .../impl/btree/BTreeBlockFinderTest.java|  10 +-
 .../carbondata/hadoop/CarbonInputFormat.java|   4 +-
 .../internal/index/impl/InMemoryBTreeIndex.java |   4 +-
 .../hadoop/util/BlockLevelTraverser.java|   4 +-
 .../testsuite/sortcolumns/TestSortColumns.scala |  79 ++
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |  11 +-
 .../org/apache/spark/sql/TableCreator.scala |  11 +-
 .../newflow/CarbonDataLoadConfiguration.java|   4 +
 .../newflow/DataLoadProcessBuilder.java |  22 +--
 .../newflow/steps/NoSortProcessorStepImpl.java  | 153 +++
 .../store/CarbonFactDataHandlerModel.java   |   7 +
 20 files changed, 350 insertions(+), 47 deletions(-)
--