ajantha-bhat commented on pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#issuecomment-691502233 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
QiangCai commented on pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#issuecomment-690981838 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
kunal642 commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486993964 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
akashrn5 commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486982098 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
ajantha-bhat commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486965218 ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
asfgit closed pull request #3908: URL: https://github.com/apache/carbondata/pull/3908 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
QiangCai commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486039868 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: move to the outside of the map function ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: 1. cacheablePartitionSpecs doesn't contain an invalid segment. 2. use partitionSpecs of CACHE - cacheablePartitionSpecs ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: if finalCache empty, should remove cache if exists ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this always not empty. if the cache exists an invalid segment, it should update the cache. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: I mean it should has "else" branch to remove cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- Review comment: substraction of different type ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val existingCache = CACHE.get(identifier.tableId) + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + if (existingCache != null) { + val segmentCache = existingCache.asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { + // remove the existing cache as new cache values may be added. + // CarbonLRUCache does not allow cache updation until time is expired. + // TODO: Need to fix!! + CACHE.remove(identifier.tableId) Review comment: for concurrent query, line 53 will return null and it will lead to read all partitions. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
marchpure commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486976125 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: agree with you. also avoid to use getAbsolutePath function,which has high IO overhead ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
CarbonDataQA1 commented on pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#issuecomment-691131796 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
ajantha-bhat commented on pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#issuecomment-691502233 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
QiangCai commented on pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#issuecomment-690981838 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
kunal642 commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486993964 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: Can be empty during first load. in that case empty partitions would be stored in the cache ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) + val cacheObject = CacheablePartitionSpec(finalCache) + if (finalCache.nonEmpty) { Review comment: this check is to avoid caching empty cache map ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat This is disabled by default, so if the user feels that hive metastore getPartitions is slow, can enable this to improve performance. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: TableSegmentRefresher is in core module, cannot add there ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + }.toMap + // remove all invalid segment entries from cache + val finalCache = cacheablePartitionSpecs -- + validInvalidSegments.getInvalidSegments.asScala.map(_.getSegmentNo) Review comment: this is to remove entry of any invalid segment(like deleted segment) from the cacheablePartitionSpecs. As cacheablePartitionSpecs is a map of (segmentNo -> PartitionSpecs), therefore i am removing all the invalid segments from the final cache. Does this address your comment? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManger.scala ########## @@ -0,0 +1,176 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] Review comment: done ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @ajantha-bhat `sparkSession.sessionState.catalog.listPartitionsByFilter(identifier, partitionFilters)` is already being used for to filter the partitions based on the filter, but in concurrent queries as apark has to take a lock on metastore before accessing it, therefore the query performance was being degraded. And no user will have 200k segment, they need to anyways compact otherwise the query performance would be degraded ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: Yeah, because they are using presto, where compaction is not yet supported. If they are using hivemetastore surely they will face degrade in concurrent queries ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: done ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
akashrn5 commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486982098 ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: As i can see from here, we are basically removing the cache if the segment file is updated. Actually same thing we do in `TableSegmentRefresher`, and use that for updating all cache, can move this piece of logic there also to unify for all? we use `TableSegmentRefresher` during query, but here we are doing in case of load, can you try if we can do that? If not this PR, may be you can give a try in another, as it will be unified and good. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: As you mentioned first time it will take lot of time, but query time we will get benefit. You said matched partitions and since here for every load we are trying to cache, we wont be able to get any matched partitions right? It is something similar to our Indexes(MV, SI) etc where we load all segment at once in first time and from next time we do incremental, as @QiangCai mentioned. So here from subsequent loads, only that segment should be considered, which i think its being taken care. @ajantha-bhat are you trying to say to change to handle in query or load itself? Correct me, if i'm wrong. ########## File path: integration/spark/src/test/scala/org/apache/carbondata/spark/testsuite/standardpartition/StandardPartitionTableLoadingTestCase.scala ########## @@ -585,6 +587,30 @@ class StandardPartitionTableLoadingTestCase extends QueryTest with BeforeAndAfte } } + test("test partition caching") { + CarbonProperties.getInstance().addProperty("carbon.read.partition.hive.direct", "false") + sql("drop table if exists partition_cache") + sql("create table partition_cache(a string) partitioned by(b int) stored as carbondata") + sql("insert into partition_cache select 'k',1") + sql("select * from partition_cache where b = 1").collect() Review comment: can we add one assert to check the cache, after the load instead of query in one scenario? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: and i also checked now, this caching happens in flow query too, so you can consider my reply specific to load. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { Review comment: yes, you are right, i didn't observe that module level. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
In reply to this post by GitBox
ajantha-bhat commented on a change in pull request #3908: URL: https://github.com/apache/carbondata/pull/3908#discussion_r486965218 ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also need to update the document ########## File path: core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java ########## @@ -1273,6 +1273,13 @@ private CarbonCommonConstants() { @CarbonProperty public static final String CARBON_MAX_DRIVER_LRU_CACHE_SIZE = "carbon.max.driver.lru.cache.size"; + /** + * max driver lru cache size upto which partition lru cache will be loaded in memory + */ + @CarbonProperty Review comment: please also update the document ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, need to change the key as partition spec and cache only matched partitions @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. **So, the current design fails. need to change the key as partition spec and cache only matched partitions** @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: @akashrn5 : yeah, my problem scenario is first time query or upgrade, taking huge time (near to 5 hours for first time query) is still not ok. In this scenario, I feel reading from hive metastore itself is very fast compared to number of IO from the cloud storage ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge segments as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. As the feature is disabled by default. Ok for me. ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: readPartition reads the segment file. so basically first time we read all the segment files of the table. I have seen the users with 200K segments in one table stored in cloud. query takes more than 5 hours for them if we do this. So, the current design fails for huge segments. need to change the key as partition spec or cache only matched partitions from hive metastore read @kumarvishal09 , @QiangCai @marchpure : what is your opinion on this ? ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: ok. If the user feels hive metastore getPartitions is slow, still he cannot enable this in cloud scenario if he had the huge number of segments (as IO is very slow) as it will be slower than hive metastore. Also if the hive metastore supports filter pushdown, they can prune the partitions faster and give us the results using some metadata. (this might already be there) instead of we pruning manually by doing IO of all segment file first. **As the feature is disabled by default. Ok for me.** ########## File path: integration/spark/src/main/scala/org/apache/spark/util/PartitionCacheManager.scala ########## @@ -0,0 +1,181 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.util + +import java.net.URI +import java.util + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +import org.apache.log4j.Logger +import org.apache.spark.sql.catalyst.catalog.{CatalogStorageFormat, CatalogTablePartition} + +import org.apache.carbondata.common.logging.LogServiceFactory +import org.apache.carbondata.core.cache.{Cache, Cacheable, CarbonLRUCache} +import org.apache.carbondata.core.constants.CarbonCommonConstants +import org.apache.carbondata.core.datastore.impl.FileFactory +import org.apache.carbondata.core.index.Segment +import org.apache.carbondata.core.metadata.{AbsoluteTableIdentifier, SegmentFileStore} +import org.apache.carbondata.core.statusmanager.{LoadMetadataDetails, SegmentStatusManager} +import org.apache.carbondata.core.util.path.CarbonTablePath + +object PartitionCacheManager extends Cache[PartitionCacheKey, + java.util.List[CatalogTablePartition]] { + + private val CACHE = new CarbonLRUCache( + CarbonCommonConstants.CARBON_PARTITION_MAX_DRIVER_LRU_CACHE_SIZE, + CarbonCommonConstants.CARBON_MAX_LRU_CACHE_SIZE_DEFAULT) + + val LOGGER: Logger = LogServiceFactory.getLogService(this.getClass.getName) + + def get(identifier: PartitionCacheKey): java.util.List[CatalogTablePartition] = { + LOGGER.info("Reading partition values from store") + // read the tableStatus file to get valid and invalid segments + val validInvalidSegments = new SegmentStatusManager(AbsoluteTableIdentifier.from( + identifier.tablePath, null, null, identifier.tableId)) + .getValidAndInvalidSegments + val cacheablePartitionSpecs = validInvalidSegments.getValidSegments.asScala.map { segment => + val segmentFileName = segment.getSegmentFileName + val segmentFilePath = FileFactory.getCarbonFile( + CarbonTablePath.getSegmentFilePath(identifier.tablePath, segmentFileName)) + // read the last modified time + val segmentFileModifiedTime = segmentFilePath.getLastModifiedTime + val existingCache = CACHE.get(identifier.tableId) + if (existingCache != null) { + val segmentCache = CACHE.get(identifier.tableId).asInstanceOf[CacheablePartitionSpec] + .partitionSpecs.get(segment.getSegmentNo) + segmentCache match { + case Some(c) => + // check if cache needs to be updated + if (segmentFileModifiedTime > c._2) { + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } else { + (segment.getSegmentNo, c) + } + case None => + (segment.getSegmentNo, (readPartition(identifier, + segmentFilePath.getAbsolutePath), segmentFileModifiedTime)) + } + } else { + // read the partitions if not available in cache. + (segment.getSegmentNo, (readPartition(identifier, Review comment: we have users with 200k segments. But the data is partitioned by date and time. so all queries will have partition columns filter. so they query-specific segments every time (without any degrade in query time) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [hidden email] |
Free forum by Nabble | Edit this page |