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/04 20:00:33 UTC
[1/2] lucene-solr:jira/solr-5944: SOLR-5944: Fix
SolrIndexConfigTest.testSortingMPSolrIndexConfigCreation failure i forgot
about when modifying solrconfig-sortingmergepolicyfactory.xml
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-5944 6885f625e -> 77ec5ede0
SOLR-5944: Fix SolrIndexConfigTest.testSortingMPSolrIndexConfigCreation failure i forgot about when modifying solrconfig-sortingmergepolicyfactory.xml
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/90da2bd0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/90da2bd0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/90da2bd0
Branch: refs/heads/jira/solr-5944
Commit: 90da2bd065e1978cadfe2bbae03b06379e4e7689
Parents: 6885f62
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Jan 4 12:46:28 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Jan 4 12:46:28 2017 -0700
----------------------------------------------------------------------
.../src/test/org/apache/solr/update/SolrIndexConfigTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/90da2bd0/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
index 4fec5c3..2241dbe 100644
--- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
+++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
@@ -99,8 +99,8 @@ public class SolrIndexConfigTest extends SolrTestCaseJ4 {
}
public void testSortingMPSolrIndexConfigCreation() throws Exception {
- final String expectedFieldName = "timestamp";
- final SortField.Type expectedFieldType = SortField.Type.LONG;
+ final String expectedFieldName = "timestamp_i_dvo";
+ final SortField.Type expectedFieldType = SortField.Type.INT;
final boolean expectedFieldSortDescending = true;
SolrConfig solrConfig = new SolrConfig(instanceDir, solrConfigFileNameSortingMergePolicyFactory, null);
[2/2] lucene-solr:jira/solr-5944: add a nocommit reminder that this
test is currently failing for DVO fields
Posted by ho...@apache.org.
add a nocommit reminder that this test is currently failing for DVO fields
(aserts work fine for atomic updates to regular stored fields)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/77ec5ede
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/77ec5ede
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/77ec5ede
Branch: refs/heads/jira/solr-5944
Commit: 77ec5ede0b95d23c648e40e71ef8bc818dedf7ef
Parents: 90da2bd
Author: Chris Hostetter <ho...@apache.org>
Authored: Wed Jan 4 13:00:22 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Wed Jan 4 13:00:22 2017 -0700
----------------------------------------------------------------------
.../test/org/apache/solr/update/processor/AtomicUpdatesTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77ec5ede/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index 2d07af7..dd97912 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -1138,6 +1138,9 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
}
public void testFieldsWithDefaultValuesWhenAtomicUpdatesAgainstTlog() {
+ // nocommit: all of these assumptions/assertions work for stored ints...
+ // nocommit: ...but DVO atomic updates against tlog are losing other schema defaults
+
for (String fieldToUpdate : Arrays.asList("field_to_update_i1", "field_to_update_i_dvo")) {
clearIndex();