Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .jules/bolt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Bolt's Journal
2 changes: 1 addition & 1 deletion resolver/src/main/java/net/evendanan/bazel/mvn/Merger.java
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ private void writeResults(
"Constructing Bazel targets",
"%d out of %d (%.2f%%%s): %s...");
List<TargetsToWrite> targetsToWritePairs =
resolvedDependencies.stream()
resolvedDependencies.parallelStream()
.peek(d -> timer.taskDone(dependencyTools.mavenCoordinates(d)))
.map(
dependency ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,10 @@ private static Target addAlias(
public static class HttpTargetsBuilder implements TargetsBuilder {
private static final char[] hexArray = "0123456789abcdef".toCharArray();
private final boolean calculateSha;
private final byte[] readBuffer;
private final Function<Dependency, URI> downloader;

public HttpTargetsBuilder(boolean calculateSha, Function<Dependency, URI> downloader) {
this.calculateSha = calculateSha;
this.readBuffer = calculateSha ? new byte[4096] : new byte[0];
this.downloader = downloader;
}

Expand All @@ -205,6 +203,7 @@ public List<Target> buildTargets(final Dependency dependency, DependencyTools de
if (calculateSha && !dependency.mavenCoordinate().version().contains("SNAPSHOT")) {
try (InputStream inputStream = downloader.apply(dependency).toURL().openStream()) {
final MessageDigest digest = MessageDigest.getInstance("SHA-256");
final byte[] readBuffer = new byte[16384];

int bytesCount;
while ((bytesCount = inputStream.read(readBuffer)) != -1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public ProgressTimer(int tasksCount, String title, String progressText) {
this.timer.start(tasksCount);
}

public void taskDone(String taskName) {
public synchronized void taskDone(String taskName) {
final TimingData timingData = timer.taskDone();
final String estimatedTimeLeft;
if (timingData.doneTasks >= 3) {
Expand All @@ -32,7 +32,7 @@ public void taskDone(String taskName) {
taskName);
}

public void finish() {
public synchronized void finish() {
TimingData finish = timer.finish();
report("Finished. %s", TaskTiming.humanReadableTime(finish.totalTime - finish.startTime));
}
Expand Down
11 changes: 6 additions & 5 deletions resolver/src/main/java/net/evendanan/timing/TaskTiming.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,33 @@ public static String humanReadableTime(long milliseconds) {
return timeString;
}

public TimingData start(final int totalTasksCount) {
public synchronized TimingData start(final int totalTasksCount) {
startTime = getCurrentTime();
completedTasks = 0;
totalTasks = totalTasksCount;
return generateTimingData();
}

public TimingData updateTotalTasks(final int totalTasksCount) {
public synchronized TimingData updateTotalTasks(final int totalTasksCount) {
totalTasks = totalTasksCount;
return generateTimingData();
}

public TimingData taskDone() {
public synchronized TimingData taskDone() {
completedTasks++;
return generateTimingData();
}

public TimingData finish() {
public synchronized TimingData finish() {
return generateTimingData();
}

private TimingData generateTimingData() {
final long totalTime = getCurrentTime();
final long duration = totalTime - startTime;
final float ratioOfDone = completedTasks / (float) totalTasks;
final long estimatedTimeLeft = (long) (duration / ratioOfDone) - duration;
final long estimatedTimeLeft =
(ratioOfDone == 0) ? 0 : (long) (duration / ratioOfDone) - duration;

return new TimingData(
totalTasks, completedTasks, startTime, totalTime, estimatedTimeLeft, ratioOfDone);
Expand Down