[CARBONDATA-1885] Fix Test error in AlterTableValidationTestCase This closes #1645
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/73d516c2 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/73d516c2 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/73d516c2 Branch: refs/heads/branch-1.3 Commit: 73d516c21c3fa7aa37f464df560e58e5596dfdcd Parents: 1f68011 Author: xubo245 <[email protected]> Authored: Tue Dec 12 19:09:12 2017 +0800 Committer: Jacky Li <[email protected]> Committed: Fri Dec 29 16:40:11 2017 +0800 ---------------------------------------------------------------------- .../spark/testsuite/partition/TestShowPartitions.scala | 2 -- .../scala/org/apache/carbondata/events/AlterTableEvents.scala | 5 ----- .../preaaggregate/CreatePreAggregateTableCommand.scala | 3 --- .../command/preaaggregate/PreAggregateListeners.scala | 4 ++-- .../command/schema/CarbonAlterTableRenameCommand.scala | 4 ++-- .../carbondata/restructure/AlterTableValidationTestCase.scala | 7 +++---- .../restructure/vectorreader/DropColumnTestCases.scala | 4 ---- .../test/scala/org/apache/spark/util/CarbonCommandSuite.scala | 2 +- 8 files changed, 8 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestShowPartitions.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestShowPartitions.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestShowPartitions.scala index af3f40c..86305e7 100644 --- a/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestShowPartitions.scala +++ b/integration/spark-common-test/src/test/scala/org/apache/carbondata/spark/testsuite/partition/TestShowPartitions.scala @@ -17,8 +17,6 @@ package org.apache.carbondata.spark.testsuite.partition -import java.sql.Timestamp - import org.apache.spark.sql.{AnalysisException, DataFrame, Row} import org.apache.spark.sql.catalyst.analysis.NoSuchDatabaseException import org.scalatest.BeforeAndAfterAll http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark-common/src/main/scala/org/apache/carbondata/events/AlterTableEvents.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/events/AlterTableEvents.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/events/AlterTableEvents.scala index 0457e85..30e3f6f 100644 --- a/integration/spark-common/src/main/scala/org/apache/carbondata/events/AlterTableEvents.scala +++ b/integration/spark-common/src/main/scala/org/apache/carbondata/events/AlterTableEvents.scala @@ -16,16 +16,11 @@ */ package org.apache.carbondata.events -import java.util - import org.apache.spark.sql.SparkSession -import org.apache.spark.sql.SQLContext import org.apache.spark.sql.execution.command.{AlterTableAddColumnsModel, AlterTableDataTypeChangeModel, AlterTableDropColumnModel, AlterTableRenameModel, CarbonMergerMapping} import org.apache.carbondata.core.metadata.schema.table.CarbonTable -import org.apache.carbondata.core.statusmanager.LoadMetadataDetails import org.apache.carbondata.processing.loading.model.CarbonLoadModel -import org.apache.carbondata.processing.merger.CompactionType /** * http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala index 8c02f3b..c532888 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/CreatePreAggregateTableCommand.scala @@ -17,20 +17,17 @@ package org.apache.spark.sql.execution.command.preaaggregate -import scala.collection.JavaConverters._ import scala.collection.mutable import org.apache.spark.sql._ import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.execution.command._ import org.apache.spark.sql.execution.command.datamap.CarbonDropDataMapCommand -import org.apache.spark.sql.execution.command.management.CarbonLoadDataCommand import org.apache.spark.sql.execution.command.table.CarbonCreateTableCommand import org.apache.spark.sql.execution.command.timeseries.TimeSeriesUtil import org.apache.spark.sql.parser.CarbonSpark2SqlParser import org.apache.carbondata.core.constants.CarbonCommonConstants -import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier import org.apache.carbondata.core.statusmanager.SegmentStatusManager /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateListeners.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateListeners.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateListeners.scala index 1e5b305..fc42d5f 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateListeners.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/preaaggregate/PreAggregateListeners.scala @@ -21,10 +21,10 @@ import scala.collection.JavaConverters._ import scala.collection.mutable import org.apache.spark.sql.catalyst.TableIdentifier -import org.apache.spark.sql.execution.command.management.{CarbonAlterTableCompactionCommand} +import org.apache.spark.sql.execution.command.management.CarbonAlterTableCompactionCommand import org.apache.spark.sql.execution.command.AlterTableModel -import org.apache.carbondata.core.metadata.schema.table.{AggregationDataMapSchema} +import org.apache.carbondata.core.metadata.schema.table.AggregationDataMapSchema import org.apache.carbondata.core.util.CarbonUtil import org.apache.carbondata.events._ http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala index 28ed581..bbd3f3a 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/schema/CarbonAlterTableRenameCommand.scala @@ -19,10 +19,10 @@ package org.apache.spark.sql.execution.command.schema import org.apache.hadoop.fs.Path import org.apache.spark.sql._ -import org.apache.spark.sql.{CarbonEnv, CarbonSession, Row, SparkSession} +import org.apache.spark.sql.{CarbonEnv, SparkSession} import org.apache.spark.sql.catalyst.TableIdentifier import org.apache.spark.sql.execution.command.{AlterTableRenameModel, MetadataCommand} -import org.apache.spark.sql.hive.{CarbonRelation, CarbonSessionCatalog, HiveExternalCatalog} +import org.apache.spark.sql.hive.{CarbonRelation, CarbonSessionCatalog} import org.apache.spark.util.AlterTableUtil import org.apache.carbondata.common.logging.{LogService, LogServiceFactory} http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/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 e7e0160..597982a 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 @@ -21,11 +21,8 @@ import java.io.File import java.math.{BigDecimal, RoundingMode} import java.sql.Timestamp -import org.apache.spark.sql.{CarbonEnv, Row} +import org.apache.spark.sql.Row import org.apache.spark.sql.common.util.Spark2QueryTest -import org.apache.spark.sql.execution.command.preaaggregate.PreAggregateUtil -import org.apache.spark.sql.test.Spark2TestQueryExecutor -import org.junit.Assert import org.scalatest.BeforeAndAfterAll import org.apache.carbondata.core.constants.CarbonCommonConstants @@ -305,6 +302,8 @@ class AlterTableValidationTestCase extends Spark2QueryTest with BeforeAndAfterAl } test ("test drop & add same column multiple times as dict, nodict, timestamp and msr") { + CarbonProperties.getInstance() + .addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy") // drop and add dict column sql("alter table restructure drop columns(designation)") sql( http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/DropColumnTestCases.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/DropColumnTestCases.scala b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/DropColumnTestCases.scala index 70a9fdd..662d9d8 100644 --- a/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/DropColumnTestCases.scala +++ b/integration/spark2/src/test/scala/org/apache/spark/carbondata/restructure/vectorreader/DropColumnTestCases.scala @@ -17,14 +17,10 @@ package org.apache.spark.carbondata.restructure.vectorreader -import java.math.{BigDecimal, RoundingMode} - import org.apache.spark.sql.Row import org.apache.spark.sql.common.util.Spark2QueryTest import org.scalatest.BeforeAndAfterAll -import org.apache.carbondata.core.util.CarbonProperties - class DropColumnTestCases extends Spark2QueryTest with BeforeAndAfterAll { override def beforeAll { http://git-wip-us.apache.org/repos/asf/carbondata/blob/73d516c2/integration/spark2/src/test/scala/org/apache/spark/util/CarbonCommandSuite.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/test/scala/org/apache/spark/util/CarbonCommandSuite.scala b/integration/spark2/src/test/scala/org/apache/spark/util/CarbonCommandSuite.scala index 7729534..e493179 100644 --- a/integration/spark2/src/test/scala/org/apache/spark/util/CarbonCommandSuite.scala +++ b/integration/spark2/src/test/scala/org/apache/spark/util/CarbonCommandSuite.scala @@ -28,7 +28,7 @@ import org.apache.carbondata.api.CarbonStore import org.apache.carbondata.common.constants.LoggerAction import org.apache.carbondata.core.constants.CarbonCommonConstants import org.apache.carbondata.core.metadata.CarbonMetadata -import org.apache.carbondata.core.util.{CarbonProperties, CarbonUtil} +import org.apache.carbondata.core.util.CarbonProperties class CarbonCommandSuite extends Spark2QueryTest with BeforeAndAfterAll {
