You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2018/04/07 18:30:55 UTC
[1/4] lucene-solr:master: LUCENE-8226: Don't generate unnecessarily
massive indexes for index vs query sorting test
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 77e2ed277 -> 2ccea7b47
refs/heads/master 0f53adbee -> 2ae488aae
LUCENE-8226: Don't generate unnecessarily massive indexes for index vs query sorting test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/005da875
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/005da875
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/005da875
Branch: refs/heads/master
Commit: 005da875211bc271257c1fb008a8355a3c1e9f3c
Parents: 0f53adb
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Apr 7 18:29:14 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Apr 7 18:29:14 2018 +0100
----------------------------------------------------------------------
.../src/test/org/apache/lucene/index/TestIndexSorting.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/005da875/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
index 6b43c16..3679d20 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -2222,12 +2222,7 @@ public class TestIndexSorting extends LuceneTestCase {
// pits index time sorting against query time sorting
public void testRandom3() throws Exception {
- int numDocs;
- if (TEST_NIGHTLY) {
- numDocs = atLeast(100000);
- } else {
- numDocs = atLeast(1000);
- }
+ int numDocs = atLeast(1000);
List<RandomDoc> docs = new ArrayList<>();
Sort sort = randomSort();
[2/4] lucene-solr:branch_7x: LUCENE-8226: Don't generate
unnecessarily massive indexes for index vs query sorting test
Posted by ro...@apache.org.
LUCENE-8226: Don't generate unnecessarily massive indexes for index vs query sorting test
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/36923140
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/36923140
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/36923140
Branch: refs/heads/branch_7x
Commit: 3692314040b1f95ce11282ad2eb32a16efd59c88
Parents: 77e2ed2
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Apr 7 18:29:14 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Apr 7 18:29:54 2018 +0100
----------------------------------------------------------------------
.../src/test/org/apache/lucene/index/TestIndexSorting.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/36923140/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
index 0a8799d..f63748c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexSorting.java
@@ -2227,12 +2227,7 @@ public class TestIndexSorting extends LuceneTestCase {
// pits index time sorting against query time sorting
public void testRandom3() throws Exception {
- int numDocs;
- if (TEST_NIGHTLY) {
- numDocs = atLeast(100000);
- } else {
- numDocs = atLeast(1000);
- }
+ int numDocs = atLeast(1000);
List<RandomDoc> docs = new ArrayList<>();
Sort sort = randomSort();
[4/4] lucene-solr:branch_7x: SOLR-12147: Don't use
MemoryPostingsFormat for TestDocTermOrds.testTriggerUnInvertLimit
Posted by ro...@apache.org.
SOLR-12147: Don't use MemoryPostingsFormat for TestDocTermOrds.testTriggerUnInvertLimit
This can lead to OOM on nightly runs, as it needs to create a very large index,
and the CI machines don't have huge amounts of RAM.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2ccea7b4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2ccea7b4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2ccea7b4
Branch: refs/heads/branch_7x
Commit: 2ccea7b4754f10f8474e72ff22f77f6088fc9282
Parents: 3692314
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Apr 7 18:34:22 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Apr 7 18:35:01 2018 +0100
----------------------------------------------------------------------
.../org/apache/solr/uninverting/TestDocTermOrds.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ccea7b4/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
index c2d9e17..21f44ea 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -42,17 +43,17 @@ import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum.SeekStatus;
-import org.apache.solr.legacy.LegacyIntField;
-import org.apache.solr.legacy.LegacyLongField;
-import org.apache.solr.legacy.LegacyNumericUtils;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.index.SlowCompositeReaderWrapper;
+import org.apache.solr.legacy.LegacyIntField;
+import org.apache.solr.legacy.LegacyLongField;
+import org.apache.solr.legacy.LegacyNumericUtils;
// TODO:
// - test w/ del docs
@@ -145,6 +146,9 @@ public class TestDocTermOrds extends LuceneTestCase {
public void testTriggerUnInvertLimit() throws IOException {
final boolean SHOULD_TRIGGER = false; // Set this to true to use the test with the old implementation
+ assumeFalse("Don't run this massive test with MemoryPostingsFormat, as it can OOM",
+ Objects.equals(Codec.getDefault().postingsFormat().getName(), "Memory"));
+
// Ensure enough terms inside of a single UnInvert-pass-structure to trigger the limit
final int REF_LIMIT = (int) Math.pow(2, 24); // Maximum number of references within a single pass-structure
final int DOCS = (1<<16)-1; // The number of documents within a single pass (simplified)
[3/4] lucene-solr:master: SOLR-12147: Don't use MemoryPostingsFormat
for TestDocTermOrds.testTriggerUnInvertLimit
Posted by ro...@apache.org.
SOLR-12147: Don't use MemoryPostingsFormat for TestDocTermOrds.testTriggerUnInvertLimit
This can lead to OOM on nightly runs, as it needs to create a very large index,
and the CI machines don't have huge amounts of RAM.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2ae488aa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2ae488aa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2ae488aa
Branch: refs/heads/master
Commit: 2ae488aae2a0601148dcd1b6aa794489a0572349
Parents: 005da87
Author: Alan Woodward <ro...@apache.org>
Authored: Sat Apr 7 18:34:22 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Sat Apr 7 18:34:25 2018 +0100
----------------------------------------------------------------------
.../org/apache/solr/uninverting/TestDocTermOrds.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2ae488aa/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
index c2d9e17..21f44ea 100644
--- a/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
+++ b/solr/core/src/test/org/apache/solr/uninverting/TestDocTermOrds.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -42,17 +43,17 @@ import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SortedSetDocValues;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum.SeekStatus;
-import org.apache.solr.legacy.LegacyIntField;
-import org.apache.solr.legacy.LegacyLongField;
-import org.apache.solr.legacy.LegacyNumericUtils;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.index.SlowCompositeReaderWrapper;
+import org.apache.solr.legacy.LegacyIntField;
+import org.apache.solr.legacy.LegacyLongField;
+import org.apache.solr.legacy.LegacyNumericUtils;
// TODO:
// - test w/ del docs
@@ -145,6 +146,9 @@ public class TestDocTermOrds extends LuceneTestCase {
public void testTriggerUnInvertLimit() throws IOException {
final boolean SHOULD_TRIGGER = false; // Set this to true to use the test with the old implementation
+ assumeFalse("Don't run this massive test with MemoryPostingsFormat, as it can OOM",
+ Objects.equals(Codec.getDefault().postingsFormat().getName(), "Memory"));
+
// Ensure enough terms inside of a single UnInvert-pass-structure to trigger the limit
final int REF_LIMIT = (int) Math.pow(2, 24); // Maximum number of references within a single pass-structure
final int DOCS = (1<<16)-1; // The number of documents within a single pass (simplified)