You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/05/03 05:23:00 UTC
[1/2] incubator-carbondata git commit: fixed cast exception for new
column with date datatype
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 1edabc87a -> 6b01ed646
fixed cast exception for new column with date datatype
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ea5e80cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ea5e80cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ea5e80cf
Branch: refs/heads/master
Commit: ea5e80cf1d1720d716b6ad9e63ac4e6d9141b244
Parents: 1edabc8
Author: kunal642 <ku...@knoldus.in>
Authored: Tue May 2 20:39:09 2017 +0530
Committer: kunal642 <ku...@knoldus.in>
Committed: Tue May 2 20:39:09 2017 +0530
----------------------------------------------------------------------
.../RestructureBasedVectorResultCollector.java | 7 +++++-
.../vectorreader/AddColumnTestCases.scala | 24 +++++++++++++++++++-
2 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea5e80cf/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
index c09ec12..3df4541 100644
--- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
+++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedVectorResultCollector.java
@@ -18,6 +18,7 @@ package org.apache.carbondata.core.scan.collector.impl;
import java.util.List;
+import org.apache.carbondata.core.metadata.datatype.DataType;
import org.apache.carbondata.core.metadata.encoder.Encoding;
import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension;
import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure;
@@ -164,7 +165,11 @@ public class RestructureBasedVectorResultCollector extends DictionaryBasedVector
private void fillDirectDictionaryData(CarbonColumnVector vector,
ColumnVectorInfo columnVectorInfo, Object defaultValue) {
if (null != defaultValue) {
- vector.putLongs(columnVectorInfo.vectorOffset, columnVectorInfo.size, (long) defaultValue);
+ if (columnVectorInfo.directDictionaryGenerator.getReturnType().equals(DataType.INT)) {
+ vector.putInts(columnVectorInfo.vectorOffset, columnVectorInfo.size, (int) defaultValue);
+ } else {
+ vector.putLongs(columnVectorInfo.vectorOffset, columnVectorInfo.size, (long) defaultValue);
+ }
} else {
vector.putNulls(columnVectorInfo.vectorOffset, columnVectorInfo.size);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ea5e80cf/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AddColumnTestCases.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AddColumnTestCases.scala b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AddColumnTestCases.scala
index e341f27..2cec9a5 100644
--- a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AddColumnTestCases.scala
+++ b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/AddColumnTestCases.scala
@@ -18,7 +18,7 @@
package org.apache.spark.carbondata.restructure.vectorreader
import java.math.{BigDecimal, RoundingMode}
-import java.sql.Timestamp
+import java.sql.{Date, Timestamp}
import org.apache.spark.sql.Row
import org.apache.spark.sql.common.util.QueryTest
@@ -309,6 +309,28 @@ class AddColumnTestCases extends QueryTest with BeforeAndAfterAll {
sql("DROP TABLE IF EXISTS alter_decimal_filter")
}
+ test("test add column with date") {
+ sql("DROP TABLE IF EXISTS carbon_table")
+ sql("CREATE TABLE carbon_table(intField int,stringField string,charField string,timestampField timestamp, decimalField decimal(6,2)) STORED BY 'carbondata'")
+ sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/restructure/data1.csv' INTO TABLE carbon_table options('FILEHEADER'='intField,stringField,charField,timestampField,decimalField')")
+ sql(
+ "Alter table carbon_table add columns(newField date) TBLPROPERTIES" +
+ "('DEFAULT.VALUE.newField'='2017-01-01')")
+ checkAnswer(sql("select distinct(newField) from carbon_table"), Row(Date.valueOf("2017-01-01")))
+ sql("DROP TABLE IF EXISTS carbon_table")
+ }
+
+ test("test add column with timestamp") {
+ sql("DROP TABLE IF EXISTS carbon_table")
+ sql("CREATE TABLE carbon_table(intField int,stringField string,charField string,timestampField timestamp, decimalField decimal(6,2)) STORED BY 'carbondata'")
+ sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/restructure/data1.csv' INTO TABLE carbon_table options('FILEHEADER'='intField,stringField,charField,timestampField,decimalField')")
+ sql(
+ "Alter table carbon_table add columns(newField timestamp) TBLPROPERTIES" +
+ "('DEFAULT.VALUE.newField'='01-01-2017 00:00:00.0')")
+ checkAnswer(sql("select distinct(newField) from carbon_table"), Row(Timestamp.valueOf("2017-01-01 00:00:00.0")))
+ sql("DROP TABLE IF EXISTS carbon_table")
+ }
+
override def afterAll {
sql("DROP TABLE IF EXISTS addcolumntest")
sql("drop table if exists hivetable")
[2/2] incubator-carbondata git commit: [CARBONDATA-1011] Fixed cast
exception for new column with date datatype. This closes #874
Posted by ra...@apache.org.
[CARBONDATA-1011] Fixed cast exception for new column with date datatype. This closes #874
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/6b01ed64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/6b01ed64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/6b01ed64
Branch: refs/heads/master
Commit: 6b01ed64621e378ae80ba227638cfbb79cdac91b
Parents: 1edabc8 ea5e80c
Author: ravipesala <ra...@gmail.com>
Authored: Wed May 3 10:52:42 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Wed May 3 10:52:42 2017 +0530
----------------------------------------------------------------------
.../RestructureBasedVectorResultCollector.java | 7 +++++-
.../vectorreader/AddColumnTestCases.scala | 24 +++++++++++++++++++-
2 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------