You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/07/02 09:36:21 UTC

[1/8] carbondata git commit: add test case when record more than one pagesize

Repository: carbondata
Updated Branches:
  refs/heads/encoding_override 28f8a0b37 -> 924f0b7a7


add test case when record more than one pagesize

delete unnecessary test case

add test case for IUD feature

add test case for IUD feature


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

Branch: refs/heads/encoding_override
Commit: 7e2e86e5c156fde3a0fa028a081e4caf2724513c
Parents: 28f8a0b
Author: chenerlu <ch...@huawei.com>
Authored: Thu Jun 29 11:36:10 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Fri Jun 30 20:33:49 2017 +0800

----------------------------------------------------------------------
 .../iud/DeleteCarbonTableTestCase.scala         | 31 ++++++++++++++++++--
 .../iud/UpdateCarbonTableTestCase.scala         |  2 ++
 2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/7e2e86e5/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/DeleteCarbonTableTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/DeleteCarbonTableTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/DeleteCarbonTableTestCase.scala
index 2e59c9c..d24f7b2 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/DeleteCarbonTableTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/DeleteCarbonTableTestCase.scala
@@ -16,12 +16,10 @@
  */
 package org.apache.carbondata.spark.testsuite.iud
 
-import org.apache.spark.sql.Row
+import org.apache.spark.sql.{Row, SaveMode}
 import org.apache.spark.sql.common.util.QueryTest
 import org.scalatest.BeforeAndAfterAll
 
-import org.apache.carbondata.core.constants.CarbonCommonConstants
-import org.apache.carbondata.core.util.CarbonProperties
 
 class DeleteCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
   override def beforeAll {
@@ -105,6 +103,33 @@ class DeleteCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
       Seq(Row(3))
     )
   }
