[CARBONDATA-762] Change schemaName to databaseName, cubeName to table…

…Name
Sephiroth-Lin · Mar 16, 2017 · 98ec428 · 98ec428
1 parent 7ab727c
commit 98ec428
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/Compactor.scala b/integration/spark-common/src/main/scala/org/apache/carbondata/spark/rdd/Compactor.scala
@@ -50,7 +50,7 @@ object Compactor {
     val startTime = System.nanoTime()
     val mergedLoadName = CarbonDataMergerUtil.getMergedLoadName(loadsToMerge)
     var finalMergeStatus = false
-    val schemaName: String = carbonLoadModel.getDatabaseName
+    val databaseName: String = carbonLoadModel.getDatabaseName
     val factTableName = carbonLoadModel.getTableName
     val validSegments: Array[String] = CarbonDataMergerUtil
       .getValidSegments(loadsToMerge).split(',')
@@ -61,7 +61,7 @@ object Compactor {
       mergedLoadName,
       kettleHomePath,
       cubeCreationTime,
-      schemaName,
+      databaseName,
       factTableName,
       validSegments,
       carbonTable.getAbsoluteTableIdentifier.getCarbonTableIdentifier.getTableId,

diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetadataUtil.scala b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetadataUtil.scala
@@ -34,23 +34,23 @@ object CarbonHiveMetadataUtil {
   /**
    * This method invalidates the table from HiveMetastoreCatalog before dropping table
    *
-   * @param schemaName
-   * @param cubeName
+   * @param databaseName
+   * @param tableName
    * @param sqlContext
    */
-  def invalidateAndDropTable(schemaName: String,
-      cubeName: String,
+  def invalidateAndDropTable(databaseName: String,
+      tableName: String,
       sqlContext: SQLContext): Unit = {
     val hiveContext = sqlContext.asInstanceOf[HiveContext]
-    val tableWithDb = schemaName + "." + cubeName
+    val tableWithDb = databaseName + "." + tableName
     val tableIdent = SqlParser.parseTableIdentifier(tableWithDb)
     try {
       hiveContext.catalog.invalidateTable(tableIdent)
-      hiveContext.runSqlHive(s"DROP TABLE IF EXISTS $schemaName.$cubeName")
+      hiveContext.runSqlHive(s"DROP TABLE IF EXISTS $databaseName.$tableName")
     } catch {
       case e: Exception =>
         LOGGER.audit(
-          s"Error While deleting the table $schemaName.$cubeName during drop carbon table" +
+          s"Error While deleting the table $databaseName.$tableName during drop carbon table" +
           e.getMessage)
     }
   }

diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetadataUtil.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetadataUtil.scala
@@ -33,19 +33,19 @@ object CarbonHiveMetadataUtil {
   /**
    * This method invalidates the table from HiveMetastoreCatalog before dropping table
    *
-   * @param schemaName
-   * @param cubeName
+   * @param databaseName
+   * @param tableName
    * @param sparkSession
    */
-  def invalidateAndDropTable(schemaName: String,
-      cubeName: String,
+  def invalidateAndDropTable(databaseName: String,
+      tableName: String,
       sparkSession: SparkSession): Unit = {
     try {
-      sparkSession.sql(s"DROP TABLE IF EXISTS $schemaName.$cubeName")
+      sparkSession.sql(s"DROP TABLE IF EXISTS $databaseName.$tableName")
     } catch {
       case e: Exception =>
         LOGGER.audit(
-          s"Error While deleting the table $schemaName.$cubeName during drop carbon table" +
+          s"Error While deleting the table $databaseName.$tableName during drop carbon table" +
           e.getMessage)
     }
   }