You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ha...@apache.org on 2013/08/13 08:33:34 UTC
svn commit: r1513364 [1/5] - in /lucene/dev/branches/lucene3069: ./
dev-tools/ dev-tools/idea/solr/core/src/java/
dev-tools/idea/solr/core/src/test/ dev-tools/maven/
dev-tools/maven/solr/core/src/java/ dev-tools/maven/solr/core/src/test/
dev-tools/scri...
Author: han
Date: Tue Aug 13 06:33:29 2013
New Revision: 1513364
URL: http://svn.apache.org/r1513364
Log:
merge missing dirs
Added:
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/join/
- copied from r1513311, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-cfs.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-solrconfig-multiple-indexconfigs.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema-snippet-types.incl
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-snippet-types.incl
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/join/
- copied from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java
lucene/dev/branches/lucene3069/solr/licenses/attributes-binder-1.2.0.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/attributes-binder-1.2.0.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/carrot2-mini-3.8.0.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/carrot2-mini-3.8.0.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/hppc-0.5.2.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/hppc-0.5.2.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-fsa-1.7.1.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/morfologik-fsa-1.7.1.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-polish-1.7.1.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/morfologik-polish-1.7.1.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-stemming-1.7.1.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/morfologik-stemming-1.7.1.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/simple-xml-2.7.jar.sha1
- copied unchanged from r1513311, lucene/dev/trunk/solr/licenses/simple-xml-2.7.jar.sha1
lucene/dev/branches/lucene3069/solr/solrj/src/test-files/log4j.properties
- copied unchanged from r1513311, lucene/dev/trunk/solr/solrj/src/test-files/log4j.properties
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java
- copied unchanged from r1513311, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java
lucene/dev/branches/lucene3069/solr/webapp/web/img/ico/database--plus.png
- copied unchanged from r1513311, lucene/dev/trunk/solr/webapp/web/img/ico/database--plus.png
Removed:
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-nativelock.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-simplelock.xml
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/hdfs/BasicHdfsTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/IndexReaderFactoryTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestPropInject.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestPropInjectDefaults.java
lucene/dev/branches/lucene3069/solr/licenses/attributes-binder-1.0.1.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/carrot2-mini-3.6.2.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/hppc-0.4.1.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-fsa-1.6.0.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-polish-1.6.0.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/morfologik-stemming-1.6.0.jar.sha1
lucene/dev/branches/lucene3069/solr/licenses/simple-xml-2.6.4.jar.sha1
lucene/dev/branches/lucene3069/solr/solrj/src/test-files/solrj/log4j.properties
Modified:
lucene/dev/branches/lucene3069/ (props changed)
lucene/dev/branches/lucene3069/build.xml
lucene/dev/branches/lucene3069/dev-tools/ (props changed)
lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/java/solr-core.iml
lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template
lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template
lucene/dev/branches/lucene3069/dev-tools/scripts/buildAndPushRelease.py
lucene/dev/branches/lucene3069/dev-tools/scripts/diffSources.py
lucene/dev/branches/lucene3069/extra-targets.xml
lucene/dev/branches/lucene3069/solr/ (props changed)
lucene/dev/branches/lucene3069/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3069/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene3069/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene3069/solr/contrib/ (props changed)
lucene/dev/branches/lucene3069/solr/contrib/analysis-extras/ivy.xml
lucene/dev/branches/lucene3069/solr/contrib/clustering/ivy.xml
lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java
lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
lucene/dev/branches/lucene3069/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test-files/extraction/simple.html
lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
lucene/dev/branches/lucene3069/solr/core/ (props changed)
lucene/dev/branches/lucene3069/solr/core/ivy.xml
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Assign.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ConfigSolr.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ConfigSolrXml.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ConfigSolrXmlOld.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/SolrCores.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/core/ZkContainer.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/logging/ListenerConfig.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/request/UnInvertedField.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieDateField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieIntField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/schema/TrieLongField.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/FunctionQParser.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/Grouping.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/QParser.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/QParserPlugin.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/QueryUtils.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/Signature.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/util/FastWriter.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema-xinclude.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema12.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/schema15.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-indexconfig.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig-termindex.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/core/src/test-files/solr/crazy-path-to-config.xml
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestSolrXmlPersistence.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/request/TestFaceting.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/TestSort.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (props changed)
lucene/dev/branches/lucene3069/solr/core/src/test/org/apache/solr/util/TestUtils.java (props changed)
lucene/dev/branches/lucene3069/solr/example/ (props changed)
lucene/dev/branches/lucene3069/solr/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3069/solr/example/solr/collection1/conf/velocity/cluster.vm
lucene/dev/branches/lucene3069/solr/licenses/ (props changed)
lucene/dev/branches/lucene3069/solr/site/ (props changed)
lucene/dev/branches/lucene3069/solr/site/xsl/index.xsl
lucene/dev/branches/lucene3069/solr/solrj/ (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/Hash.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/common/util/TestHash.java (props changed)
lucene/dev/branches/lucene3069/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java (props changed)
lucene/dev/branches/lucene3069/solr/test-framework/ (props changed)
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (props changed)
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (contents, props changed)
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/lucene3069/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java
lucene/dev/branches/lucene3069/solr/webapp/ (props changed)
lucene/dev/branches/lucene3069/solr/webapp/web/admin.html
lucene/dev/branches/lucene3069/solr/webapp/web/css/styles/cores.css
lucene/dev/branches/lucene3069/solr/webapp/web/css/styles/dashboard.css
lucene/dev/branches/lucene3069/solr/webapp/web/css/styles/index.css
lucene/dev/branches/lucene3069/solr/webapp/web/css/styles/menu.css
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/app.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/cores.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/dashboard.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/index.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/java-properties.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/logging.js
lucene/dev/branches/lucene3069/solr/webapp/web/js/scripts/threads.js
lucene/dev/branches/lucene3069/solr/webapp/web/tpl/cores.html
lucene/dev/branches/lucene3069/solr/webapp/web/tpl/dashboard.html
Modified: lucene/dev/branches/lucene3069/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/build.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/build.xml (original)
+++ lucene/dev/branches/lucene3069/build.xml Tue Aug 13 06:33:29 2013
@@ -422,5 +422,20 @@
<target name="run-clover"/>
</antcall>
</target>
-
+
+ <target name="regenerate" description="Runs all code regenerators">
+ <subant target="regenerate" inheritall="false" failonerror="false">
+ <fileset dir="lucene" includes="build.xml" />
+ <!-- todo:
+ <fileset dir="solr" includes="build.xml" />-->
+ </subant>
+ </target>
+
+ <target name="-check-after-regeneration">
+ <subant buildpath="." antfile="extra-targets.xml" target="-check-after-regeneration" inheritall="false" failonerror="true"/>
+ </target>
+
+ <!-- TODO: remove me when jenkins works -->
+ <target name="regenerateAndCheck" depends="regenerate,-check-after-regeneration"/>
+
</project>
Modified: lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/java/solr-core.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/java/solr-core.iml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/java/solr-core.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/java/solr-core.iml Tue Aug 13 06:33:29 2013
@@ -25,5 +25,6 @@
<orderEntry type="module" module-name="analysis-common" />
<orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
+ <orderEntry type="module" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml (original)
+++ lucene/dev/branches/lucene3069/dev-tools/idea/solr/core/src/test/solr-core-tests.iml Tue Aug 13 06:33:29 2013
@@ -27,5 +27,6 @@
<orderEntry type="module" scope="TEST" module-name="suggest" />
<orderEntry type="module" scope="TEST" module-name="spatial" />
<orderEntry type="module" scope="TEST" module-name="misc" />
+ <orderEntry type="module" scope="TEST" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/pom.xml.template Tue Aug 13 06:33:29 2013
@@ -407,12 +407,12 @@
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>carrot2-mini</artifactId>
- <version>3.6.2</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.carrot2</groupId>
<artifactId>morfologik-polish</artifactId>
- <version>1.6.0</version>
+ <version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/java/pom.xml.template Tue Aug 13 06:33:29 2013
@@ -95,6 +95,11 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-join</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
<exclusions>
Modified: lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template (original)
+++ lucene/dev/branches/lucene3069/dev-tools/maven/solr/core/src/test/pom.xml.template Tue Aug 13 06:33:29 2013
@@ -198,6 +198,12 @@
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory/>
Modified: lucene/dev/branches/lucene3069/dev-tools/scripts/buildAndPushRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/scripts/buildAndPushRelease.py?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/scripts/buildAndPushRelease.py (original)
+++ lucene/dev/branches/lucene3069/dev-tools/scripts/buildAndPushRelease.py Tue Aug 13 06:33:29 2013
@@ -115,7 +115,7 @@ def prepare(root, version, gpgKeyID, gpg
print(' lucene prepare-release')
os.chdir('lucene')
- cmd = 'ant -Dversion=%s -Dspecversion=%s' % (version, version)
+ cmd = 'ant -Dversion=%s' % version
if gpgKeyID is not None:
cmd += ' -Dgpg.key=%s prepare-release' % gpgKeyID
else:
@@ -128,7 +128,7 @@ def prepare(root, version, gpgKeyID, gpg
print(' solr prepare-release')
os.chdir('../solr')
- cmd = 'ant -Dversion=%s -Dspecversion=%s' % (version, version)
+ cmd = 'ant -Dversion=%s' % version
if gpgKeyID is not None:
cmd += ' -Dgpg.key=%s prepare-release' % gpgKeyID
else:
Modified: lucene/dev/branches/lucene3069/dev-tools/scripts/diffSources.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/dev-tools/scripts/diffSources.py?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/dev-tools/scripts/diffSources.py (original)
+++ lucene/dev/branches/lucene3069/dev-tools/scripts/diffSources.py Tue Aug 13 06:33:29 2013
@@ -50,7 +50,7 @@ while True:
elif l.endswith('\n'):
l = l[:-1]
if l.startswith('diff ') or l.startswith('Binary files '):
- keep = l.lower().find('/build/') == -1 and (l.lower().startswith('Only in') or ((l.lower().endswith('.java') or l.lower().endswith('.txt') or l.lower().endswith('.xml') or l.lower().endswith('.iml')) and l.find('/.svn/') == -1))
+ keep = not l.endswith('timehints.txt') and l.lower().find('/build/') == -1 and (l.lower().startswith('Only in') or ((l.lower().endswith('.java') or l.lower().endswith('.txt') or l.lower().endswith('.xml') or l.lower().endswith('.iml')) and l.find('/.svn/') == -1))
if keep:
print
print
Modified: lucene/dev/branches/lucene3069/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/extra-targets.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/extra-targets.xml (original)
+++ lucene/dev/branches/lucene3069/extra-targets.xml Tue Aug 13 06:33:29 2013
@@ -62,9 +62,23 @@
</mvn>
</target>
- <target xmlns:ivy="antlib:org.apache.ivy.ant" name="-check-svn-working-copy" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
+ <target name="-check-svn-working-copy" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
+ <svn-checker failonmodifications="false"/>
+ </target>
+
+ <!-- should only be called by jenkins, not precommit! -->
+ <target name="-check-after-regeneration" depends="ivy-availability-check,ivy-fail,ivy-configure,resolve-groovy">
+ <svn-checker failonmodifications="true"/>
+ </target>
+
+ <macrodef xmlns:ivy="antlib:org.apache.ivy.ant" name="svn-checker">
+ <attribute name="failonmodifications" default="true"/> <!-- false if file modifications are allowed -->
+ <sequential>
<ivy:cachepath organisation="org.tmatesoft.svnkit" module="svnkit" revision="1.7.8"
inline="true" conf="default" transitive="true" pathid="svnkit.classpath"/>
+ <local name="svn.checkprops.failed"/>
+ <local name="svn.unversioned.failed"/>
+ <local name="svn.changed.failed"/>
<script language="groovy" taskname="svn">
<classpath>
<path refid="groovy.classpath"/>
@@ -80,10 +94,10 @@
File basedir = new File(project.getProperty('basedir')).getAbsoluteFile();
int baseLen = basedir.toString().length();
def convertRelative = {
- file -> file.getAbsolutePath().substring(baseLen + 1).replace(File.separatorChar, (char)'/');
+ file -> '.' + file.getAbsolutePath().substring(baseLen).replace(File.separatorChar, (char)'/');
}
- Set missingProps = new TreeSet(), unversioned = new TreeSet();
+ Set missingProps = new TreeSet(), unversioned = new TreeSet(), changed = new TreeSet();
self.log('Getting all versioned and unversioned files...');
statusClient.doStatus(basedir, SVNRevision.WORKING, SVNDepth.fromRecurse(true), false, true, false, false, {
@@ -94,6 +108,10 @@
} else if (status.getKind() == SVNNodeKind.FILE && nodeStatus != SVNStatusType.STATUS_DELETED) {
missingProps.add(convertRelative(status.getFile()));
}
+ if (nodeStatus == SVNStatusType.STATUS_MODIFIED || nodeStatus == SVNStatusType.STATUS_REPLACED ||
+ nodeStatus == SVNStatusType.STATUS_DELETED || nodeStatus == SVNStatusType.STATUS_ADDED) {
+ changed.add(convertRelative(status.getFile()));
+ }
} as ISVNStatusHandler, null);
self.log('Filtering files with existing svn:eol-style...');
@@ -115,10 +133,20 @@
};
project.setProperty('svn.checkprops.failed', convertSet2String(missingProps));
project.setProperty('svn.unversioned.failed', convertSet2String(unversioned));
+ project.setProperty('svn.changed.failed', convertSet2String(changed));
]]></script>
<fail if="svn.checkprops.failed"
message="The following files are missing svn:eol-style (or binary svn:mime-type):${line.separator}${svn.checkprops.failed}"/>
<fail if="svn.unversioned.failed"
message="Source checkout is dirty after running tests!!! Offending files:${line.separator}${svn.unversioned.failed}"/>
- </target>
+ <fail message="Source checkout is modified !!! Offending files:${line.separator}${svn.changed.failed}">
+ <condition>
+ <and>
+ <istrue value="@{failonmodifications}"/>
+ <isset property="svn.changed.failed"/>
+ </and>
+ </condition>
+ </fail>
+ </sequential>
+ </macrodef>
</project>
Modified: lucene/dev/branches/lucene3069/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/CHANGES.txt?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3069/solr/CHANGES.txt Tue Aug 13 06:33:29 2013
@@ -25,7 +25,7 @@ $Id$
Versions of Major Components
---------------------
Apache Tika 1.4
-Carrot2 3.6.2
+Carrot2 3.8.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.5
@@ -53,7 +53,7 @@ Other Changes
Versions of Major Components
---------------------
Apache Tika 1.4
-Carrot2 3.6.2
+Carrot2 3.8.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.5
@@ -61,15 +61,89 @@ Apache ZooKeeper 3.4.5
Upgrading from Solr 4.4.0
----------------------
+* XML configuration parsing is now more strict about situations where a single
+ setting is allowed but multiple values are found. In the past, one value
+ would be chosen arbitrarily and silently. Starting with 4.5, configuration
+ parsing will fail with an error in situations like this. If you see error
+ messages such as "solrconfig.xml contains more than one value for config path:
+ indexConfig/infoStream" check your solrconfig.xml file for multiple occurrences
+ of "infoStream" and delete the one that you do not wish to use. See SOLR-4953
+ for more details.
+
Detailed Change List
----------------------
+New Features
+----------------------
+
+* SOLR-5126: Update Carrot2 clustering to version 3.8.0, update Morfologik
+ to version 1.7.1 (Dawid Weiss)
+
+* SOLR-2345: Enhanced geodist() to work with an RPT field, provided that the
+ field is referenced via 'sfield' and the query point is constant.
+ (David Smiley)
+
+* SOLR-5082: The encoding of URL-encoded query parameters can be changed with
+ the "ie" (input encoding) parameter, e.g. "select?q=m%FCller&ie=ISO-8859-1".
+ The default is UTF-8. To change the encoding of POSTed content, use the
+ "Content-Type" HTTP header. (Uwe Schindler, David Smiley)
+* SOLR-4221: Custom sharding (Noble Paul)
+* SOLR-4808: Persist and use router,replicationFactor and maxShardsPerNode at Collection and Shard level (Noble Paul, Shalin Mangar)
+* SOLR-5006: CREATESHARD command for 'implicit' shards (Noble Paul)
+* SOLR-5017: Allow sharding based on the value of a field (Noble Paul)
+* SOLR-4222:create custom sharded collection via collections API (Noble Paul)
+
+Bug Fixes
+----------------------
+
+* SOLR-3633: web UI reports an error if CoreAdminHandler says there are no
+ SolrCores (steffkes)
+
+* SOLR-4489: SpellCheckComponent can throw StringIndexOutOfBoundsException
+ when generating collations involving multiple word-break corrections.
+ (James Dyer)
+
+* SOLR-5107: Fixed NPE when using numTerms=0 in LukeRequestHandler
+ (Ahmet Arslan, hossman)
+
+* SOLR-4679, SOLR-4908, SOLR-5124: Text extracted from HTML or PDF files
+ using Solr Cell was missing ignorable whitespace, which is inserted by
+ TIKA for convenience to support plain text extraction without using the
+ HTML elements. This bug resulted in glued words. (hossman, Uwe Schindler)
+
+* SOLR-5121: zkcli usage help for makepath doesn't match actual command.
+ (Daniel Collins via Mark Miller)
+
+* SOLR-5119: Managed schema problems after adding fields via Schema Rest API.
+ (Nils Kübler, Steve Rowe)
+
+Optimizations
+----------------------
+
+* SOLR-5044: Admin UI - Note on Core-Admin about directories while creating
+ core (steffkes)
+
Other Changes
----------------------
+* SOLR-4708: Enable ClusteringComponent by default in collection1 example.
+ The solr.clustering.enabled system property is set to 'true' by default.
+ (ehatcher, Dawid Weiss)
+
* SOLR-4914: Factor out core list persistence and discovery into a
new CoresLocator interface. (Alan Woodward)
+* SOLR-5056: Improve type safety of ConfigSolr class. (Alan Woodward)
+
+* SOLR-4951: Better randomization of MergePolicy in Solr tests (hossman)
+
+* SOLR-4953: Make XML Configuration parsing fail if an xpath matches multiple
+ nodes when only a single value is expected. (hossman)
+
+* The routing parameter "shard.keys" is deprecated as part of SOLR-5017 .The new parameter name is '_route_' .
+ The old parameter should continue to work for another release (Noble Paul)
+
+
================== 4.4.0 ==================
Versions of Major Components
@@ -107,6 +181,7 @@ Upgrading from Solr 4.3.0
* LUCENE-5063: ByteField and ShortField have been deprecated and will be removed
in 5.0. If you are still using these field types, you should migrate your
fields to TrieIntField.
+
Detailed Change List
----------------------
@@ -187,6 +262,16 @@ New Features
* SOLR-4943: Add a new system wide info admin handler that exposes the system info
that could previously only be retrieved using a SolrCore. (Mark Miller)
+* SOLR-3076: Block joins. Documents and their sub-documents must be indexed
+ as a block.
+ {!parent which=<allParents>}<someChildren> takes in a query that matches child
+ documents and results in matches on their parents.
+ {!child of=<allParents>}<someParents> takes in a query that matches some parent
+ documents and results in matches on their children.
+ (Mikhail Khludnev, Vadim Kirilchuk, Alan Woodward, Tom Burton-West, Mike McCandless,
+ hossman, yonik)
+
+
Bug Fixes
----------------------
@@ -312,6 +397,9 @@ Bug Fixes
* SOLR-5039: Admin/Schema Browser displays -1 for term counts for multiValued fields.
+* SOLR-5037: The CSV loader now accepts field names that are not in the schema.
+ (gsingers, ehatcher, Steve Rowe)
+
Optimizations
----------------------
Modified: lucene/dev/branches/lucene3069/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/build.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/build.xml (original)
+++ lucene/dev/branches/lucene3069/solr/build.xml Tue Aug 13 06:33:29 2013
@@ -226,7 +226,21 @@
</target>
<!-- Validation (license/notice/api checks). -->
- <target name="validate" depends="check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
+ <target name="validate" depends="check-example-lucene-match-version,check-licenses,rat-sources,check-forbidden-apis" description="Validate stuff." />
+
+ <target name="check-example-lucene-match-version">
+ <fail message="Some example solrconfig.xml files do not refer to the correct luceneMatchVersion: ${tests.luceneMatchVersion}">
+ <condition>
+ <resourcecount when="greater" count="0">
+ <fileset dir="${example}" includes="**/solrconfig.xml">
+ <not>
+ <contains text="<luceneMatchVersion>${tests.luceneMatchVersion}<" casesensitive="no"/>
+ </not>
+ </fileset>
+ </resourcecount>
+ </condition>
+ </fail>
+ </target>
<target name="check-licenses" depends="compile-tools,resolve,load-custom-tasks" description="Validate license stuff.">
<license-check-macro dir="${basedir}" licensedir="${common-solr.dir}/licenses">
Modified: lucene/dev/branches/lucene3069/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/common-build.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3069/solr/common-build.xml Tue Aug 13 06:33:29 2013
@@ -82,6 +82,7 @@
<pathelement location="${grouping.jar}"/>
<pathelement location="${queries.jar}"/>
<pathelement location="${queryparser.jar}"/>
+ <pathelement location="${join.jar}"/>
</path>
<path id="solr.base.classpath">
@@ -141,7 +142,7 @@
<target name="prep-lucene-jars"
depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-codecs, jar-suggest, jar-highlighter, jar-memory,
- jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser">
+ jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser, jar-join">
<property name="solr.deps.compiled" value="true"/>
</target>
Modified: lucene/dev/branches/lucene3069/solr/contrib/analysis-extras/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/analysis-extras/ivy.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/analysis-extras/ivy.xml (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/analysis-extras/ivy.xml Tue Aug 13 06:33:29 2013
@@ -20,9 +20,9 @@
<info organisation="org.apache.solr" module="analysis-extras"/>
<dependencies>
<dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-polish" rev="1.6.0" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-fsa" rev="1.6.0" transitive="false"/>
- <dependency org="org.carrot2" name="morfologik-stemming" rev="1.6.0" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-polish" rev="1.7.1" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-fsa" rev="1.7.1" transitive="false"/>
+ <dependency org="org.carrot2" name="morfologik-stemming" rev="1.7.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3069/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/clustering/ivy.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/clustering/ivy.xml Tue Aug 13 06:33:29 2013
@@ -19,14 +19,25 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="clustering"/>
<dependencies>
- <dependency org="org.carrot2" name="carrot2-mini" rev="3.6.2" transitive="false"/>
- <dependency org="org.carrot2.attributes" name="attributes-binder" rev="1.0.1" transitive="false"/>
- <dependency org="com.carrotsearch" name="hppc" rev="0.4.1" transitive="false"/>
+ <dependency org="org.carrot2" name="carrot2-mini" rev="3.8.0" transitive="false"/>
+
+ <dependency org="com.carrotsearch" name="hppc" rev="0.5.2" transitive="false"/>
+ <dependency org="org.carrot2.attributes" name="attributes-binder" rev="1.2.0" transitive="false"/>
+ <dependency org="org.simpleframework" name="simple-xml" rev="2.7" transitive="false"/>
+
+ <dependency org="org.apache.mahout" name="mahout-math" rev="0.6" transitive="false"/>
+ <dependency org="org.apache.mahout" name="mahout-collections" rev="1.0" transitive="false"/>
+
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.4" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.4" transitive="false"/>
- <dependency org="org.apache.mahout" name="mahout-collections" rev="1.0" transitive="false"/>
- <dependency org="org.apache.mahout" name="mahout-math" rev="0.6" transitive="false"/>
- <dependency org="org.simpleframework" name="simple-xml" rev="2.6.4" transitive="false"/>
+
+ <!--
+ Included as part of Solr's environment.
+
+ com.google.guava:guava:jar:14.0.1:compile
+ commons-lang:commons-lang:jar:2.6:compile
+ -->
+
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java Tue Aug 13 06:33:29 2013
@@ -37,8 +37,7 @@ public abstract class DocumentClustering
public abstract NamedList cluster(SolrParams solrParams);
/**
- * Experimental. Subject to change before the next release
- *
+ * Experimental. Subject to change before the next release
*
* Cluster the set of docs. Clustering of documents is often an expensive task that can take a long time.
* @param docs The docs to cluster. If null, cluster all docs as in {@link #cluster(org.apache.solr.common.params.SolrParams)}
Modified: lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Tue Aug 13 06:33:29 2013
@@ -77,6 +77,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.io.Closeables;
+import com.google.common.io.Closer;
/**
* Search results clustering engine based on Carrot2 clustering algorithms.
@@ -140,7 +141,13 @@ public class CarrotClusteringEngine exte
+ ". Using the default " + resource + " from Carrot JAR.");
return new IResource[] {};
} finally {
- if (resourceStream != null) Closeables.closeQuietly(resourceStream);
+ if (resourceStream != null) {
+ try {
+ resourceStream.close();
+ } catch (IOException e) {
+ // ignore.
+ }
+ }
}
log.info("Loaded Solr resource: " + resourceName);
Modified: lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java Tue Aug 13 06:33:29 2013
@@ -52,7 +52,7 @@ public class ClusteringComponentTest ext
SolrRequestHandler handler = core.getRequestHandler("standard");
SolrQueryResponse rsp;
rsp = new SolrQueryResponse();
- rsp.add("responseHeader", new SimpleOrderedMap());
+ rsp.add("responseHeader", new SimpleOrderedMap<Object>());
SolrQueryRequest req = new LocalSolrQueryRequest(core, params);
handler.handleRequest(req, rsp);
NamedList values = rsp.getValues();
@@ -70,7 +70,7 @@ public class ClusteringComponentTest ext
handler = core.getRequestHandler("docClustering");
rsp = new SolrQueryResponse();
- rsp.add("responseHeader", new SimpleOrderedMap());
+ rsp.add("responseHeader", new SimpleOrderedMap<Object>());
req = new LocalSolrQueryRequest(core, params);
handler.handleRequest(req, rsp);
values = rsp.getValues();
Modified: lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java Tue Aug 13 06:33:29 2013
@@ -15,7 +15,6 @@ package org.apache.solr.handler.clusteri
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.util.Collections;
import java.util.List;
import org.carrot2.core.Cluster;
Modified: lucene/dev/branches/lucene3069/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java Tue Aug 13 06:33:29 2013
@@ -303,6 +303,13 @@ public class SolrContentHandler extends
bldrStack.getLast().append(chars, offset, length);
}
+ /**
+ * Treat the same as any other characters
+ */
+ @Override
+ public void ignorableWhitespace(char[] chars, int offset, int length) throws SAXException {
+ characters(chars, offset, length);
+ }
/**
* Can be used to transform input values based on their {@link org.apache.solr.schema.SchemaField}
Modified: lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test-files/extraction/simple.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test-files/extraction/simple.html?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test-files/extraction/simple.html (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test-files/extraction/simple.html Tue Aug 13 06:33:29 2013
@@ -6,6 +6,7 @@
<p>
Here is some text
</p>
+<p>distinct<br/>words</p>
<div>Here is some text in a div</div>
<div>This has a <a href="http://www.apache.org">link</a>.</div>
</body>
Modified: lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java Tue Aug 13 06:33:29 2013
@@ -88,6 +88,10 @@ public class ExtractingRequestHandlerTes
assertU(commit());
assertQ(req("title:Welcome"), "//*[@numFound='1']");
+ assertQ(req("extractedContent:distinctwords"), "//*[@numFound='0']");
+ assertQ(req("extractedContent:distinct"), "//*[@numFound='1']");
+ assertQ(req("extractedContent:words"), "//*[@numFound='2']");
+ assertQ(req("extractedContent:\"distinct words\""), "//*[@numFound='1']");
loadLocal("extraction/simple.html",
"literal.id","simple2",
Modified: lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml Tue Aug 13 06:33:29 2013
@@ -48,13 +48,10 @@
ends) will be included.
-->
<lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!--
If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored
-->
- <lib dir="../../contrib/clustering/lib/downloads/" />
- <lib dir="../../contrib/clustering/lib/" />
<lib dir="/total/crap/dir/ignored" />
<!--
an exact path can be used to specify a specific file. This will
@@ -596,68 +593,6 @@
</arr>
</requestHandler>
- <!--
- Clustering Component http://wiki.apache.org/solr/ClusteringComponent
- This relies on third party jars which are not included in the
- release. To use this component (and the "/clustering" handler) Those
- jars will need to be downloaded, and you'll need to set the
- solr.cluster.enabled system property when running solr... java
- -Dsolr.clustering.enabled=true -jar start.jar
- -->
- <searchComponent name="clusteringComponent"
- enable="${solr.clustering.enabled:false}" class="org.apache.solr.handler.clustering.ClusteringComponent">
- <!-- Declare an engine -->
- <lst name="engine">
- <!-- The name, only one can be named "default" -->
- <str name="name">default</str>
- <!--
- Class name of Carrot2 clustering algorithm. Currently available
- algorithms are: *
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm *
- org.carrot2.clustering.stc.STCClusteringAlgorithm See
- http://project.carrot2.org/algorithms.html for the algorithm's
- characteristics.
- -->
- <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
- <!--
- Overriding values for Carrot2 default algorithm attributes. For
- a description of all available attributes, see:
- http://download.carrot2.org/stable/manual/#chapter.components.
- Use attribute key as name attribute of str elements below. These
- can be further overridden for individual requests by specifying
- attribute key as request parameter name and attribute value as
- parameter value.
- -->
- <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
- </lst>
- <lst name="engine">
- <str name="name">stc</str>
- <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
- </lst>
- </searchComponent>
- <requestHandler name="/clustering" enable="${solr.clustering.enabled:false}"
- class="solr.SearchHandler">
- <lst name="defaults">
- <bool name="clustering">true</bool>
- <str name="clustering.engine">default</str>
- <bool name="clustering.results">true</bool>
- <!-- The title field -->
- <str name="carrot.title">name</str>
- <str name="carrot.url">id</str>
- <!-- The field to cluster on -->
- <str name="carrot.snippet">features</str>
- <!-- produce summaries -->
- <bool name="carrot.produceSummary">true</bool>
- <!-- the maximum number of labels per cluster -->
- <!--<int name="carrot.numDescriptions">5</int>-->
- <!-- produce sub clusters -->
- <bool name="carrot.outputSubClusters">false</bool>
- </lst>
- <arr name="last-components">
- <str>clusteringComponent</str>
- </arr>
- </requestHandler>
-
<!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler -->
<requestHandler name="/update/extract"
class="org.apache.solr.handler.extraction.ExtractingRequestHandler"
Modified: lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml (original)
+++ lucene/dev/branches/lucene3069/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml Tue Aug 13 06:33:29 2013
@@ -48,13 +48,10 @@
ends) will be included.
-->
<lib dir="../../dist/" regex="solr-cell-\d.*\.jar" />
- <lib dir="../../dist/" regex="solr-clustering-\d.*\.jar" />
<!--
If a dir option (with or without a regex) is used and nothing is
found that matches, it will be ignored
-->
- <lib dir="../../contrib/clustering/lib/downloads/" />
- <lib dir="../../contrib/clustering/lib/" />
<lib dir="/total/crap/dir/ignored" />
<!--
an exact path can be used to specify a specific file. This will
@@ -595,68 +592,6 @@
</arr>
</requestHandler>
- <!--
- Clustering Component http://wiki.apache.org/solr/ClusteringComponent
- This relies on third party jars which are not included in the
- release. To use this component (and the "/clustering" handler) Those
- jars will need to be downloaded, and you'll need to set the
- solr.cluster.enabled system property when running solr... java
- -Dsolr.clustering.enabled=true -jar start.jar
- -->
- <searchComponent name="clusteringComponent"
- enable="${solr.clustering.enabled:false}" class="org.apache.solr.handler.clustering.ClusteringComponent">
- <!-- Declare an engine -->
- <lst name="engine">
- <!-- The name, only one can be named "default" -->
- <str name="name">default</str>
- <!--
- Class name of Carrot2 clustering algorithm. Currently available
- algorithms are: *
- org.carrot2.clustering.lingo.LingoClusteringAlgorithm *
- org.carrot2.clustering.stc.STCClusteringAlgorithm See
- http://project.carrot2.org/algorithms.html for the algorithm's
- characteristics.
- -->
- <str name="carrot.algorithm">org.carrot2.clustering.lingo.LingoClusteringAlgorithm</str>
- <!--
- Overriding values for Carrot2 default algorithm attributes. For
- a description of all available attributes, see:
- http://download.carrot2.org/stable/manual/#chapter.components.
- Use attribute key as name attribute of str elements below. These
- can be further overridden for individual requests by specifying
- attribute key as request parameter name and attribute value as
- parameter value.
- -->
- <str name="LingoClusteringAlgorithm.desiredClusterCountBase">20</str>
- </lst>
- <lst name="engine">
- <str name="name">stc</str>
- <str name="carrot.algorithm">org.carrot2.clustering.stc.STCClusteringAlgorithm</str>
- </lst>
- </searchComponent>
- <requestHandler name="/clustering" enable="${solr.clustering.enabled:false}"
- class="solr.SearchHandler">
- <lst name="defaults">
- <bool name="clustering">true</bool>
- <str name="clustering.engine">default</str>
- <bool name="clustering.results">true</bool>
- <!-- The title field -->
- <str name="carrot.title">name</str>
- <str name="carrot.url">id</str>
- <!-- The field to cluster on -->
- <str name="carrot.snippet">features</str>
- <!-- produce summaries -->
- <bool name="carrot.produceSummary">true</bool>
- <!-- the maximum number of labels per cluster -->
- <!--<int name="carrot.numDescriptions">5</int>-->
- <!-- produce sub clusters -->
- <bool name="carrot.outputSubClusters">false</bool>
- </lst>
- <arr name="last-components">
- <str>clusteringComponent</str>
- </arr>
- </requestHandler>
-
<!-- Solr Cell: http://wiki.apache.org/solr/ExtractingRequestHandler -->
<requestHandler name="/update/extract"
class="org.apache.solr.handler.extraction.ExtractingRequestHandler"
Modified: lucene/dev/branches/lucene3069/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/core/ivy.xml?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/core/ivy.xml (original)
+++ lucene/dev/branches/lucene3069/solr/core/ivy.xml Tue Aug 13 06:33:29 2013
@@ -41,6 +41,7 @@
<dependency org="org.restlet.jee" name="org.restlet" rev="2.1.1" conf="compile->*"/>
<dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="2.1.1" conf="compile->*"/>
<dependency org="joda-time" name="joda-time" rev="2.2" conf="compile->*"/>
+ <dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" conf="test->*"/>
<dependency org="org.easymock" name="easymock" rev="3.0" conf="test->*"/>
Modified: lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Assign.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Assign.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Assign.java (original)
+++ lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/Assign.java Tue Aug 13 06:33:29 2013
@@ -17,22 +17,36 @@ package org.apache.solr.cloud;
* the License.
*/
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.ClusterState;
+import org.apache.solr.common.cloud.DocCollection;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.util.StrUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.solr.common.cloud.ClusterState;
-import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.Slice;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.CREATE_NODE_SET;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.MAX_SHARDS_PER_NODE;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.REPLICATION_FACTOR;
public class Assign {
private static Pattern COUNT = Pattern.compile("core_node(\\d+)");
+ private static Logger log = LoggerFactory
+ .getLogger(Assign.class);
public static String assignNode(String collection, ClusterState state) {
Map<String, Slice> sliceMap = state.getSlicesMap(collection);
@@ -100,4 +114,91 @@ public class Assign {
returnShardId = shardIdNames.get(0);
return returnShardId;
}
+
+ static class Node {
+ public final String nodeName;
+ public int thisCollectionNodes=0;
+ public int totalNodes=0;
+
+ Node(String nodeName) {
+ this.nodeName = nodeName;
+ }
+
+ public int weight(){
+ return (thisCollectionNodes * 100) + totalNodes;
+ }
+ }
+
+ public static ArrayList<Node> getNodesForNewShard(ClusterState clusterState, String collectionName, int numSlices, int maxShardsPerNode, int repFactor, String createNodeSetStr) {
+ List<String> createNodeList = createNodeSetStr == null ? null: StrUtils.splitSmart(createNodeSetStr, ",", true);
+
+
+ Set<String> nodes = clusterState.getLiveNodes();
+
+ List<String> nodeList = new ArrayList<String>(nodes.size());
+ nodeList.addAll(nodes);
+ if (createNodeList != null) nodeList.retainAll(createNodeList);
+
+
+ HashMap<String,Node> nodeNameVsShardCount = new HashMap<String, Node>();
+ for (String s : nodeList) nodeNameVsShardCount.put(s,new Node(s));
+ for (String s : clusterState.getCollections()) {
+ DocCollection c = clusterState.getCollection(s);
+ //identify suitable nodes by checking the no:of cores in each of them
+ for (Slice slice : c.getSlices()) {
+ Collection<Replica> replicas = slice.getReplicas();
+ for (Replica replica : replicas) {
+ Node count = nodeNameVsShardCount.get(replica.getNodeName());
+ if (count != null) {
+ count.totalNodes++;
+ if (s.equals(collectionName)) {
+ count.thisCollectionNodes++;
+ if (count.thisCollectionNodes >= maxShardsPerNode) nodeNameVsShardCount.remove(replica.getNodeName());
+ }
+ }
+ }
+ }
+ }
+
+ if (nodeNameVsShardCount.size() <= 0) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Cannot create collection " + collectionName
+ + ". No live Solr-instances" + ((createNodeList != null)?" among Solr-instances specified in " + CREATE_NODE_SET + ":" + createNodeSetStr:""));
+ }
+
+ if (repFactor > nodeNameVsShardCount.size()) {
+ log.warn("Specified "
+ + REPLICATION_FACTOR
+ + " of "
+ + repFactor
+ + " on collection "
+ + collectionName
+ + " is higher than or equal to the number of Solr instances currently live or part of your " + CREATE_NODE_SET + "("
+ + nodeList.size()
+ + "). Its unusual to run two replica of the same slice on the same Solr-instance.");
+ }
+
+ int maxCoresAllowedToCreate = maxShardsPerNode * nodeList.size();
+ int requestedCoresToCreate = numSlices * repFactor;
+ int minCoresToCreate = requestedCoresToCreate;
+ if (maxCoresAllowedToCreate < minCoresToCreate) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Cannot create shards " + collectionName + ". Value of "
+ + MAX_SHARDS_PER_NODE + " is " + maxShardsPerNode
+ + ", and the number of live nodes is " + nodeList.size()
+ + ". This allows a maximum of " + maxCoresAllowedToCreate
+ + " to be created. Value of " + NUM_SLICES + " is " + numSlices
+ + " and value of " + REPLICATION_FACTOR + " is " + repFactor
+ + ". This requires " + requestedCoresToCreate
+ + " shards to be created (higher than the allowed number)");
+ }
+
+ ArrayList<Node> sortedNodeList = new ArrayList<>(nodeNameVsShardCount.values());
+ Collections.sort(sortedNodeList, new Comparator<Node>() {
+ @Override
+ public int compare(Node x, Node y) {
+ return (x.weight() < y.weight()) ? -1 : ((x.weight() == y.weight()) ? 0 : 1);
+ }
+ });
+ return sortedNodeList;
+ }
+
}
Modified: lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1513364&r1=1513363&r2=1513364&view=diff
==============================================================================
--- lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/branches/lucene3069/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Tue Aug 13 06:33:29 2013
@@ -1,8 +1,5 @@
package org.apache.solr.cloud;
-import java.io.IOException;
-import java.util.Map;
-
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.ClusterState;
@@ -21,6 +18,9 @@ import org.apache.zookeeper.KeeperExcept
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.Map;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -148,8 +148,8 @@ final class ShardLeaderElectionContext e
collection);
Overseer.getInQueue(zkClient).offer(ZkStateReader.toJSON(m));
- String leaderVoteWait = cc.getZkController().getLeaderVoteWait();
- if (!weAreReplacement && leaderVoteWait != null) {
+ int leaderVoteWait = cc.getZkController().getLeaderVoteWait();
+ if (!weAreReplacement) {
waitForReplicasToComeUp(weAreReplacement, leaderVoteWait);
}
@@ -309,8 +309,7 @@ final class ShardLeaderElectionContext e
}
private void waitForReplicasToComeUp(boolean weAreReplacement,
- String leaderVoteWait) throws InterruptedException {
- int timeout = Integer.parseInt(leaderVoteWait);
+ int timeout) throws InterruptedException {
long timeoutAt = System.currentTimeMillis() + timeout;
final String shardsElectZkPath = electionPath + LeaderElector.ELECTION_NODE;