+
+  test("Records more than one pagesize after delete operation ") {
+    sql("DROP TABLE IF EXISTS default.carbon2")
+    import sqlContext.implicits._
+    val df = sqlContext.sparkContext.parallelize(1 to 2000000)
+      .map(x => (x+"a", "b", x))
+      .toDF("c1", "c2", "c3")
+    df.write
+      .format("carbondata")
+      .option("tableName", "carbon2")
+      .option("tempCSV", "true")
+      .option("compress", "true")
+      .mode(SaveMode.Overwrite)
+      .save()
+
+    checkAnswer(sql("select count(*) from default.carbon2"), Seq(Row(2000000)))
+
+    sql("delete from default.carbon2 where c1 = '99999a'").show()
+
+    checkAnswer(sql("select count(*) from default.carbon2"), Seq(Row(1999999)))
+
+    checkAnswer(sql("select * from default.carbon2 where c1 = '99999a'"), Seq())
+
+    sql("DROP TABLE IF EXISTS default.carbon2")
+  }
+
+
   override def afterAll {
     sql("use default")
     sql("drop database  if exists iud_db cascade")

http://git-wip-us.apache.org/repos/asf/carbondata/blob/7e2e86e5/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
index 79fda30..c8a1c63 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/iud/UpdateCarbonTableTestCase.scala
@@ -406,6 +406,8 @@ class UpdateCarbonTableTestCase extends QueryTest with BeforeAndAfterAll {
 
     checkAnswer(sql("select count(*) from default.carbon1"), Seq(Row(36000)))
 
+    checkAnswer(sql("select * from default.carbon1 where c1 = 'test123'"), Row("test123","b",9999))
+
     sql("DROP TABLE IF EXISTS default.carbon1")
   }
 


[5/8] carbondata git commit: [CARBONDATA-1248] change LazyColumnPage parent class

Posted by ja...@apache.org.
[CARBONDATA-1248] change LazyColumnPage parent class


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

Branch: refs/heads/encoding_override
Commit: 53b92e5f8fb527529a6b075f8c71d3e389b2cee5
Parents: 3e726e0
Author: jackylk <ja...@huawei.com>
Authored: Thu Jun 29 18:20:56 2017 +0800
Committer: QiangCai <qi...@qq.com>
Committed: Sat Jul 1 19:02:27 2017 +0800

----------------------------------------------------------------------
 .../core/datastore/page/LazyColumnPage.java     | 164 ++++++++++++++++++-
 1 file changed, 163 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/53b92e5f/core/src/main/java/org/apache/carbondata/core/datastore/page/LazyColumnPage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/LazyColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/LazyColumnPage.java
index f90aa6c..6ec2e07 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/LazyColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/LazyColumnPage.java
@@ -17,11 +17,13 @@
 
 package org.apache.carbondata.core.datastore.page;
 
+import java.math.BigDecimal;
+
 /**
  * This is a decorator of column page, it performs transformation lazily (when caller calls getXXX
  * method to get the value from the page)
  */
-public class LazyColumnPage extends SafeFixLengthColumnPage {
+public class LazyColumnPage extends ColumnPage {
 
   // decorated column page
   private ColumnPage columnPage;
@@ -85,7 +87,167 @@ public class LazyColumnPage extends SafeFixLengthColumnPage {
   }
 
   @Override
+  public float getFloat(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public BigDecimal getDecimal(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public byte[] getBytePage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public short[] getShortPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public byte[] getShortIntPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public int[] getIntPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public long[] getLongPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public float[] getFloatPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public double[] getDoublePage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public byte[][] getByteArrayPage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public byte[] getFlattenedBytePage() {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void encode(PrimitiveCodec codec) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setBytePage(byte[] byteData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setShortPage(short[] shortData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setShortIntPage(byte[] shortIntData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setIntPage(int[] intData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setLongPage(long[] longData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setFloatPage(float[] floatData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setDoublePage(double[] doubleData) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void setByteArrayPage(byte[][] byteArray) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
   public void freeMemory() {
     columnPage.freeMemory();
   }
+
+  @Override
+  public void putByte(int rowId, byte value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putShort(int rowId, short value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putInt(int rowId, int value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putLong(int rowId, long value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putDouble(int rowId, double value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putBytes(int rowId, byte[] bytes) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putShortInt(int rowId, int value) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public byte getByte(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public short getShort(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public int getShortInt(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
+
+  @Override
+  public int getInt(int rowId) {
+    throw new UnsupportedOperationException("internal error");
+  }
 }


[3/8] carbondata git commit: fix unsafe column page bug

Posted by ja...@apache.org.
fix unsafe column page bug


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

Branch: refs/heads/encoding_override
Commit: fdb672ad946c0fe5b9982aee9b09717db36a54f7
Parents: ad80006
Author: jackylk <ja...@huawei.com>
Authored: Fri Jun 30 18:27:08 2017 +0800
Committer: QiangCai <qi...@qq.com>
Committed: Sat Jul 1 13:09:24 2017 +0800

----------------------------------------------------------------------
 .../page/UnsafeVarLengthColumnPage.java         | 35 ++++++++++++++++----
 .../datastore/page/VarLengthColumnPageBase.java |  3 +-
 .../resources/big_decimal_without_header.csv    |  5 +++
 .../TestLoadDataWithHiveSyntaxUnsafe.scala      | 25 +++++++++++++-
 4 files changed, 59 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/fdb672ad/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
index 75b5312..dd6abc5 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/UnsafeVarLengthColumnPage.java
@@ -47,6 +47,11 @@ public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
 
   private static final double FACTOR = 1.25;
 
+  /**
+   * create a page
+   * @param dataType data type
+   * @param pageSize number of row
+   */
   UnsafeVarLengthColumnPage(DataType dataType, int pageSize) throws MemoryException {
     super(dataType, pageSize);
     capacity = (int) (pageSize * DEFAULT_ROW_SIZE * FACTOR);
@@ -55,6 +60,20 @@ public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
     baseOffset = memoryBlock.getBaseOffset();
   }
 
+  /**
+   * create a page with initial capacity
+   * @param dataType data type
+   * @param pageSize number of row
+   * @param capacity initial capacity of the page, in bytes
+   */
+  UnsafeVarLengthColumnPage(DataType dataType, int pageSize, int capacity) throws MemoryException {
+    super(dataType, pageSize);
+    this.capacity = capacity;
+    memoryBlock = UnsafeMemoryManager.allocateMemoryWithRetry((long)(capacity));
+    baseAddress = memoryBlock.getBaseObject();
+    baseOffset = memoryBlock.getBaseOffset();
+  }
+
   @Override
   public void freeMemory() {
     if (memoryBlock != null) {
@@ -65,6 +84,9 @@ public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
     }
   }
 
+  /**
+   * reallocate memory if capacity length than current size + request size
+   */
   private void ensureMemory(int requestSize) throws MemoryException {
     if (totalLength + requestSize > capacity) {
       int newSize = 2 * capacity;
@@ -81,17 +103,16 @@ public class UnsafeVarLengthColumnPage extends VarLengthColumnPageBase {
 
   @Override
   public void putBytesAtRow(int rowId, byte[] bytes) {
-    try {
-      ensureMemory(bytes.length);
-    } catch (MemoryException e) {
-      throw new RuntimeException(e);
-    }
-    CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET,
-        baseAddress, baseOffset + rowOffset[rowId], bytes.length);
+    putBytes(rowId, bytes, 0, bytes.length);
   }
 
   @Override
   public void putBytes(int rowId, byte[] bytes, int offset, int length) {
+    try {
+      ensureMemory(length);
+    } catch (MemoryException e) {
+      throw new RuntimeException(e);
+    }
     CarbonUnsafe.unsafe.copyMemory(bytes, CarbonUnsafe.BYTE_ARRAY_OFFSET + offset,
         baseAddress, baseOffset + rowOffset[rowId], length);
   }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/fdb672ad/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
index a897d54..801cfb3 100644
--- a/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
+++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/VarLengthColumnPageBase.java
@@ -105,8 +105,9 @@ public abstract class VarLengthColumnPageBase extends ColumnPage {
     int numRows = rowId;
 
     VarLengthColumnPageBase page;
+    int inputDataLength = offset;
     if (unsafe) {
-      page = new UnsafeVarLengthColumnPage(DECIMAL, numRows);
+      page = new UnsafeVarLengthColumnPage(DECIMAL, numRows, inputDataLength);
     } else {
       page = new SafeVarLengthColumnPage(DECIMAL, numRows);
     }

http://git-wip-us.apache.org/repos/asf/carbondata/blob/fdb672ad/integration/spark-common-test/src/test/resources/big_decimal_without_header.csv
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/resources/big_decimal_without_header.csv b/integration/spark-common-test/src/test/resources/big_decimal_without_header.csv
new file mode 100644
index 0000000..4e99384
--- /dev/null
+++ b/integration/spark-common-test/src/test/resources/big_decimal_without_header.csv
@@ -0,0 +1,5 @@
+1,32473289848372638424.8218378712
+2,99487323423232324232.2434323233
+3,12773443434389239382.4309238238
+4,38488747823423323726.3589238237
+5,93838663748166353423.4273832762
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/carbondata/blob/fdb672ad/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala
index 2a9d1d9..c713865 100644
--- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala
+++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntaxUnsafe.scala
@@ -65,6 +65,8 @@ class TestLoadDataWithHiveSyntaxUnsafe extends QueryTest with BeforeAndAfterAll
     sql("drop table if exists comment_test")
     sql("drop table if exists smallinttable")
     sql("drop table if exists smallinthivetable")
+    sql("drop table if exists decimal_varlength")
+    sql("drop table if exists decimal_varlength_hive")
     sql(
       "CREATE table carbontable (empno int, empname String, designation String, doj String, " +
           "workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, " +
@@ -77,7 +79,18 @@ class TestLoadDataWithHiveSyntaxUnsafe extends QueryTest with BeforeAndAfterAll
           "projectcode int, projectjoindate String,projectenddate String, attendance String," +
           "utilization String,salary String)row format delimited fields terminated by ','"
     )
-
+    sql(
+      """
+        | CREATE TABLE decimal_varlength(id string, value decimal(30,10))
+        | STORED BY 'org.apache.carbondata.format'
+      """.stripMargin
+    )
+    sql(
+      """
+        | CREATE TABLE decimal_varlength_hive(id string, value decimal(30,10))
+        | ROW FORMAT DELIMITED FIELDS TERMINATED BY ','
+      """.stripMargin
+    )
   }
 
   test("create table with smallint type and query smallint table") {
@@ -674,6 +687,14 @@ class TestLoadDataWithHiveSyntaxUnsafe extends QueryTest with BeforeAndAfterAll
       Row("~carbon,")))
   }
 
+  test("test decimal var lenght comlumn page") {
+    sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/big_decimal_without_header.csv' INTO TABLE decimal_varlength" +
+        s" OPTIONS('FILEHEADER'='id,value')")
+    sql(s"LOAD DATA LOCAL INPATH '$resourcesPath/big_decimal_without_header.csv' INTO TABLE decimal_varlength_hive")
+    checkAnswer(sql("select value from decimal_varlength"), sql("select value from decimal_varlength_hive"))
+    checkAnswer(sql("select sum(value) from decimal_varlength"), sql("select sum(value) from decimal_varlength_hive"))
+  }
+
   override def afterAll {
     sql("drop table if exists escapechar1")
     sql("drop table if exists escapechar2")
@@ -701,6 +722,8 @@ class TestLoadDataWithHiveSyntaxUnsafe extends QueryTest with BeforeAndAfterAll
     sql("drop table if exists carbontable1")
     sql("drop table if exists hivetable1")
     sql("drop table if exists comment_test")
+    sql("drop table if exists decimal_varlength")
+    sql("drop table if exists decimal_varlength_hive")
     CarbonProperties.getInstance().addProperty(
       CarbonCommonConstants.ENABLE_UNSAFE_COLUMN_PAGE_LOADING,
       CarbonCommonConstants.ENABLE_UNSAFE_COLUMN_PAGE_LOADING_DEFAULT


[7/8] carbondata git commit: remove spark.version in submodule pom.xml

Posted by ja...@apache.org.
remove spark.version in submodule pom.xml


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

Branch: refs/heads/encoding_override
Commit: d3975a929e58937d1e23315f1f65c895d325b2ed
Parents: 92ba101
Author: cenyuhai <26...@qq.com>
Authored: Sun Jun 11 17:21:58 2017 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Sat Jul 1 22:45:29 2017 +0800

----------------------------------------------------------------------
 examples/spark2/pom.xml    | 3 ---
 integration/spark2/pom.xml | 3 ---
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/d3975a92/examples/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spark2/pom.xml b/examples/spark2/pom.xml
index 75bcef7..1802451 100644
--- a/examples/spark2/pom.xml
+++ b/examples/spark2/pom.xml
@@ -30,9 +30,6 @@
   <name>Apache CarbonData :: Spark2 Examples</name>
 
   <properties>
-    <spark.version>2.1.0</spark.version>
-    <scala.binary.version>2.11</scala.binary.version>
-    <scala.version>2.11.8</scala.version>
     <dev.path>${basedir}/../../dev</dev.path>
   </properties>
 

http://git-wip-us.apache.org/repos/asf/carbondata/blob/d3975a92/integration/spark2/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spark2/pom.xml b/integration/spark2/pom.xml
index a31513d..8279c5d 100644
--- a/integration/spark2/pom.xml
+++ b/integration/spark2/pom.xml
@@ -30,9 +30,6 @@
   <name>Apache CarbonData :: Spark2</name>
 
   <properties>
-    <spark.version>2.1.0</spark.version>
-    <scala.binary.version>2.11</scala.binary.version>
-    <scala.version>2.11.8</scala.version>
     <dev.path>${basedir}/../../dev</dev.path>
   </properties>
 


[8/8] carbondata git commit: Remove the fixed spark.version in submodule for supporting new spark version This closes #1017

Posted by ja...@apache.org.
Remove the fixed spark.version in submodule for supporting new spark version This closes #1017


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

Branch: refs/heads/encoding_override
Commit: 924f0b7a77fb1b5833ebec5b55c31b39fc908148
Parents: 92ba101 d3975a9
Author: chenliang613 <ch...@apache.org>
Authored: Sat Jul 1 22:46:16 2017 +0800
Committer: chenliang613 <ch...@apache.org>
Committed: Sat Jul 1 22:46:16 2017 +0800

----------------------------------------------------------------------
 examples/spark2/pom.xml    | 3 ---
 integration/spark2/pom.xml | 3 ---
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------



[2/8] carbondata git commit: [CARBONDATA-1251] Add test cases for IUD feature This closes #1120

Posted by ja...@apache.org.
[CARBONDATA-1251] Add test cases for IUD feature This closes #1120


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

Branch: refs/heads/encoding_override
Commit: ad8000676b8aa994c6b70e738b3cf27604cbca4b
Parents: 28f8a0b 7e2e86e
Author: jackylk <ja...@huawei.com>
Authored: Fri Jun 30 20:34:46 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Fri Jun 30 20:34:46 2017 +0800

----------------------------------------------------------------------
 .../iud/DeleteCarbonTableTestCase.scala         | 31 ++++++++++++++++++--
 .../iud/UpdateCarbonTableTestCase.scala         |  2 ++
 2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------



[6/8] carbondata git commit: [CARBONDATA-1248] change LazyColumnPage parent class This closes #1114

Posted by ja...@apache.org.
[CARBONDATA-1248] change LazyColumnPage parent class This closes #1114


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

Branch: refs/heads/encoding_override
Commit: 92ba101da43f9047d8384e764b95b991ae939b8e
Parents: 3e726e0 53b92e5
Author: QiangCai <qi...@qq.com>
Authored: Sat Jul 1 19:05:06 2017 +0800
Committer: QiangCai <qi...@qq.com>
Committed: Sat Jul 1 19:05:06 2017 +0800

----------------------------------------------------------------------
 .../core/datastore/page/LazyColumnPage.java     | 164 ++++++++++++++++++-
 1 file changed, 163 insertions(+), 1 deletion(-)
----------------------------------------------------------------------



[4/8] carbondata git commit: [CARBONDATA-1215][BUGFIX] Fix unsafe column page for decimal query This closes #1121

Posted by ja...@apache.org.
[CARBONDATA-1215][BUGFIX] Fix unsafe column page for decimal query This closes #1121


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

Branch: refs/heads/encoding_override
Commit: 3e726e0aca440234f02b5f62a05390abe10f5a1d
Parents: ad80006 fdb672a
Author: QiangCai <qi...@qq.com>
Authored: Sat Jul 1 13:10:31 2017 +0800
Committer: QiangCai <qi...@qq.com>
Committed: Sat Jul 1 13:10:31 2017 +0800

----------------------------------------------------------------------
 .../page/UnsafeVarLengthColumnPage.java         | 35 ++++++++++++++++----
 .../datastore/page/VarLengthColumnPageBase.java |  3 +-
 .../resources/big_decimal_without_header.csv    |  5 +++
 .../TestLoadDataWithHiveSyntaxUnsafe.scala      | 25 +++++++++++++-
 4 files changed, 59 insertions(+), 9 deletions(-)
----------------------------------------------------------------------