You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2017/04/18 21:04:02 UTC
lucene-solr:branch_6x: SOLR-10439: 'large' was forgotten in
/schema/fields?showDefaults=true
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ae55dfc10 -> a4e5dba11
SOLR-10439: 'large' was forgotten in /schema/fields?showDefaults=true
(cherry picked from commit 8347169)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a4e5dba1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a4e5dba1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a4e5dba1
Branch: refs/heads/branch_6x
Commit: a4e5dba11eeacac36d6d8f6158b5a9d0779d1bd0
Parents: ae55dfc
Author: David Smiley <ds...@apache.org>
Authored: Tue Apr 18 17:02:07 2017 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue Apr 18 17:03:55 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/schema/SchemaField.java | 1 +
.../src/test/org/apache/solr/rest/schema/TestFieldResource.java | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a4e5dba1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 177a87a..fb34e00 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -197,6 +197,8 @@ Bug Fixes
* SOLR-10420: Solr 6.x leaking one SolrZkClient instance per second (Scott Blum, Cao Manh Dat, Markus Jelsma, Steve Rowe)
+* SOLR-10439: The new 'large' attribute had been forgotten in /schema/fields?showDefaults=true (David Smiley)
+
================== 6.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a4e5dba1/solr/core/src/java/org/apache/solr/schema/SchemaField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
index 94d3f9c..02e9f6f 100644
--- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java
+++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
@@ -340,6 +340,7 @@ public final class SchemaField extends FieldProperties {
properties.add(getPropertyName(OMIT_POSITIONS), omitPositions());
properties.add(getPropertyName(STORE_OFFSETS), storeOffsetsWithPositions());
properties.add(getPropertyName(MULTIVALUED), multiValued());
+ properties.add(getPropertyName(LARGE_FIELD), isLarge());
if (sortMissingFirst()) {
properties.add(getPropertyName(SORT_MISSING_FIRST), sortMissingFirst());
} else if (sortMissingLast()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a4e5dba1/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java
index d591b9a..4f53609 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java
@@ -23,7 +23,7 @@ public class TestFieldResource extends SolrRestletTestBase {
public void testGetField() throws Exception {
assertQ("/schema/fields/test_postv?indent=on&wt=xml&showDefaults=true",
"count(/response/lst[@name='field']) = 1",
- "count(/response/lst[@name='field']/*) = 17",
+ "count(/response/lst[@name='field']/*) = 18",
"/response/lst[@name='field']/str[@name='name'] = 'test_postv'",
"/response/lst[@name='field']/str[@name='type'] = 'text'",
"/response/lst[@name='field']/bool[@name='indexed'] = 'true'",
@@ -38,6 +38,7 @@ public class TestFieldResource extends SolrRestletTestBase {
"/response/lst[@name='field']/bool[@name='omitPositions'] = 'false'",
"/response/lst[@name='field']/bool[@name='storeOffsetsWithPositions'] = 'false'",
"/response/lst[@name='field']/bool[@name='multiValued'] = 'false'",
+ "/response/lst[@name='field']/bool[@name='large'] = 'false'",
"/response/lst[@name='field']/bool[@name='required'] = 'false'",
"/response/lst[@name='field']/bool[@name='tokenized'] = 'true'",
"/response/lst[@name='field']/bool[@name='useDocValuesAsStored'] = 'true'");