Skip to content

[SPARK-32481][TESTS][FOLLOWUP] Use different directory name for MacOS #29550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-32481][TESTS][FOLLOWUP] Use different directory name for MacOS #29550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3116,16 +3116,17 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
.getTableMetadata(TableIdentifier("tab1")).storage.locationUri.get)

val fs = tablePath.getFileSystem(hadoopConf)
val trashRoot = fs.getTrashRoot(tablePath)
assert(!fs.exists(trashRoot))
val trashCurrent = new Path(fs.getTrashRoot(tablePath), "Current")
Copy link
Member

@HyukjinKwon HyukjinKwon Aug 26, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make a fake file system (that extends FileSystem) and use a temporary directory?

Copy link
Member

@dongjoon-hyun dongjoon-hyun Aug 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for @HyukjinKwon 's suggestion.

Copy link
Contributor Author

@Udbhav30 Udbhav30 Aug 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hii @HyukjinKwon, but Trash.moveToAppropriateTrash will always move the data to trashCurrent. can you guide me on what you mean by using a temporary directory instead.

val trashPath = Path.mergePaths(trashCurrent, tablePath)
assert(!fs.exists(trashPath))
try {
hadoopConf.set(trashIntervalKey, "5")
sql("TRUNCATE TABLE tab1")
} finally {
hadoopConf.set(trashIntervalKey, originalValue)
}
assert(fs.exists(trashRoot))
fs.delete(trashRoot, true)
assert(fs.exists(trashPath))
fs.delete(trashPath, true)
}
}
}
Expand All @@ -3144,15 +3145,16 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
.getTableMetadata(TableIdentifier("tab1")).storage.locationUri.get)

val fs = tablePath.getFileSystem(hadoopConf)
val trashRoot = fs.getTrashRoot(tablePath)
assert(!fs.exists(trashRoot))
val trashCurrent = new Path(fs.getTrashRoot(tablePath), "Current")
val trashPath = Path.mergePaths(trashCurrent, tablePath)
assert(!fs.exists(trashPath))
try {
hadoopConf.set(trashIntervalKey, "0")
sql("TRUNCATE TABLE tab1")
} finally {
hadoopConf.set(trashIntervalKey, originalValue)
}
assert(!fs.exists(trashRoot))
assert(!fs.exists(trashPath))
}
}
}
Expand All @@ -3167,9 +3169,10 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
.getTableMetadata(TableIdentifier("tab1")).storage.locationUri.get)

val fs = tablePath.getFileSystem(hadoopConf)
val trashRoot = fs.getTrashRoot(tablePath)
val trashCurrent = new Path(fs.getTrashRoot(tablePath), "Current")
val trashPath = Path.mergePaths(trashCurrent, tablePath)
sql("TRUNCATE TABLE tab1")
assert(!fs.exists(trashRoot))
assert(!fs.exists(trashPath))
}
}
}
Expand Down