From commits-return-13992-archive-asf-public=cust-asf.ponee.io@carbondata.apache.org Fri Oct 19 10:38:00 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9A997180652 for ; Fri, 19 Oct 2018 10:37:59 +0200 (CEST) Received: (qmail 95336 invoked by uid 500); 19 Oct 2018 08:37:58 -0000 Mailing-List: contact commits-help@carbondata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.apache.org Delivered-To: mailing list commits@carbondata.apache.org Received: (qmail 95327 invoked by uid 99); 19 Oct 2018 08:37:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2018 08:37:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75371DFC30; Fri, 19 Oct 2018 08:37:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xuchuanyin@apache.org To: commits@carbondata.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: carbondata git commit: [CARBONDATA-3002] Fix some spell error and remove the data after test case finished running Date: Fri, 19 Oct 2018 08:37:58 +0000 (UTC) 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 Authored: Thu Oct 11 18:13:14 2018 +0800 Committer: xuchuanyin 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 extends AbstractRecordReader { } @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 { } @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 { @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 { * @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); }