Skip to content

Commit 36ff8c0

Browse files
committed
Remove batch writes.
1 parent 6531541 commit 36ff8c0

File tree

9 files changed

+17
-319
lines changed

9 files changed

+17
-319
lines changed

_test_common/lib/matchers.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,10 @@ class _AssetGraphMatcher extends Matcher {
189189
}
190190
}
191191
}
192-
if (!equals(
193-
_expected.packageLanguageVersions,
194-
).matches(item.packageLanguageVersions, matchState)) {
192+
if (!equals(_expected.packageLanguageVersions).matches(
193+
item.packageLanguageVersions,
194+
matchState['packageLanguageVersions'] = <String, LanguageVersion?>{},
195+
)) {
195196
matches = false;
196197
}
197198
return matches;

build/lib/src/state/reader_state.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ extension AssetReaderStateExtension on AssetReader {
4141
InputTracker? get inputTracker =>
4242
this is AssetReaderState ? (this as AssetReaderState).inputTracker : null;
4343

44+
AssetPathProvider get assetPathProvider {
45+
_requireIsAssetReaderState();
46+
return (this as AssetReaderState).assetPathProvider;
47+
}
48+
4449
/// Gets [inputTracker] or throws a descriptive error if it is `null`.
4550
InputTracker get requireInputTracker {
4651
final result = inputTracker;
@@ -53,11 +58,6 @@ extension AssetReaderStateExtension on AssetReader {
5358
return result;
5459
}
5560

56-
AssetPathProvider get assetPathProvider {
57-
_requireIsAssetReaderState();
58-
return (this as AssetReaderState).assetPathProvider;
59-
}
60-
6161
/// Throws if `this` is not an [AssetReaderState].
6262
void _requireIsAssetReaderState() {
6363
if (this is! AssetReaderState) {

build_runner_core/lib/build_runner_core.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
export 'package:build/build.dart' show PostProcessBuildStep, PostProcessBuilder;
66

7-
export 'src/asset/batch.dart' show wrapInBatch;
87
export 'src/asset/file_based.dart';
98
export 'src/asset/finalized_reader.dart';
109
export 'src/asset/writer.dart';

build_runner_core/lib/src/asset/batch.dart

Lines changed: 0 additions & 191 deletions
This file was deleted.

build_runner_core/lib/src/asset/build_cache.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,24 +68,19 @@ class BuildCacheWriter implements RunnerAssetWriter {
6868
}
6969

7070
AssetId _cacheLocation(AssetId id, AssetGraph assetGraph, String rootPackage) {
71-
print('_cacheLocation $id');
7271
if (id.path.startsWith(generatedOutputDirectory) ||
7372
id.path.startsWith(cacheDir)) {
74-
print('--> return 1');
7573
return id;
7674
}
7775
if (!assetGraph.contains(id)) {
78-
print('--> return 2');
7976
return id;
8077
}
8178
final assetNode = assetGraph.get(id);
8279
if (assetNode is GeneratedAssetNode && assetNode.isHidden) {
83-
print('--> hit');
8480
return AssetId(
8581
rootPackage,
8682
'$generatedOutputDirectory/${id.package}/${id.path}',
8783
);
8884
}
89-
print('--> return 3');
9085
return id;
9186
}

build_runner_core/lib/src/asset/file_based.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:glob/list_local_fs.dart';
1313
import 'package:path/path.dart' as path;
1414

1515
import '../package_graph/package_graph.dart';
16-
import 'build_cache.dart';
1716
import 'writer.dart';
1817

1918
/// Basic [AssetReader] which uses a [PackageGraph] to look up where to read
@@ -71,9 +70,6 @@ class FileBasedAssetReader extends AssetReader implements AssetReaderState {
7170
ifAbsent: () async {
7271
final path = assetPathProvider.pathFor(id);
7372
if (!await filesystem.exists(path)) {
74-
print(
75-
'${assetPathProvider.runtimeType} is missing $path at ${StackTrace.current}',
76-
);
7773
throw AssetNotFoundException(id, path: path);
7874
}
7975
return filesystem.readAsBytes(path);
@@ -89,7 +85,6 @@ class FileBasedAssetReader extends AssetReader implements AssetReaderState {
8985
ifAbsent: () async {
9086
final path = assetPathProvider.pathFor(id);
9187
if (!await filesystem.exists(path)) {
92-
print('${assetPathProvider.runtimeType} is missing $path');
9388
throw AssetNotFoundException(id, path: path);
9489
}
9590
return filesystem.readAsBytes(path);
@@ -165,5 +160,7 @@ class FileBasedAssetWriter implements RunnerAssetWriter {
165160
}
166161

167162
@override
168-
Future<void> completeBuild() async {}
163+
Future<void> completeBuild() async {
164+
// TODO(davidmorgan): add back write caching, "batching".
165+
}
169166
}

build_runner_core/lib/src/environment/io_environment.dart

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import 'dart:io';
88
import 'package:build/build.dart';
99
import 'package:logging/logging.dart';
1010

11-
import '../asset/batch.dart';
1211
import '../asset/file_based.dart';
1312
import '../asset/writer.dart';
1413
import '../generate/build_directory.dart';
@@ -46,7 +45,6 @@ class IOEnvironment implements BuildEnvironment {
4645
PackageGraph packageGraph, {
4746
bool? assumeTty,
4847
bool outputSymlinksOnly = false,
49-
//bool lowResourcesMode = false,
5048
}) {
5149
if (outputSymlinksOnly && Platform.isWindows) {
5250
_logger.warning(
@@ -56,17 +54,9 @@ class IOEnvironment implements BuildEnvironment {
5654
);
5755
}
5856

59-
var fileReader = FileBasedAssetReader(packageGraph);
60-
var fileWriter = FileBasedAssetWriter(packageGraph);
61-
62-
var (reader, writer) =
63-
true
64-
? (fileReader, fileWriter)
65-
: wrapInBatch(reader: fileReader, writer: fileWriter);
66-
6757
return IOEnvironment._(
68-
reader,
69-
writer,
58+
FileBasedAssetReader(packageGraph),
59+
FileBasedAssetWriter(packageGraph),
7060
assumeTty == true || _canPrompt(),
7161
outputSymlinksOnly,
7262
packageGraph,

build_runner_core/lib/src/generate/build_impl.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,9 @@ class _SingleBuild {
10231023

10241024
for (var output in outputs) {
10251025
var wasOutput = writer.assetsWritten.contains(output);
1026+
if (wasOutput) {
1027+
await _reader.digest(output);
1028+
}
10261029
var digest = wasOutput ? await _reader.digest(output) : null;
10271030
var node = _assetGraph.get(output) as GeneratedAssetNode;
10281031

0 commit comments

Comments
 (0)