Skip to content

Commit 797f292

Browse files
buchgrcopybara-github
buchgr
authored and
copybara-github
committed
gradually get rid of the cgdbl/remote/blobstore package
this is a pure refactoring that moves 1) blobstore/SimpleBlobStore.java -> common/SimpleBlobStore.java 2) blobstore/http -> http 3) blobstore/disk -> disk Closes bazelbuild#8972. PiperOrigin-RevId: 260689016
1 parent 5af49c0 commit 797f292

35 files changed

Lines changed: 127 additions & 83 deletions

‎src/main/java/com/google/devtools/build/lib/BUILD‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ filegroup(
4444
"//src/main/java/com/google/devtools/build/lib/profiler/memory:srcs",
4545
"//src/main/java/com/google/devtools/build/lib/query2:srcs",
4646
"//src/main/java/com/google/devtools/build/lib/remote:srcs",
47-
"//src/main/java/com/google/devtools/build/lib/remote/blobstore:srcs",
48-
"//src/main/java/com/google/devtools/build/lib/remote/blobstore/http:srcs",
49-
"//src/main/java/com/google/devtools/build/lib/remote/logging:srcs",
50-
"//src/main/java/com/google/devtools/build/lib/remote/options:srcs",
51-
"//src/main/java/com/google/devtools/build/lib/remote/util:srcs",
52-
"//src/main/java/com/google/devtools/build/lib/remote/merkletree:srcs",
5347
"//src/main/java/com/google/devtools/build/lib/rules/apple/cpp:srcs",
5448
"//src/main/java/com/google/devtools/build/lib/rules/apple:srcs",
5549
"//src/main/java/com/google/devtools/build/lib/rules/apple/swift:srcs",

‎src/main/java/com/google/devtools/build/lib/remote/BUILD‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@ package(default_visibility = ["//src:__subpackages__"])
22

33
filegroup(
44
name = "srcs",
5-
srcs = glob(["**"]),
5+
srcs = glob(["**"]) + [
6+
"//src/main/java/com/google/devtools/build/lib/remote/common:srcs",
7+
"//src/main/java/com/google/devtools/build/lib/remote/disk:srcs",
8+
"//src/main/java/com/google/devtools/build/lib/remote/blobstore:srcs",
9+
"//src/main/java/com/google/devtools/build/lib/remote/http:srcs",
10+
"//src/main/java/com/google/devtools/build/lib/remote/logging:srcs",
11+
"//src/main/java/com/google/devtools/build/lib/remote/options:srcs",
12+
"//src/main/java/com/google/devtools/build/lib/remote/util:srcs",
13+
"//src/main/java/com/google/devtools/build/lib/remote/merkletree:srcs",
14+
],
615
visibility = ["//src/main/java/com/google/devtools/build/lib:__pkg__"],
716
)
817

@@ -30,7 +39,9 @@ java_library(
3039
"//src/main/java/com/google/devtools/build/lib/concurrent",
3140
"//src/main/java/com/google/devtools/build/lib/profiler",
3241
"//src/main/java/com/google/devtools/build/lib/remote/blobstore",
33-
"//src/main/java/com/google/devtools/build/lib/remote/blobstore/http",
42+
"//src/main/java/com/google/devtools/build/lib/remote/common",
43+
"//src/main/java/com/google/devtools/build/lib/remote/disk",
44+
"//src/main/java/com/google/devtools/build/lib/remote/http",
3445
"//src/main/java/com/google/devtools/build/lib/remote/logging",
3546
"//src/main/java/com/google/devtools/build/lib/remote/merkletree",
3647
"//src/main/java/com/google/devtools/build/lib/remote/options",

‎src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreActionCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.google.common.util.concurrent.SettableFuture;
3030
import com.google.devtools.build.lib.actions.ExecException;
3131
import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
32-
import com.google.devtools.build.lib.remote.blobstore.SimpleBlobStore;
32+
import com.google.devtools.build.lib.remote.common.SimpleBlobStore;
3333
import com.google.devtools.build.lib.remote.options.RemoteOptions;
3434
import com.google.devtools.build.lib.remote.util.DigestUtil;
3535
import com.google.devtools.build.lib.remote.util.DigestUtil.ActionKey;

‎src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.google.common.base.Ascii;
1919
import com.google.common.base.Preconditions;
2020
import com.google.common.collect.ImmutableList;
21-
import com.google.devtools.build.lib.remote.blobstore.CombinedDiskHttpBlobStore;
2221
import com.google.devtools.build.lib.remote.blobstore.ConcurrentMapBlobStore;
23-
import com.google.devtools.build.lib.remote.blobstore.OnDiskBlobStore;
24-
import com.google.devtools.build.lib.remote.blobstore.SimpleBlobStore;
25-
import com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStore;
22+
import com.google.devtools.build.lib.remote.common.SimpleBlobStore;
23+
import com.google.devtools.build.lib.remote.disk.CombinedDiskHttpBlobStore;
24+
import com.google.devtools.build.lib.remote.disk.OnDiskBlobStore;
25+
import com.google.devtools.build.lib.remote.http.HttpBlobStore;
2626
import com.google.devtools.build.lib.remote.options.RemoteOptions;
2727
import com.google.devtools.build.lib.vfs.Path;
2828
import com.google.devtools.build.lib.vfs.PathFragment;

‎src/main/java/com/google/devtools/build/lib/remote/blobstore/BUILD‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package(default_visibility = ["//src:__subpackages__"])
33
filegroup(
44
name = "srcs",
55
srcs = glob(["**"]),
6-
visibility = ["//src/main/java/com/google/devtools/build/lib:__pkg__"],
6+
visibility = ["//src/main/java/com/google/devtools/build/lib/remote:__pkg__"],
77
)
88

99
java_library(
1010
name = "blobstore",
1111
srcs = glob(["*.java"]),
1212
tags = ["bazel"],
1313
deps = [
14+
"//src/main/java/com/google/devtools/build/lib/remote/common",
1415
"//src/main/java/com/google/devtools/build/lib/remote/util",
1516
"//src/main/java/com/google/devtools/build/lib/vfs",
1617
"//src/main/java/com/google/devtools/common/options",

‎src/main/java/com/google/devtools/build/lib/remote/blobstore/ConcurrentMapBlobStore.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.google.common.io.ByteStreams;
1818
import com.google.common.util.concurrent.ListenableFuture;
1919
import com.google.common.util.concurrent.SettableFuture;
20+
import com.google.devtools.build.lib.remote.common.SimpleBlobStore;
2021
import java.io.IOException;
2122
import java.io.InputStream;
2223
import java.io.OutputStream;

‎src/main/java/com/google/devtools/build/lib/remote/common/BUILD‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package(default_visibility = ["//src:__subpackages__"])
2+
3+
filegroup(
4+
name = "srcs",
5+
srcs = glob(["**"]),
6+
visibility = ["//src/main/java/com/google/devtools/build/lib/remote:__pkg__"],
7+
)
8+
9+
java_library(
10+
name = "common",
11+
srcs = glob(["*.java"]),
12+
tags = ["bazel"],
13+
deps = [
14+
"//third_party:guava",
15+
],
16+
)

src/main/java/com/google/devtools/build/lib/remote/blobstore/SimpleBlobStore.java renamed to src/main/java/com/google/devtools/build/lib/remote/common/SimpleBlobStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.devtools.build.lib.remote.blobstore;
15+
package com.google.devtools.build.lib.remote.common;
1616

1717
import com.google.common.util.concurrent.ListenableFuture;
1818
import java.io.IOException;

‎src/main/java/com/google/devtools/build/lib/remote/disk/BUILD‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package(default_visibility = ["//src:__subpackages__"])
2+
3+
filegroup(
4+
name = "srcs",
5+
srcs = glob(["**"]),
6+
visibility = ["//src/main/java/com/google/devtools/build/lib/remote:__pkg__"],
7+
)
8+
9+
java_library(
10+
name = "disk",
11+
srcs = glob(["*.java"]),
12+
tags = ["bazel"],
13+
deps = [
14+
"//src/main/java/com/google/devtools/build/lib/remote/common",
15+
"//src/main/java/com/google/devtools/build/lib/remote/util",
16+
"//src/main/java/com/google/devtools/build/lib/vfs",
17+
"//src/main/java/com/google/devtools/common/options",
18+
"//third_party:guava",
19+
],
20+
)

src/main/java/com/google/devtools/build/lib/remote/blobstore/CombinedDiskHttpBlobStore.java renamed to src/main/java/com/google/devtools/build/lib/remote/disk/CombinedDiskHttpBlobStore.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
package com.google.devtools.build.lib.remote.blobstore;
14+
package com.google.devtools.build.lib.remote.disk;
1515

1616
import com.google.common.base.Preconditions;
1717
import com.google.common.util.concurrent.Futures;
1818
import com.google.common.util.concurrent.ListenableFuture;
1919
import com.google.common.util.concurrent.MoreExecutors;
20+
import com.google.devtools.build.lib.remote.common.SimpleBlobStore;
2021
import com.google.devtools.build.lib.vfs.Path;
2122
import java.io.IOException;
2223
import java.io.InputStream;

0 commit comments

Comments
 (0)