8000 Rename `EdgelessInMemoryNodeEntry` to `NonIncrementalNodeEntry`. · coderabbit-test/bazel@586c464 · GitHub
[go: up one dir, main page]
Skip to content

Commit 586c464

Browse files
justinhorvitzcopybara-github
justinhorvitz
authored and
copybara-github
committed
Rename EdgelessInMemoryNodeEntry to NonIncrementalNodeEntry.
To match nomenclature of `IncrementalInMemoryNodeEntry`. PiperOrigin-RevId: 555156722 Change-Id: I6640f101b1f3e3a6db884ff2857b4c5d476138f2
1 parent b6bcc54 commit 586c464

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎src/main/java/com/google/devtools/build/skyframe/AbstractInMemoryNodeEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
/**
2626
* Partial implementation of {@link InMemoryNodeEntry} containing behavior common to both {@link
27-
* IncrementalInMemoryNodeEntry} and {@link EdgelessInMemoryNodeEntry}. All operations on this class
28-
* are thread-safe.
27+
* IncrementalInMemoryNodeEntry} and {@link NonIncrementalInMemoryNodeEntry}. All operations on this
28+
* class are thread-safe.
2929
*
3030
* <p>Care was taken to provide certain compound operations to avoid certain check-then-act races.
3131
* That means this class is somewhat closely tied to the exact Evaluator implementation.

‎src/main/java/com/google/devtools/build/skyframe/InMemoryGraphImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public EdgelessInMemoryGraphImpl(boolean usePooledInterning) {
272272

273273
@Override
274274
protected InMemoryNodeEntry newNodeEntry(SkyKey key) {
275-
return new EdgelessInMemoryNodeEntry(key);
275+
return new NonIncrementalInMemoryNodeEntry(key);
276276
}
277277
}
278278

‎src/main/java/com/google/devtools/build/skyframe/EdgelessInMemoryNodeEntry.java renamed to ‎src/main/java/com/google/devtools/build/skyframe/NonIncrementalInMemoryNodeEntry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
* graph. Any attempt to access the edges once the node is done will fail the build fast.
2525
*/
2626
// TODO(b/262871730): Do not extend IncrementalInMemoryNodeEntry.
27-
public class EdgelessInMemoryNodeEntry extends IncrementalInMemoryNodeEntry {
27+
public class NonIncrementalInMemoryNodeEntry extends IncrementalInMemoryNodeEntry {
2828

29-
public EdgelessInMemoryNodeEntry(SkyKey key) {
29+
public NonIncrementalInMemoryNodeEntry(SkyKey key) {
3030
super(key);
3131
}
3232

‎src/test/shell/integration/discard_graph_edges_test.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,14 @@ function test_packages_cleared() {
257257
'RuleConfiguredTarget$')"
258258
[[ "$ct_count" -ge 18 ]] \
259259
|| fail "RuleConfiguredTarget count $ct_count too low: did you move/rename the class?"
260-
local edgeless_entry_count="$(extract_histogram_count "$histo_file" \
261-
'EdgelessInMemoryNodeEntry')"
262-
[[ "$edgeless_entry_count" -eq 0 ]] \
263-
|| fail "$edgeless_entry_count EdgelessInMemoryNodeEntry instances found in build keeping edges"
264-
local node_entry_count="$(extract_histogram_count "$histo_file" \
260+
local non_incremental_entry_count="$(extract_histogram_count "$histo_file" \
261+
'NonIncrementalInMemoryNodeEntry')"
262+
[[ "$non_incremental_entry_count" -eq 0 ]] \
263+
|| fail "$non_incremental_entry_count NonIncrementalInMemoryNodeEntry instances found in build keeping edges"
264+
local incremental_entry_count="$(extract_histogram_count "$histo_file" \
265265
'\.IncrementalInMemoryNodeEntry')"
266-
[[ "$node_entry_count" -ge 100 ]] \
267-
|| fail "Only $node_entry_count IncrementalInMemoryNodeEntry instances found in build keeping edges"
266+
[[ "$incremental_entry_count" -ge 100 ]] \
267+
|| fail "Only $incremental_entry_count IncrementalInMemoryNodeEntry instances found in build keeping edges"
268268
local histo_file="$(prepare_histogram "$BUILD_FLAGS")"
269269
package_count="$(extract_histogram_count "$histo_file" \
270270
'devtools\.build\.lib\..*\.Package$')"
@@ -281,14 +281,14 @@ function test_packages_cleared() {
281281
'RuleConfiguredTarget$')"
282282
[[ "$ct_count" -le 1 ]] \
283283
|| fail "too many RuleConfiguredTarget: expected at most 1, got $ct_count"
284-
edgeless_entry_count="$(extract_histogram_count "$histo_file" \
285-
'EdgelessInMemoryNodeEntry')"
286-
[[ "$edgeless_entry_count" -ge 100 ]] \
287-
|| fail "Not enough ($edgless_entry_count) EdgelessInMemoryNodeEntry instances found in build discarding edges"
288-
node_entry_count="$(extract_histogram_count "$histo_file" \
284+
non_incremental_entry_count="$(extract_histogram_count "$histo_file" \
285+
'NonIncrementalInMemoryNodeEntry')"
286+
[[ "$non_incremental_entry_count" -ge 100 ]] \
287+
|| fail "Not enough ($non_incremental_entry_count) NonIncrementalInMemoryNodeEntry instances found in build discarding edges"
288+
incremental_entry_count="$(extract_histogram_count "$histo_file" \
289289
'\.IncrementalInMemoryNodeEntry')"
290-
[[ "$node_entry_count" -le 10 ]] \
291-
|| fail "Too many ($node_entry_count) IncrementalInMemoryNodeEntry instances found in build discarding edges"
290+
[[ "$incremental_entry_count" -le 10 ]] \
291+
|| fail "Too many ($incremental_entry_count) IncrementalInMemoryNodeEntry instances found in build discarding edges"
292292
}
293293

294294
# Action conflicts can cause deletion of nodes, and deletion is tricky with no edges.

0 commit comments

Comments
 (0)
0