diff options
| author |  shreyax <shreyax@google.com> | 2018-07-02 09:16:18 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-02 09:17:43 -0700 |
| commit | 6871cf019cb4ad3a5e5c2b8d3d16fb9c37a8e35d (patch) | |
| tree | fe1eb78f9cf4871fb85f66b3f8832f4f43c11345 /src/main/java/com/google/devtools/build/lib/query2/engine | |
| parent | d3228b61f633cdc5b3f740b641a0836f1bd79abd (diff) | |
Allow uniquifiers to throw QueryExceptions.
RELNOTES: None.
PiperOrigin-RevId: 202961077
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/query2/engine')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java | 9 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/query2/engine/Uniquifier.java | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java index fce662fcef..120d53bee1 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/QueryUtil.java @@ -224,15 +224,8 @@ public final class QueryUtil { private final Set<K> alreadySeen; public UniquifierImpl(KeyExtractor<T, K> extractor) { - this(extractor, /*concurrencyLevel=*/ 1); - } - - public UniquifierImpl(KeyExtractor<T, K> extractor, int concurrencyLevel) { this.extractor = extractor; - this.alreadySeen = - Collections.newSetFromMap( - new ConcurrentHashMap<>( - /*initialCapacity=*/ concurrencyLevel, /*loadFactor=*/ 0.75f)); + this.alreadySeen = Collections.newSetFromMap(new ConcurrentHashMap<>()); } @Override diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/Uniquifier.java b/src/main/java/com/google/devtools/build/lib/query2/engine/Uniquifier.java index 390a14930b..e363c1f7df 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/engine/Uniquifier.java +++ b/src/main/java/com/google/devtools/build/lib/query2/engine/Uniquifier.java @@ -31,14 +31,14 @@ public interface Uniquifier<T> { boolean uniquePure(T newElement); /** - * Returns whether {@code newElement} has been seen before by {@link #unique(T)} or - * {@link #unique(Iterable)}. + * Returns whether {@code newElement} has been seen before by {@link #unique(T)} or {@link + * #unique(Iterable)}. */ - boolean unique(T newElement); + boolean unique(T newElement) throws QueryException; /** * Returns the subset of {@code newElements} that haven't been seen before by {@link #unique(T)} * or {@link #unique(Iterable)}. */ - ImmutableList<T> unique(Iterable<T> newElements); + ImmutableList<T> unique(Iterable<T> newElements) throws QueryException; } |