You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2016/12/13 03:17:41 UTC
[1/2] lucene-solr:jira/solr-5944: SOLR-5944: Removing stale comments
regarding dynamic field handling
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 dbdaa6181 -> d49c7a25f
SOLR-5944: Removing stale comments regarding dynamic field handling
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dfd4fef9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dfd4fef9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dfd4fef9
Branch: refs/heads/jira/solr-5944
Commit: dfd4fef9f973313f927a0436b5b4fad1b9f72abd
Parents: e528b46
Author: Ishan Chattopadhyaya <ic...@gmail.com>
Authored: Tue Dec 13 10:16:30 2016 +0700
Committer: Ishan Chattopadhyaya <ic...@gmail.com>
Committed: Tue Dec 13 10:16:30 2016 +0700
----------------------------------------------------------------------
.../apache/solr/update/processor/AtomicUpdateDocumentMerger.java | 3 +--
.../src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java | 3 ---
.../test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java | 3 ---
.../test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java | 3 ---
4 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfd4fef9/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
index afc8883..aa7f899 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java
@@ -251,8 +251,7 @@ public class AtomicUpdateDocumentMerger {
}
}
if (! fieldNamesFromIndexWriter.contains(fieldName) ) {
- // nocommit: this comment is not usefull - doesn't explain *WHY*
- return Collections.emptySet(); // if dynamic field and this field doesn't exist, DV update can't work
+ return Collections.emptySet(); // if this field doesn't exist, DV update can't work
}
}
return candidateFields;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfd4fef9/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
index d028614..e0e4a5f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -55,9 +55,6 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
@BeforeClass
public static void beforeSuperClass() throws Exception {
-
- // nocommit: does this test need to randomize between diff schema/fields used?
- // nocommit: see nocommits/jira questions related to special dynamicField logic in AtomicUpdateDocumentMerger.isInPlaceUpdate
schemaString = "schema-inplace-updates.xml";
configString = "solrconfig-tlog.xml";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfd4fef9/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index 8959587..48c98af 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -73,9 +73,6 @@ public class TestInPlaceUpdatesDistrib extends AbstractFullDistribZkTestBase {
@BeforeClass
public static void beforeSuperClass() throws Exception {
-
- // nocommit: does this test need to randomize between diff schema/fields used?
- // nocommit: see nocommits/jira questions related to special dynamicField logic in AtomicUpdateDocumentMerger.isInPlaceUpdate
schemaString = "schema-inplace-updates.xml";
configString = "solrconfig-tlog.xml";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dfd4fef9/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 a100184..ae7d07a 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java
@@ -61,9 +61,6 @@ public class TestInPlaceUpdatesStandalone extends TestRTGBase {
@BeforeClass
public static void beforeClass() throws Exception {
-
- // nocommit: does this test need to randomize between diff schema/fields used?
- // nocommit: see nocommits/jira questions related to special dynamicField logic in AtomicUpdateDocumentMerger.isInPlaceUpdate
initCore("solrconfig-tlog.xml", "schema-inplace-updates.xml");
[2/2] lucene-solr:jira/solr-5944: Merge branch 'jira/solr-5944' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into jira/solr-5944
Posted by is...@apache.org.
Merge branch 'jira/solr-5944' of https://git-wip-us.apache.org/repos/asf/lucene-solr into jira/solr-5944
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d49c7a25
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d49c7a25
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d49c7a25
Branch: refs/heads/jira/solr-5944
Commit: d49c7a25fd8b44719cf6ab6147ffd476f2a664c4
Parents: dfd4fef dbdaa61
Author: Ishan Chattopadhyaya <ic...@gmail.com>
Authored: Tue Dec 13 10:16:58 2016 +0700
Committer: Ishan Chattopadhyaya <ic...@gmail.com>
Committed: Tue Dec 13 10:16:58 2016 +0700
----------------------------------------------------------------------
.../solr/update/DirectUpdateHandler2.java | 2 +
.../solr/update/TestInPlaceUpdatesDistrib.java | 327 ++++++++++---------
2 files changed, 175 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d49c7a25/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
----------------------------------------------------------------------