Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/5430#discussion_r28033633
--- Diff: core/src/main/scala/org/apache/spark/storage/OffHeapStore.scala
---
@@ -0,0 +1,142 @@
+/*
+ * 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.storage
+
+import java.nio.ByteBuffer
+import org.apache.spark.Logging
+import org.apache.spark.util.Utils
+
+import scala.util.control.NonFatal
+
+
+/**
+ * Stores BlockManager blocks on OffHeap.
+ * We capture any potential exception from underlying implementation
+ * and return with the expected failure value
+ */
+private[spark] class OffHeapStore(blockManager: BlockManager, executorId:
String)
+ extends BlockStore(blockManager: BlockManager) with Logging {
+
+ lazy val offHeapManager: Option[OffHeapBlockManager] =
+ OffHeapBlockManager.create(blockManager, executorId)
+
+ logInfo("OffHeap started")
+
+ override def getSize(blockId: BlockId): Long = {
+ try {
+ offHeapManager.map(_.getSize(blockId)).getOrElse(0)
+ } catch {
+ case NonFatal(t) => logError(s"error in getSize from $blockId")
+ 0
+ }
+ }
+
+ override def putBytes(blockId: BlockId, bytes: ByteBuffer, level:
StorageLevel): PutResult = {
+ putIntoOffHeapStore(blockId, bytes, returnValues = true)
+ }
+
+ override def putArray(
+ blockId: BlockId,
+ values: Array[Any],
+ level: StorageLevel,
+ returnValues: Boolean): PutResult = {
+ putIterator(blockId, values.toIterator, level, returnValues)
+ }
+
+ override def putIterator(
+ blockId: BlockId,
+ values: Iterator[Any],
+ level: StorageLevel,
+ returnValues: Boolean): PutResult = {
+ logDebug(s"Attempting to write values for block $blockId")
+ val bytes = blockManager.dataSerialize(blockId, values)
+ putIntoOffHeapStore(blockId, bytes, returnValues)
+ }
+
+ private def putIntoOffHeapStore(
+ blockId: BlockId,
+ bytes: ByteBuffer,
+ returnValues: Boolean): PutResult = {
+
+ // So that we do not modify the input offsets !
+ // duplicate does not copy buffer, so inexpensive
+ val byteBuffer = bytes.duplicate()
+ byteBuffer.rewind()
+ logDebug(s"Attempting to put block $blockId into OffHeap store")
+ val startTime = System.currentTimeMillis
+ // we should never hit here if offHeapManager is None. Handle it
anyway for safety.
+ try {
+ if (offHeapManager.isDefined) {
+ offHeapManager.get.putBytes(blockId, bytes)
+ val finishTime = System.currentTimeMillis
+ logDebug("Block %s stored as %s file in OffHeap store in %d
ms".format(
+ blockId, Utils.bytesToString(byteBuffer.limit), finishTime -
startTime))
+
+ if (returnValues) {
+ PutResult(bytes.limit(), Right(bytes.duplicate()))
+ } else {
+ PutResult(bytes.limit(), null)
+ }
+ } else {
+ logError(s"error in putBytes $blockId")
+ PutResult(bytes.limit(), null, Seq((blockId, BlockStatus.empty)))
+ }
+ } catch {
+ case NonFatal(t) => logError(s"error in putBytes $blockId")
+ PutResult(bytes.limit(), null, Seq((blockId, BlockStatus.empty)))
+ }
+ }
+
+ // We assume the block is removed even if exception thrown
+ override def remove(blockId: BlockId): Boolean = {
+ try {
+ offHeapManager.map(_.removeFile(blockId)).getOrElse(true)
+ } catch {
+ case NonFatal(t) => logError(s"error in removing $blockId")
+ true
+ }
+ }
+
+ override def getValues(blockId: BlockId): Option[Iterator[Any]] = {
+ getBytes(blockId).map(buffer => blockManager.dataDeserialize(blockId,
buffer))
+ }
+
--- End diff --
remove the extra blank line here when you update
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
