You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by xu...@apache.org on 2018/10/19 08:37:58 UTC
carbondata git commit: [CARBONDATA-3002] Fix some spell error and
remove the data after test case finished running
Repository: carbondata
Updated Branches:
refs/heads/master 1be990f66 -> f810389fa
[CARBONDATA-3002] Fix some spell error and remove the data after test case finished running
1.fix spell error -- change retrive to retrieve
2.remove the data after test case finished by deleting table and database
3.change dummy table with UUID, avoid error when there are multiple carbonreader
This closes #2811
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/f810389f
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/f810389f
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/f810389f
Branch: refs/heads/master
Commit: f810389faf5ddf938b40e2c9a7be35d4a12d901e
Parents: 1be990f
Author: xubo245 <xu...@huawei.com>
Authored: Thu Oct 11 18:13:14 2018 +0800
Committer: xuchuanyin <xu...@hust.edu.cn>
Committed: Fri Oct 19 16:37:27 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/carbondata/hadoop/CarbonRecordReader.java | 2 +-
.../carbondata/presto/PrestoCarbonVectorizedRecordReader.java | 2 +-
.../spark/vectorreader/VectorizedCarbonRecordReader.java | 2 +-
.../spark/testsuite/partition/TestAlterPartitionTable.scala | 2 ++
.../java/org/apache/carbondata/sdk/file/CarbonReader.java | 7 +++----
5 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f810389f/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
index 0d38906..d447320 100644
--- a/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
+++ b/hadoop/src/main/java/org/apache/carbondata/hadoop/CarbonRecordReader.java
@@ -117,7 +117,7 @@ public class CarbonRecordReader<T> extends AbstractRecordReader<T> {
}
@Override public float getProgress() throws IOException, InterruptedException {
- // TODO : Implement it based on total number of rows it is going to retrive.
+ // TODO : Implement it based on total number of rows it is going to retrieve.
return 0;
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f810389f/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
----------------------------------------------------------------------
diff --git a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
index 9935b54..4e2d36c 100644
--- a/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
+++ b/integration/presto/src/main/java/org/apache/carbondata/presto/PrestoCarbonVectorizedRecordReader.java
@@ -169,7 +169,7 @@ class PrestoCarbonVectorizedRecordReader extends AbstractRecordReader<Object> {
}
@Override public float getProgress() throws IOException, InterruptedException {
- // TODO : Implement it based on total number of rows it is going to retrive.
+ // TODO : Implement it based on total number of rows it is going to retrieve.
return 0;
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f810389f/integration/spark-datasource/src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
----------------------------------------------------------------------
diff --git a/integration/spark-datasource/src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java b/integration/spark-datasource/src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
index 779c62f..839a8a0 100644
--- a/integration/spark-datasource/src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
+++ b/integration/spark-datasource/src/main/scala/org/apache/carbondata/spark/vectorreader/VectorizedCarbonRecordReader.java
@@ -215,7 +215,7 @@ public class VectorizedCarbonRecordReader extends AbstractRecordReader<Object> {
@Override
public float getProgress() throws IOException, InterruptedException {
- // TODO : Implement it based on total number of rows it is going to retrive.
+ // TODO : Implement it based on total number of rows it is going to retrieve.
return 0;
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f810389f/integration/spark2/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestAlterPartitionTable.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestAlterPartitionTable.scala b/integration/spark2/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestAlterPartitionTable.scala
index af17252..89de019 100644
--- a/integration/spark2/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestAlterPartitionTable.scala
+++ b/integration/spark2/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestAlterPartitionTable.scala
@@ -889,6 +889,8 @@ class TestAlterPartitionTable extends QueryTest with BeforeAndAfterAll {
}
override def afterAll = {
+ sql("DROP TABLE IF EXISTS carbondb.carbontable")
+ sql("DROP DATABASE IF EXISTS carbondb")
dropTable
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_DATE_FORMAT, "yyyy-MM-dd")
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f810389f/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
----------------------------------------------------------------------
diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
index 37a8779..932cf85 100644
--- a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
+++ b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReader.java
@@ -18,9 +18,8 @@
package org.apache.carbondata.sdk.file;
import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
+import java.util.UUID;
import org.apache.carbondata.common.annotations.InterfaceAudience;
import org.apache.carbondata.common.annotations.InterfaceStability;
@@ -140,8 +139,8 @@ public class CarbonReader<T> {
* @return CarbonReaderBuilder object
*/
public static CarbonReaderBuilder builder(String tablePath) {
- String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
- String tableName = "UnknownTable" + time;
+ UUID uuid = UUID.randomUUID();
+ String tableName = "UnknownTable" + uuid;
return builder(tablePath, tableName);
}