carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject [1/2] incubator-carbondata git commit: remove unnecessary ConvertToSafe
Date Mon, 01 Aug 2016 13:53:00 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 80cfa39c6 -> 1ae4e4015


remove unnecessary ConvertToSafe


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/df56e287
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/df56e287
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/df56e287

Branch: refs/heads/master
Commit: df56e28753abe7919ebf8904ba468591f510a948
Parents: 80cfa39
Author: jackylk <jacky.likun@huawei.com>
Authored: Mon Jul 25 23:49:14 2016 +0800
Committer: ravipesala <ravi.pesala@gmail.com>
Committed: Mon Aug 1 19:12:16 2016 +0530

----------------------------------------------------------------------
 .../scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala | 8 +++++---
 .../detailquery/HighCardinalityDataTypesTestCase.scala       | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/df56e287/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala
b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala
index d0d4f16..c47e4f7 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDictionaryDecoder.scala
@@ -142,9 +142,12 @@ case class CarbonDictionaryDecoder(
     dictIds
   }
 
-
   override def outputsUnsafeRows: Boolean = true
 
+  override def canProcessUnsafeRows: Boolean = true
+
+  override def canProcessSafeRows: Boolean = true
+
   override def doExecute(): RDD[InternalRow] = {
     attachTree(this, "execute") {
       val storePath = sqlContext.catalog.asInstanceOf[CarbonMetastoreCatalog].storePath
@@ -158,8 +161,7 @@ case class CarbonDictionaryDecoder(
         child.execute().mapPartitions { iter =>
           val cacheProvider: CacheProvider = CacheProvider.getInstance
           val forwardDictionaryCache: Cache[DictionaryColumnUniqueIdentifier, Dictionary]
=
-            cacheProvider
-              .createCache(CacheType.FORWARD_DICTIONARY, storePath)
+            cacheProvider.createCache(CacheType.FORWARD_DICTIONARY, storePath)
           val dicts: Seq[Dictionary] = getDictionary(absoluteTableIdentifiers,
             forwardDictionaryCache)
           val dictIndex = dicts.zipWithIndex.filter(x => x._1 != null).map(x => x._2)

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/df56e287/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
index 5041fe4..ae12643 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
@@ -37,6 +37,10 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll
{
   override def beforeAll {
     //For the Hive table creation and data loading
     sql("drop table if exists filtertestTables")
+    sql("drop table if exists NO_DICTIONARY_HIVE_6")
+    sql("drop table if exists NO_DICTIONARY_CARBON_6")
+    sql("drop table if exists NO_DICTIONARY_CARBON_7")
+    
     sql(
       "create table NO_DICTIONARY_HIVE_6(empno int,empname string,designation string,doj
" +
         "Timestamp,workgroupcategory int, " +


Mime
View raw message