You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/01/09 21:53:22 UTC
[1/2] lucene-solr:jira/solr-5944: SOLR-5944: clean up some stale
nocommits
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 f8b966cd7 -> a5b2d0960
SOLR-5944: clean up some stale nocommits
* removed some commented out code from when i was doing some manual test tweaking
* removed testReplay_nocommit since testReplay_SetOverriddenWithNoValueThenInc works fine now (and we have good randomized coverage)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d6f4449
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d6f4449
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d6f4449
Branch: refs/heads/jira/solr-5944
Commit: 5d6f4449db6a00d98827f57117834909eb67075e
Parents: f8b966c
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jan 9 14:50:36 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jan 9 14:50:36 2017 -0700
----------------------------------------------------------------------
.../update/TestInPlaceUpdatesStandalone.java | 48 --------------------
1 file changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d6f4449/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
index 3f155e1..e83ba2e 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -599,8 +599,6 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
@Test
public void testReplay_SetOverriddenWithNoValueThenInc() throws Exception {
final String inplaceField = "inplace_l_dvo";
- // final String inplaceField = "inplace_nocommit_not_really_l"; // nocommit: "inplace_l_dvo"
-
checkReplay(inplaceField,
//
sdoc("id", "1", inplaceField, map("set", 555L)),
@@ -610,42 +608,6 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
HARDCOMMIT);
}
- @Test
- public void testReplay_nocommit() throws Exception {
- // nocommit: this sequence came from a randomized test fail
- // nocommit: distilled what seem to be key bits of this sequence into testReplay_SetOverriddenWithNoValueThenInc
- // nocommit: if this test passes once testReplay_SetOverriddenWithNoValueThenInc passes, can prob just delete this test
- // nocommit: otherwise there's still some other bug, and this test should stay with a better name
-
-
- checkReplay("inplace_l_dvo",
- //
- sdoc("id", "1", "inplace_l_dvo", map("set", 5227783332305435299L)),
- sdoc("id", "1", "inplace_l_dvo", map("set", 5177016292017914821L)),
- SOFTCOMMIT,
- sdoc("id", "4", "inplace_l_dvo", -1041456048397735257L, "regular_l", -8163239469025076016L),
- sdoc("id", "1", "regular_l", 1844427848265038310L),
- sdoc("id", "3", "regular_l", -5364557547718093009L),
- sdoc("id", "4", "inplace_l_dvo", 352737585764277911L, "regular_l", -2324552916378921247L),
- sdoc("id", "4", "inplace_l_dvo", map("set", 1522902648458117343L)),
- sdoc("id", "4", "inplace_l_dvo", map("inc", -1561423187L)),
- sdoc("id", "4", "inplace_l_dvo", map("set", -7306651717735309226L)),
- sdoc("id", "2", "inplace_l_dvo", map("set", -5108528772159723270L)),
- sdoc("id", "4", "inplace_l_dvo", map("set", -3571192220077854115L)),
- sdoc("id", "1", "inplace_l_dvo", map("inc", -770582321L)),
- sdoc("id", "4", "inplace_l_dvo", map("inc", -342982790L)),
- sdoc("id", "2", "inplace_l_dvo", map("inc", -806437401L)),
- sdoc("id", "4", "inplace_l_dvo", map("inc", -617215801), "regular_l", map("inc", 1767173241L)),
- sdoc("id", "4", "inplace_l_dvo", map("inc", 1951931987L)),
- sdoc("id", "3", "regular_l", -3216004491312079553L),
- sdoc("id", "4", "inplace_l_dvo", map("set", -7877563014171453076L)),
- sdoc("id", "2", "regular_l", 6651364545098361399L),
- HARDCOMMIT);
-
- }
-
-
-
/**
* Simple enum for randomizing a type of update.
* Each enum value has an associated probability, and the class has built in sanity checks
@@ -746,13 +708,6 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
public void checkRandomReplay(final int maxDocId, final int numCmds) throws Exception {
final String not_inplaceField = "regular_l";
-
- // nocommit: can use a regular long field to sanity check if failing seed is general
- // bug with test/atomic update code, or specific to inplace update
- //
- // nocommit: should we randomize this when committing?
- //
- //final String inplaceField = "nocommit_not_really_inplace_l"; // nocommit
final String inplaceField = "inplace_l_dvo";
final Object[] cmds = new Object[numCmds];
@@ -815,9 +770,6 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {
assertNotNull(cmds[iter]); // sanity check switch
}
- // nocommit: uncomment for quick sanity checking reproducibility, not a good idea to log in general
- // System.err.println("nocommit: sequence == " + Arrays.asList(cmds));
-
checkReplay(inplaceField, cmds);
}
[2/2] lucene-solr:jira/solr-5944: SOLR-5944: remove stale nocommit
comment
Posted by ho...@apache.org.
SOLR-5944: remove stale nocommit comment
(this was left over from prior concerns about special code paths for dynamic fields, was overlooked in previous cleanup commits)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a5b2d096
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a5b2d096
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a5b2d096
Branch: refs/heads/jira/solr-5944
Commit: a5b2d0960cf0586de53ea4137400cd9badee5714
Parents: 5d6f444
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jan 9 14:53:13 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jan 9 14:53:13 2017 -0700
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/update/UpdateLogTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5b2d096/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
index 458097e..b533627 100644
--- a/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
+++ b/solr/core/src/test/org/apache/solr/update/UpdateLogTest.java
@@ -43,8 +43,6 @@ public class UpdateLogTest extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
- // nocommit: does this test need to randomize between diff schema/fields used?
-
initCore("solrconfig-tlog.xml", "schema-inplace-updates.xml");
try (SolrQueryRequest req = req()) {