You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/25 18:59:00 UTC
[2/2] lucene-solr:apiv2: SOLR-8029: fixing some test errors
SOLR-8029: fixing some test errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c91b9621
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c91b9621
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c91b9621
Branch: refs/heads/apiv2
Commit: c91b96211b9e88c6cc7a4e3aedc14e4f1375dab8
Parents: 4ddaba3
Author: Noble Paul <no...@apache.org>
Authored: Thu Jan 26 05:28:38 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jan 26 05:28:38 2017 +1030
----------------------------------------------------------------------
.../src/java/org/apache/lucene/util/RamUsageTester.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c91b9621/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
----------------------------------------------------------------------
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
index bf1a9de..337d4be 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java
@@ -160,7 +160,10 @@ public final class RamUsageTester {
Collections.emptyMap(), stack);
needsReflection = false;
} else if (ob instanceof Iterable) {
- final List<Object> values = null;
+ final List<Object> values = StreamSupport.stream(((Iterable<?>) ob).spliterator(), false)
+ .collect(Collectors.toList());
+ totalSize += accumulator.accumulateArray(ob, cachedInfo.alignedShallowInstanceSize + RamUsageEstimator.NUM_BYTES_ARRAY_HEADER, values, stack);
+ needsReflection = false;
} else if (ob instanceof Map) {
final List<Object> values = ((Map<?,?>) ob).entrySet().stream()
.flatMap(e -> Stream.of(e.getKey(), e.getValue()))