You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by gv...@apache.org on 2017/03/20 13:54:26 UTC
[1/2] incubator-carbondata git commit: rename table is changing
provided db to current db
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 5524d4c9a -> d6d5eca30
rename table is changing provided db to current db
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/5d5a9b2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/5d5a9b2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/5d5a9b2c
Branch: refs/heads/master
Commit: 5d5a9b2cd24613ba59819c698b73fa3fa22e198f
Parents: 5524d4c
Author: nareshpr <pr...@gmail.com>
Authored: Mon Mar 20 12:41:32 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Mon Mar 20 18:59:31 2017 +0530
----------------------------------------------------------------------
.../spark/util/GlobalDictionaryUtil.scala | 5 --
.../execution/command/AlterTableCommands.scala | 5 +-
.../AlterTableValidationTestCase.scala | 60 +++++++++++++++++++-
3 files changed, 61 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5d5a9b2c/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
index 13c90fb..5cb493c 100644
--- a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
+++ b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/util/GlobalDictionaryUtil.scala
@@ -845,11 +845,6 @@ object GlobalDictionaryUtil {
}")
if (distinctValues.size() > 0) {
- dictionary = CarbonLoaderUtil.getDictionary(tableIdentifier,
- new ColumnIdentifier(columnSchema.getColumnUniqueId, null, columnSchema.getDataType),
- storePath,
- columnSchema.getDataType
- )
val sortIndexWriteTask = new SortIndexWriterTask(tableIdentifier,
columnIdentifier,
columnSchema.getDataType,
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5d5a9b2c/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/AlterTableCommands.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/AlterTableCommands.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/AlterTableCommands.scala
index 003899f..ee38cb9 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/AlterTableCommands.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/AlterTableCommands.scala
@@ -136,6 +136,7 @@ private[sql] case class AlterTableRenameTable(alterTableRenameModel: AlterTableR
if (relation == null) {
LOGGER.audit(s"Rename table request has failed. " +
s"Table $oldDatabaseName.$oldTableName does not exist")
+ sys.error(s"Table $oldDatabaseName.$oldTableName does not exist")
}
val carbonTable = relation.tableMeta.carbonTable
val carbonLock = CarbonLockFactory
@@ -161,7 +162,7 @@ private[sql] case class AlterTableRenameTable(alterTableRenameModel: AlterTableR
.renameForce(carbonTablePath.getParent.toString + CarbonCommonConstants.FILE_SEPARATOR +
newTableName)
if (!rename) {
- sys.error(s"Rename failed for table $oldTableName")
+ sys.error(s"Folder rename failed for table $oldDatabaseName.$oldTableName")
}
}
val newTableIdentifier = new CarbonTableIdentifier(oldDatabaseName,
@@ -174,7 +175,7 @@ private[sql] case class AlterTableRenameTable(alterTableRenameModel: AlterTableR
CarbonEnv.get.carbonMetastore.removeTableFromMetadata(oldDatabaseName, oldTableName)
sparkSession.sharedState.externalCatalog.asInstanceOf[HiveExternalCatalog].client
.runSqlHive(
- s"ALTER TABLE $oldDatabaseName.$oldTableName RENAME TO $newTableName")
+ s"ALTER TABLE $oldDatabaseName.$oldTableName RENAME TO $oldDatabaseName.$newTableName")
sparkSession.sharedState.externalCatalog.asInstanceOf[HiveExternalCatalog].client
.runSqlHive(
s"ALTER TABLE $oldDatabaseName.$newTableName SET SERDEPROPERTIES" +
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/5d5a9b2c/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 1bbbfcc..8f8f8cb 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
@@ -4,7 +4,6 @@ import java.math.{BigDecimal, RoundingMode}
import org.apache.spark.sql.Row
import org.apache.spark.sql.common.util.QueryTest
-import org.apache.spark.sql.types.Decimal
import org.scalatest.BeforeAndAfterAll
import org.apache.carbondata.core.util.CarbonProperties
@@ -23,7 +22,15 @@ class AlterTableValidationTestCase extends QueryTest with BeforeAndAfterAll {
"utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
sql(
s"""LOAD DATA LOCAL INPATH '$resourcesPath/data.csv' INTO TABLE restructure OPTIONS
- |('DELIMITER'= ',', 'QUOTECHAR'= '\"')""".stripMargin);
+ |('DELIMITER'= ',', 'QUOTECHAR'= '\"')""".stripMargin)
+ sql(
+ "CREATE TABLE restructure_test (empno int, empname String, designation String, doj " +
+ "Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname " +
+ "String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance " +
+ "int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
+ sql(
+ s"""LOAD DATA LOCAL INPATH '$resourcesPath/data.csv' INTO TABLE restructure_test OPTIONS
+ |('DELIMITER'= ',', 'QUOTECHAR'= '\"')""".stripMargin)
}
test("test add dictionary column") {
@@ -289,7 +296,56 @@ class AlterTableValidationTestCase extends QueryTest with BeforeAndAfterAll {
}
}
+ test("test to rename table") {
+ sql("alter table restructure_test rename to restructure_new")
+ val result = sql("select * from restructure_new")
+ assert(result.count().equals(10L))
+ }
+
+ test("test to rename table with invalid table name") {
+ try {
+ sql("alter table restructure_invalid rename to restructure_new")
+ sys.error("Invalid table name error should be thrown")
+ } catch {
+ case e: Exception =>
+ println(e.getMessage)
+ }
+ }
+
+ test("test to rename table with table already exists") {
+ try {
+ sql("alter table restructure rename to restructure")
+ sys.error("same table name exception should be thrown")
+ } catch {
+ case e: Exception =>
+ println(e.getMessage)
+ assert(true)
+ }
+ }
+
+ test("test to load data after rename") {
+ sql(
+ s"""LOAD DATA LOCAL INPATH '$resourcesPath/data.csv' INTO TABLE restructure_new OPTIONS
+ |('DELIMITER'= ',', 'QUOTECHAR'= '\"')""".stripMargin)
+ val result = sql("select * from restructure_new")
+ assert(result.count().equals(20L))
+ }
+
+ test("test table rename without use db, let current db be default") {
+ sql("drop database if exists testdb cascade")
+ sql("create database testdb")
+ sql("create table testdb.test1(name string, id int) stored by 'carbondata'")
+ sql("insert into testdb.test1 select 'xx',1")
+ sql("insert into testdb.test1 select 'xx',11")
+ sql("alter table testdb.test1 rename to testdb.test2")
+ checkAnswer(sql("select * from testdb.test2"), Seq(Row("xx", 1), Row("xx", 11)))
+ sql("drop table testdb.test2")
+ sql("drop database testdb")
+ }
+
override def afterAll {
sql("DROP TABLE IF EXISTS restructure")
+ sql("DROP TABLE IF EXISTS restructure_new")
+ sql("DROP TABLE IF EXISTS restructure_test")
}
}
[2/2] incubator-carbondata git commit: [CARBONDATA-795] rename table
is changing provided db to current db. This closes #674
Posted by gv...@apache.org.
[CARBONDATA-795] rename table is changing provided db to current db. This closes #674
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/d6d5eca3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/d6d5eca3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/d6d5eca3
Branch: refs/heads/master
Commit: d6d5eca3069d5fc7e39dd60b43da663900102045
Parents: 5524d4c 5d5a9b2
Author: Venkata Ramana G <ra...@huawei.com>
Authored: Mon Mar 20 19:23:57 2017 +0530
Committer: Venkata Ramana G <ra...@huawei.com>
Committed: Mon Mar 20 19:23:57 2017 +0530
----------------------------------------------------------------------
.../spark/util/GlobalDictionaryUtil.scala | 5 --
.../execution/command/AlterTableCommands.scala | 5 +-
.../AlterTableValidationTestCase.scala | 60 +++++++++++++++++++-
3 files changed, 61 insertions(+), 9 deletions(-)
----------------------------------------------------------------------