Skip to content

Commit bf278fa

Browse files
committed
fix python tests
1 parent e82909c commit bf278fa

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

python/pyspark/context.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def _getJavaStorageLevel(self, storageLevel):
383383
raise Exception("storageLevel must be of type pyspark.StorageLevel")
384384

385385
newStorageLevel = self._jvm.org.apache.spark.storage.StorageLevel
386-
return newStorageLevel(storageLevel.useDisk, storageLevel.useMemory,
386+
return newStorageLevel(storageLevel.useDisk, storageLevel.useMemory, storageLevel.userTachyon,
387387
storageLevel.deserialized, storageLevel.replication)
388388

389389
def setJobGroup(self, groupId, description):

python/pyspark/rdd.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,11 +1178,12 @@ def getStorageLevel(self):
11781178
Get the RDD's current storage level.
11791179
>>> rdd1 = sc.parallelize([1,2])
11801180
>>> rdd1.getStorageLevel()
1181-
StorageLevel(False, False, False, 1)
1181+
StorageLevel(False, False, False, False, 1)
11821182
"""
11831183
java_storage_level = self._jrdd.getStorageLevel()
11841184
storage_level = StorageLevel(java_storage_level.useDisk(),
11851185
java_storage_level.useMemory(),
1186+
java_storage_level.useTachyon(),
11861187
java_storage_level.deserialized(),
11871188
java_storage_level.replication())
11881189
return storage_level

python/pyspark/storagelevel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def __init__(self, useDisk, useMemory, useTachyon, deserialized, replication = 1
3333
self.replication = replication
3434

3535
def __repr__(self):
36-
return "StorageLevel(%s, %s, %s, %s)" % (
37-
self.useDisk, self.useMemory, self.deserialized, self.replication)
36+
return "StorageLevel(%s, %s, %s, %s, %s)" % (
37+
self.useDisk, self.useMemory, self.useTachyon, self.deserialized, self.replication)
3838

3939
StorageLevel.DISK_ONLY = StorageLevel(True, False, False, False)
4040
StorageLevel.DISK_ONLY_2 = StorageLevel(True, False, False, False, 2)

0 commit comments

Comments
 (0)