You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/09/04 14:53:48 UTC
carbondata git commit: [CARBONDATA-1434] Remove useless class para
for metastore
Repository: carbondata
Updated Branches:
refs/heads/master 2e04c357c -> 19bd675b3
[CARBONDATA-1434] Remove useless class para for metastore
The RuntimeConfig has not been used in Carbon*Metastore class, so remove it.
This closes #1301
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/19bd675b
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/19bd675b
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/19bd675b
Branch: refs/heads/master
Commit: 19bd675b3ef1e9305c504c0c3fc21512bbb86daf
Parents: 2e04c35
Author: xuchuanyin <xu...@hust.edu.cn>
Authored: Wed Aug 30 23:14:33 2017 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Mon Sep 4 22:53:24 2017 +0800
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala | 4 ++--
.../scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala | 4 ++--
.../main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/carbondata/blob/19bd675b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala
index 90f57a9..4797884 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonFileMetastore.scala
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLong
import scala.collection.mutable.ArrayBuffer
-import org.apache.spark.sql.{CarbonDatasourceHadoopRelation, RuntimeConfig, SparkSession}
+import org.apache.spark.sql.{CarbonDatasourceHadoopRelation, SparkSession}
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.NoSuchTableException
import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, SubqueryAlias}
@@ -64,7 +64,7 @@ case class DictionaryMap(dictionaryMap: Map[String, Boolean]) {
}
}
-class CarbonFileMetastore(conf: RuntimeConfig) extends CarbonMetaStore {
+class CarbonFileMetastore extends CarbonMetaStore {
@transient
val LOGGER = LogServiceFactory.getLogService("org.apache.spark.sql.CarbonMetastoreCatalog")
http://git-wip-us.apache.org/repos/asf/carbondata/blob/19bd675b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala
index 1837c04..eb80b82 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonHiveMetaStore.scala
@@ -18,7 +18,7 @@ package org.apache.spark.sql.hive
import scala.collection.JavaConverters._
-import org.apache.spark.sql.{RuntimeConfig, SparkSession}
+import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.carbondata.core.cache.dictionary.ManageDictionaryAndBTree
@@ -36,7 +36,7 @@ import org.apache.carbondata.spark.util.CarbonSparkUtil
/**
* Metastore to store carbonschema in hive
*/
-class CarbonHiveMetaStore(conf: RuntimeConfig) extends CarbonFileMetastore(conf) {
+class CarbonHiveMetaStore extends CarbonFileMetastore {
override def isReadFromHiveMetaStore: Boolean = true
http://git-wip-us.apache.org/repos/asf/carbondata/blob/19bd675b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala
index bfe1276..dcb43d1 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonMetaStore.scala
@@ -136,9 +136,9 @@ object CarbonMetaStoreFactory {
def createCarbonMetaStore(conf: RuntimeConfig): CarbonMetaStore = {
val readSchemaFromHiveMetaStore = readSchemaFromHive(conf)
if (readSchemaFromHiveMetaStore) {
- new CarbonHiveMetaStore(conf)
+ new CarbonHiveMetaStore()
} else {
- new CarbonFileMetastore(conf)
+ new CarbonFileMetastore()
}
}