You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/02/24 10:29:49 UTC
[1/2] lucene-solr git commit: SOLR-872: move the embedded xml for
schema and solconfig for .system collection to individual files
Repository: lucene-solr
Updated Branches:
refs/heads/master 4c9dca8d9 -> bba7b82ab
SOLR-872: move the embedded xml for schema and solconfig for .system collection to individual files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d77cd328
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d77cd328
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d77cd328
Branch: refs/heads/master
Commit: d77cd3287d06e68a7aec598e20562b4e4f5d6fb2
Parents: 9ce2d0d
Author: Noble Paul <no...@apache.org>
Authored: Wed Feb 24 14:59:07 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Feb 24 14:59:07 2016 +0530
----------------------------------------------------------------------
.../org/apache/solr/handler/BlobHandler.java | 38 --------------------
.../solr/handler/admin/CollectionsHandler.java | 20 +++++++----
.../src/resources/SystemCollectionSchema.xml | 17 +++++++++
.../resources/SystemCollectionSolrConfig.xml | 20 +++++++++++
4 files changed, 51 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d77cd328/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
index 9a96730..4b71187 100644
--- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
@@ -252,44 +252,6 @@ public class BlobHandler extends RequestHandlerBase implements PluginInfoInitial
return "Load Jars into a system index";
}
- public static final String SCHEMA = "<?xml version='1.0' ?>\n" +
- "<schema name='_system collection or core' version='1.1'>\n" +
- " <fieldtype name='string' class='solr.StrField' sortMissingLast='true' omitNorms='true'/>\n" +
- " <fieldType name='long' class='solr.TrieLongField' precisionStep='0' positionIncrementGap='0'/>\n" +
- " <fieldType name='bytes' class='solr.BinaryField'/>\n" +
- " <fieldType name='date' class='solr.TrieDateField'/>\n" +
- " <field name='id' type='string' indexed='true' stored='true' multiValued='false' required='true'/>\n" +
- " <field name='md5' type='string' indexed='true' stored='true' multiValued='false' required='true'/>\n" +
- " <field name='blob' type='bytes' indexed='false' stored='true' multiValued='false' />\n" +
- " <field name='size' type='long' indexed='true' stored='true' multiValued='false' />\n" +
- " <field name='version' type='long' indexed='true' stored='true' multiValued='false' />\n" +
- " <field name='timestamp' type='date' indexed='true' stored='true' multiValued='false' />\n" +
- " <field name='blobName' type='string' indexed='true' stored='true' multiValued='false' />\n" +
- " <field name='_version_' type='long' indexed='true' stored='true'/>\n" +
- " <uniqueKey>id</uniqueKey>\n" +
- "</schema>";
-
- public static final String CONF = "<?xml version='1.0' ?>\n" +
- "<config>\n" +
- "<luceneMatchVersion>LATEST</luceneMatchVersion>\n" +
- "<directoryFactory name='DirectoryFactory' class='${solr.directoryFactory:solr.StandardDirectoryFactory}'/>\n" +
- "<updateHandler class='solr.DirectUpdateHandler2'>\n" +
- " <updateLog>\n" +
- " <str name='dir'>${solr.ulog.dir:}</str>\n" +
- " </updateLog>\n " +
- " <autoCommit> \n" +
- " <maxDocs>1</maxDocs> \n" +
- " <openSearcher>true</openSearcher> \n" +
- " </autoCommit>" +
- "</updateHandler>\n" +
- "<requestHandler name='standard' class='solr.StandardRequestHandler' default='true' />\n" +
- "<requestHandler name='/analysis/field' startup='lazy' class='solr.FieldAnalysisRequestHandler' />\n" +
- "<requestHandler name='/blob' class='solr.BlobHandler'>\n" +
- " <lst name='invariants'>\n" +
- "<str name='maxSize'>${blob.max.size.mb:5}</str>\n" +
- "</lst>\n" +
- "</requestHandler>\n" +
- "</config>";
@Override
public void init(PluginInfo info) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d77cd328/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 74507d1..adee971 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -49,6 +49,7 @@ import static org.apache.solr.common.params.CoreAdminParams.INSTANCE_DIR;
import static org.apache.solr.common.params.ShardParams._ROUTE_;
import static org.apache.solr.common.util.StrUtils.formatString;
+import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
@@ -63,6 +64,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -375,13 +377,19 @@ public class CollectionsHandler extends RequestHandlerBase {
cmdExecutor.ensureExists(ZkStateReader.CONFIGS_ZKNODE, zk);
cmdExecutor.ensureExists(ZkStateReader.CONFIGS_ZKNODE + "/" + SYSTEM_COLL, zk);
- String path = ZkStateReader.CONFIGS_ZKNODE + "/" + SYSTEM_COLL + "/schema.xml";
- byte[] data = BlobHandler.SCHEMA.replaceAll("'", "\"").getBytes(StandardCharsets.UTF_8);
- cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
+ try {
+ String path = ZkStateReader.CONFIGS_ZKNODE + "/" + SYSTEM_COLL + "/schema.xml";
+ byte[] data = IOUtils.toByteArray(Thread.currentThread().getContextClassLoader().getResourceAsStream("SystemCollectionSchema.xml"));
+ cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
+ path = ZkStateReader.CONFIGS_ZKNODE + "/" + SYSTEM_COLL + "/solrconfig.xml";
+ data = IOUtils.toByteArray(Thread.currentThread().getContextClassLoader().getResourceAsStream("SystemCollectionSolrCOnfig.xml"));
+ cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
+ } catch (IOException e) {
+ throw new SolrException(ErrorCode.SERVER_ERROR, e);
+
+ }
+
- path = ZkStateReader.CONFIGS_ZKNODE + "/" + SYSTEM_COLL + "/solrconfig.xml";
- data = BlobHandler.CONF.replaceAll("'", "\"").getBytes(StandardCharsets.UTF_8);
- cmdExecutor.ensureExists(path, data, CreateMode.PERSISTENT, zk);
}
},
DELETE_OP(DELETE) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d77cd328/solr/core/src/resources/SystemCollectionSchema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/SystemCollectionSchema.xml b/solr/core/src/resources/SystemCollectionSchema.xml
new file mode 100644
index 0000000..d491480
--- /dev/null
+++ b/solr/core/src/resources/SystemCollectionSchema.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<schema name="_system collection or core" version="1.1">
+ <fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="bytes" class="solr.BinaryField"/>
+ <fieldType name="date" class="solr.TrieDateField"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="md5" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="blob" type="bytes" indexed="false" stored="true" multiValued="false" />
+ <field name="size" type="long" indexed="true" stored="true" multiValued="false" />
+ <field name="version" type="long" indexed="true" stored="true" multiValued="false" />
+ <field name="timestamp" type="date" indexed="true" stored="true" multiValued="false" />
+ <field name="blobName" type="string" indexed="true" stored="true" multiValued="false" />
+ <field name="_version_" type="long" indexed="true" stored="true"/>
+ <dynamicField name="*_s" type="string" indexed="true" stored="true" />
+ <uniqueKey>id</uniqueKey>
+</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d77cd328/solr/core/src/resources/SystemCollectionSolrConfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/SystemCollectionSolrConfig.xml b/solr/core/src/resources/SystemCollectionSolrConfig.xml
new file mode 100644
index 0000000..185b89e
--- /dev/null
+++ b/solr/core/src/resources/SystemCollectionSolrConfig.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<config>
+ <luceneMatchVersion>LATEST</luceneMatchVersion>
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+ <updateHandler class="solr.DirectUpdateHandler2">
+ <updateLog>
+ <str name="dir">${solr.ulog.dir:}</str>
+ </updateLog>
+ <autoCommit>
+ <maxDocs>1</maxDocs>
+ <openSearcher>true</openSearcher>
+ </autoCommit></updateHandler>
+ <requestHandler name="standard" class="solr.StandardRequestHandler" default="true" />
+ <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+ <requestHandler name="/blob" class="solr.BlobHandler">
+ <lst name="invariants">
+ <str name="maxSize">${blob.max.size.mb:5}</str>
+ </lst>
+ </requestHandler>
+</config>
\ No newline at end of file
[2/2] lucene-solr git commit: Merge remote-tracking branch
'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bba7b82a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bba7b82a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bba7b82a
Branch: refs/heads/master
Commit: bba7b82ab97ea5ef7cebe8f05e9cedf334b93399
Parents: d77cd32 4c9dca8
Author: Noble Paul <no...@apache.org>
Authored: Wed Feb 24 14:59:42 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Wed Feb 24 14:59:42 2016 +0530
----------------------------------------------------------------------
.../org/apache/lucene/document/BinaryPoint.java | 101 ++++-
.../org/apache/lucene/document/DoublePoint.java | 117 +++++-
.../org/apache/lucene/document/FloatPoint.java | 117 +++++-
.../org/apache/lucene/document/IntPoint.java | 115 +++++-
.../org/apache/lucene/document/LongPoint.java | 119 +++++-
.../apache/lucene/search/PointRangeQuery.java | 409 ++-----------------
.../org/apache/lucene/util/NumericUtils.java | 29 +-
.../org/apache/lucene/document/TestField.java | 184 ++++++++-
.../index/TestDemoParallelLeafReader.java | 3 +-
.../apache/lucene/search/TestPointQueries.java | 107 +++--
.../TestUsageTrackingFilterCachingPolicy.java | 4 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 8 +-
.../demo/facet/DistanceFacetsExample.java | 10 +-
.../lucene/demo/facet/RangeFacetsExample.java | 4 +-
.../facet/range/TestRangeFacetCounts.java | 21 +-
.../search/highlight/HighlighterTest.java | 3 +-
.../apache/lucene/document/BigIntegerPoint.java | 215 ++++++++++
.../lucene/document/InetAddressPoint.java | 208 ++++++++++
.../lucene/document/TestBigIntegerPoint.java | 87 ++++
.../lucene/document/TestInetAddressPoint.java | 87 ++++
.../lucene/search/TestDocValuesRangeQuery.java | 9 +-
.../suggest/document/TestSuggestField.java | 3 +-
.../lucene/index/BasePointFormatTestCase.java | 13 +-
solr/CHANGES.txt | 8 +
.../SolrStopwordsCarrot2LexicalDataFactory.java | 6 +-
.../carrot2/EchoClusteringAlgorithm.java | 6 +-
.../carrot2/EchoStemsClusteringAlgorithm.java | 8 +-
.../carrot2/EchoTokensClusteringAlgorithm.java | 6 +-
...exicalResourcesCheckClusteringAlgorithm.java | 6 +-
.../carrot2/MockClusteringAlgorithm.java | 12 +-
.../org/apache/solr/cloud/ZkController.java | 80 ++--
.../solr/handler/admin/CoreAdminOperation.java | 1 +
32 files changed, 1491 insertions(+), 615 deletions(-)
----------------------------------------------------------------------