You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/26 16:34:46 UTC
[lucene-solr] 01/02: @1049 The managed schema version needs to
start at 1, not 0.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit b4ead89b9605248ffa94cef252b72f058c33d355
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Oct 26 11:11:56 2020 -0500
@1049 The managed schema version needs to start at 1, not 0.
---
solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java | 2 +-
.../solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index 657384c..706d7b2 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@ -190,7 +190,7 @@ public final class ManagedIndexSchema extends IndexSchema {
if (createOnly) {
try {
zkClient.create(managedSchemaPath, data, CreateMode.PERSISTENT, true);
- schemaZkVersion = 0;
+ schemaZkVersion = 1;
log.info("Created and persisted managed schema znode at {}", managedSchemaPath);
} catch (KeeperException.NodeExistsException e) {
// This is okay - do nothing and fall through
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
index 24e5dc1..f0865f0 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
@@ -444,7 +444,7 @@ public class AddSchemaFieldsUpdateProcessorFactory extends UpdateRequestProcesso
builder.append("}");
}
builder.append("]");
- log.debug("{}", builder);
+ if (log.isDebugEnabled()) log.debug("{}", builder);
}
// Need to hold the lock during the entire attempt to ensure that
// the schema on the request is the latest