Repository: carbondata Updated Branches: refs/heads/master fdf90a4ed -> 562f0fff7
[CARBONDATA-1358] Fixed test fails in master branch This closes #1229 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/562f0fff Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/562f0fff Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/562f0fff Branch: refs/heads/master Commit: 562f0fff7a56749461bc99695349f6ba6b3858a1 Parents: fdf90a4 Author: Ravindra Pesala <ravi.pes...@gmail.com> Authored: Fri Aug 4 10:00:14 2017 +0530 Committer: chenliang613 <chenliang...@apache.org> Committed: Fri Aug 4 14:59:12 2017 +0800 ---------------------------------------------------------------------- .../sql/execution/command/carbonTableSchema.scala | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/562f0fff/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 1c0189c..4711618 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -36,7 +36,6 @@ import org.codehaus.jackson.map.ObjectMapper import org.apache.carbondata.api.CarbonStore import org.apache.carbondata.common.constants.LoggerAction import org.apache.carbondata.common.logging.LogServiceFactory -import org.apache.carbondata.core.cache.dictionary.ManageDictionaryAndBTree import org.apache.carbondata.core.constants.{CarbonCommonConstants, CarbonLoadOptionConstants} import org.apache.carbondata.core.datastore.impl.FileFactory import org.apache.carbondata.core.dictionary.server.DictionaryServer @@ -884,12 +883,7 @@ case class CarbonDropTableCommand(ifExistsSet: Boolean, lock => carbonLocks += CarbonLockUtil.getLockObject(carbonTableIdentifier, lock) } LOGGER.audit(s"Deleting table [$tableName] under database [$dbName]") - val carbonTable = catalog - .lookupRelation(identifier)(sparkSession).asInstanceOf[CarbonRelation].metaData.carbonTable - if (null != carbonTable) { - // clear driver B-tree and dictionary cache - ManageDictionaryAndBTree.clearBTreeAndDictionaryLRUCache(carbonTable) - } + CarbonEnv.getInstance(sparkSession).carbonMetastore .dropTable(tableIdentifier.getTablePath, identifier)(sparkSession) LOGGER.audit(s"Deleted table [$tableName] under database [$dbName]") @@ -902,14 +896,6 @@ case class CarbonDropTableCommand(ifExistsSet: Boolean, val unlocked = carbonLocks.forall(_.unlock()) if (unlocked) { logInfo("Table MetaData Unlocked Successfully") - // deleting any remaining files. - val metadataFilePath = CarbonStorePath - .getCarbonTablePath(storePath, carbonTableIdentifier).getMetadataDirectoryPath - val fileType = FileFactory.getFileType(metadataFilePath) - if (FileFactory.isFileExist(metadataFilePath, fileType)) { - val file = FileFactory.getCarbonFile(metadataFilePath, fileType) - CarbonUtil.deleteFoldersAndFiles(file.getParentFile) - } } } }
