carbondata-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (CARBONDATA-328) Improve Code and Fix Warnings
Date Fri, 21 Oct 2016 01:16:58 GMT

    [ https://issues.apache.org/jira/browse/CARBONDATA-328?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15593602#comment-15593602
] 

ASF GitHub Bot commented on CARBONDATA-328:
-------------------------------------------

Github user jackylk commented on a diff in the pull request:

    https://github.com/apache/incubator-carbondata/pull/248#discussion_r84404111
  
    --- Diff: integration/spark/src/main/scala/org/apache/carbondata/spark/rdd/CarbonDataRDDFactory.scala
---
    @@ -505,129 +512,129 @@ object CarbonDataRDDFactory extends Logging {
               )
         }
     
    -      val compactionThread = new Thread {
    -        override def run(): Unit = {
    +    val compactionThread = new Thread {
    +      override def run(): Unit = {
     
    +        try {
    +          // compaction status of the table which is triggered by the user.
    +          var triggeredCompactionStatus = false
    +          var exception: Exception = null
               try {
    -            // compaction status of the table which is triggered by the user.
    -            var triggeredCompactionStatus = false
    -            var exception : Exception = null
    -            try {
    -              executeCompaction(carbonLoadModel: CarbonLoadModel,
    -                hdfsStoreLocation: String,
    -                compactionModel: CompactionModel,
    -                partitioner: Partitioner,
    -                executor, sqlContext, kettleHomePath, storeLocation
    +            executeCompaction(carbonLoadModel: CarbonLoadModel,
    +              hdfsStoreLocation: String,
    +              compactionModel: CompactionModel,
    +              partitioner: Partitioner,
    +              executor, sqlContext, kettleHomePath, storeLocation
    +            )
    +            triggeredCompactionStatus = true
    +          }
    +          catch {
    +            case e: Exception =>
    +              logger.error("Exception in compaction thread " + e.getMessage)
    +              exception = e
    +          }
    +          // continue in case of exception also, check for all the tables.
    +          val isConcurrentCompactionAllowed = CarbonProperties.getInstance()
    +            .getProperty(CarbonCommonConstants.ENABLE_CONCURRENT_COMPACTION,
    +              CarbonCommonConstants.DEFAULT_ENABLE_CONCURRENT_COMPACTION
    +            ).equalsIgnoreCase("true")
    +
    +          if (!isConcurrentCompactionAllowed) {
    +            logger.info("System level compaction lock is enabled.")
    +            val skipCompactionTables = ListBuffer[CarbonTableIdentifier]()
    +            var tableForCompaction = CarbonCompactionUtil
    +              .getNextTableToCompact(CarbonEnv.getInstance(sqlContext).carbonCatalog.metadata
    +                .tablesMeta.toArray, skipCompactionTables.toList.asJava
                   )
    -              triggeredCompactionStatus = true
    -            }
    -            catch {
    -              case e: Exception =>
    -                logger.error("Exception in compaction thread " + e.getMessage)
    -                exception = e
    -            }
    -            // continue in case of exception also, check for all the tables.
    -            val isConcurrentCompactionAllowed = CarbonProperties.getInstance()
    -              .getProperty(CarbonCommonConstants.ENABLE_CONCURRENT_COMPACTION,
    -                CarbonCommonConstants.DEFAULT_ENABLE_CONCURRENT_COMPACTION
    -              ).equalsIgnoreCase("true")
    -
    -            if (!isConcurrentCompactionAllowed) {
    -              logger.info("System level compaction lock is enabled.")
    -              val skipCompactionTables = ListBuffer[CarbonTableIdentifier]()
    -              var tableForCompaction = CarbonCompactionUtil
    -                .getNextTableToCompact(CarbonEnv.getInstance(sqlContext).carbonCatalog.metadata
    -                  .tablesMeta.toArray, skipCompactionTables.toList.asJava
    +            while (null != tableForCompaction) {
    +              logger
    +                .info("Compaction request has been identified for table " + tableForCompaction
    +                  .carbonTable.getDatabaseName + "." + tableForCompaction.carbonTableIdentifier
    +                        .getTableName
                     )
    -              while (null != tableForCompaction) {
    -                logger
    -                  .info("Compaction request has been identified for table " + tableForCompaction
    -                    .carbonTable.getDatabaseName + "." + tableForCompaction.carbonTableIdentifier
    -                          .getTableName
    -                  )
    -                val table: CarbonTable = tableForCompaction.carbonTable
    -                val metadataPath = table.getMetaDataFilepath
    -                val compactionType = CarbonCompactionUtil.determineCompactionType(metadataPath)
    -
    -                val newCarbonLoadModel = new CarbonLoadModel()
    -                prepareCarbonLoadModel(hdfsStoreLocation, table, newCarbonLoadModel)
    -                val tableCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
    -                  .getTableCreationTime(newCarbonLoadModel.getDatabaseName,
    -                    newCarbonLoadModel.getTableName
    -                  )
    -
    -                val compactionSize = CarbonDataMergerUtil
    -                  .getCompactionSize(CompactionType.MAJOR_COMPACTION)
    -
    -                val newcompactionModel = CompactionModel(compactionSize,
    -                  compactionType,
    -                  table,
    -                  tableCreationTime,
    -                  compactionModel.isDDLTrigger
    +              val table: CarbonTable = tableForCompaction.carbonTable
    +              val metadataPath = table.getMetaDataFilepath
    +              val compactionType = CarbonCompactionUtil.determineCompactionType(metadataPath)
    +
    +              val newCarbonLoadModel = new CarbonLoadModel()
    +              prepareCarbonLoadModel(hdfsStoreLocation, table, newCarbonLoadModel)
    +              val tableCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
    +                .getTableCreationTime(newCarbonLoadModel.getDatabaseName,
    +                  newCarbonLoadModel.getTableName
    +                )
    --- End diff --
    
    move to previous line


> Improve Code and Fix Warnings
> -----------------------------
>
>                 Key: CARBONDATA-328
>                 URL: https://issues.apache.org/jira/browse/CARBONDATA-328
>             Project: CarbonData
>          Issue Type: Improvement
>            Reporter: Prabhat Kashyap
>            Priority: Trivial
>
> Remove compiler warning and improve the existing code according to the standards. 



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message