Skip to content

Commit

Permalink
Remove PathCasingLookupFunction.
Browse files Browse the repository at this point in the history 
It appears not to have been wired up at all so it's all dead code.

It was created as response to bazelbuild#8799 about 2.5 years ago but it appears that that bug was never fixed.

RELNOTES: None.
PiperOrigin-RevId: 439766199
  • Loading branch information
@lberki @copybara-github
lberki authored and copybara-github committed Apr 6, 2022
1 parent 9e2f0bd commit e982f2a
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 554 deletions.
28 changes: 0 additions & 28 deletions src/main/java/com/google/devtools/build/lib/skyframe/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1719,34 +1719,6 @@ java_library(
],
)

java_library(
name = "path_casing_lookup_function",
srcs = ["PathCasingLookupFunction.java"],
deps = [
":directory_listing_value",
":path_casing_lookup_value",
"//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//third_party:guava",
],
)

java_library(
name = "path_casing_lookup_value",
srcs = ["PathCasingLookupValue.java"],
deps = [
":sky_functions",
"//src/main/java/com/google/devtools/build/lib/concurrent",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//third_party:guava",
],
)

java_library(
name = "pattern_expanding_error",
srcs = ["PatternExpandingError.java"],
Expand Down
119 changes: 0 additions & 119 deletions src/main/java/com/google/devtools/build/lib/skyframe/PathCasingLookupFunction.java
View file

This file was deleted.

116 changes: 0 additions & 116 deletions src/main/java/com/google/devtools/build/lib/skyframe/PathCasingLookupValue.java
View file

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/com/google/devtools/build/lib/skyframe/SkyFunctions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ public final class SkyFunctions {
SkyFunctionName.createSemiHermetic("ACTION_EXECUTION");
public static final SkyFunctionName ARTIFACT_NESTED_SET =
SkyFunctionName.createHermetic("ARTIFACT_NESTED_SET");
public static final SkyFunctionName PATH_CASING_LOOKUP =
SkyFunctionName.createHermetic("PATH_CASING_LOOKUP");
static final SkyFunctionName RECURSIVE_FILESYSTEM_TRAVERSAL =
SkyFunctionName.createHermetic("RECURSIVE_DIRECTORY_TRAVERSAL");
public static final SkyFunctionName FILESET_ENTRY =
Expand Down
58 changes: 1 addition & 57 deletions src/test/java/com/google/devtools/build/lib/skyframe/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,14 @@ filegroup(
visibility = ["//src/test/java/com/google/devtools/build/lib:__pkg__"],
)

# Tests for Windows-specific functionality that can run cross-platform.
# These don't need to run on Windows, they merely use Windows- and case-insensitive path semantics.
CROSS_PLATFORM_WINDOWS_TESTS = [
"PathCasingLookupFunctionTest.java",
]

# Tests that are broken out from the SkyframeTests target into separate targets.
EXCLUDED_FROM_SKYFRAME_TESTS = [
"LocalDiffAwarenessTest.java",
"LocalDiffAwarenessIntegrationTest.java",
"PrepareDepsOfTargetsUnderDirectoryFunctionTest.java", # b/179148968
"SkyframeErrorProcessorTest.java",
"BuildDriverFunctionTest.java",
] + CROSS_PLATFORM_WINDOWS_TESTS
]

java_library(
name = "testutil",
Expand Down Expand Up @@ -322,56 +316,6 @@ java_test(
],
)

# Tests that exercise Windows-specific (or case-insensitive-filesystem specific) functionality.
# These don't need to run on Windows, they merely use Windows- and case-insensitive path semantics.
java_test(
name = "windows_test",
srcs = CROSS_PLATFORM_WINDOWS_TESTS,
jvm_flags = [
"-Dblaze.os=Windows",
"-Dbazel.windows_unix_root=C:/fake/msys",
],
tags = ["skyframe"],
test_class = "com.google.devtools.build.lib.AllTests",
deps = [
":testutil",
"//src/main/java/com/google/devtools/build/lib/actions",
"//src/main/java/com/google/devtools/build/lib/actions:artifacts",
"//src/main/java/com/google/devtools/build/lib/actions:file_metadata",
"//src/main/java/com/google/devtools/build/lib/analysis:blaze_directories",
"//src/main/java/com/google/devtools/build/lib/analysis:server_directories",
"//src/main/java/com/google/devtools/build/lib/clock",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/events",
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/lib/pkgcache",
"//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:directory_listing_state_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:file_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:path_casing_lookup_function",
"//src/main/java/com/google/devtools/build/lib/skyframe:path_casing_lookup_value",
"//src/main/java/com/google/devtools/build/lib/skyframe:sky_functions",
"//src/main/java/com/google/devtools/build/lib/skyframe:skyframe_cluster",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
"//src/main/java/com/google/devtools/build/lib/util/io",
"//src/main/java/com/google/devtools/build/lib/vfs",
"//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
"//src/main/java/com/google/devtools/build/lib/vfs/inmemoryfs",
"//src/main/java/com/google/devtools/build/skyframe",
"//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
"//src/test/java/com/google/devtools/build/lib:test_runner",
"//src/test/java/com/google/devtools/build/lib/analysis/util",
"//src/test/java/com/google/devtools/build/lib/testutil",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
)

# TODO(b/179148968): This used to be part of SkyframeTests but was broken off because it has some
# non-hermetic interaction with another test, depending on how the tests get sharded.
java_test(
Expand Down
Loading

0 comments on commit e982f2a

Please sign in to comment.