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/23 02:02:43 UTC
[1/2] lucene-solr git commit: SOLR-8377 removed an unnecessary for
loop
Repository: lucene-solr
Updated Branches:
refs/heads/master 9ca1a19b8 -> 982654b79
SOLR-8377 removed an unnecessary for loop
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/eb1f8e24
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/eb1f8e24
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/eb1f8e24
Branch: refs/heads/master
Commit: eb1f8e2409c56a915bf8b88c19b7f6f66823a7f9
Parents: 261681c
Author: Noble Paul <no...@apache.org>
Authored: Tue Feb 23 06:12:33 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Feb 23 06:12:33 2016 +0530
----------------------------------------------------------------------
.../apache/solr/cloud/rule/ReplicaAssigner.java | 22 +++++++++-----------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/eb1f8e24/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
index f3f5b41..51d9848 100644
--- a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
@@ -189,20 +189,18 @@ public class ReplicaAssigner {
for (; shardPermutations.hasNext(); ) {
int[] p = shardPermutations.next();
- for (int i = 0; i < p.length; i++) {
- List<Position> positions = new ArrayList<>();
- for (int pos : p) {
- for (int j = 0; j < shardVsReplicaCount.get(shardNames.get(pos)); j++) {
- positions.add(new Position(shardNames.get(pos), j));
- }
- }
- Collections.sort(positions);
- for (Iterator<int[]> it = permutations(rules.size()); it.hasNext(); ) {
- int[] permutation = it.next();
- Map<Position, String> result = tryAPermutationOfRules(permutation, positions, fuzzyPhase);
- if (result != null) return result;
+ List<Position> positions = new ArrayList<>();
+ for (int pos : p) {
+ for (int j = 0; j < shardVsReplicaCount.get(shardNames.get(pos)); j++) {
+ positions.add(new Position(shardNames.get(pos), j));
}
}
+ Collections.sort(positions);
+ for (Iterator<int[]> it = permutations(rules.size()); it.hasNext(); ) {
+ int[] permutation = it.next();
+ Map<Position, String> result = tryAPermutationOfRules(permutation, positions, fuzzyPhase);
+ if (result != null) return result;
+ }
}
return null;
[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/982654b7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/982654b7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/982654b7
Branch: refs/heads/master
Commit: 982654b7952d89675834b2b1bc2bc987dddf53be
Parents: eb1f8e2 9ca1a19
Author: Noble Paul <no...@apache.org>
Authored: Tue Feb 23 06:32:33 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Feb 23 06:32:33 2016 +0530
----------------------------------------------------------------------
dev-tools/idea/solr/core/src/java/solr-core.iml | 12 +-
.../idea/solr/core/src/solr-core-tests.iml | 9 -
dev-tools/idea/solr/solrj/src/solrj-tests.iml | 9 -
.../maven/solr/core/src/java/pom.xml.template | 5 +
lucene/CHANGES.txt | 3 +
.../lucene/analysis/en/PorterStemmer.java | 3 +-
.../miscellaneous/ASCIIFoldingFilter.java | 4 +-
.../miscellaneous/WordDelimiterFilter.java | 3 +-
.../lucene/analysis/synonym/SynonymFilter.java | 7 +-
.../lucene/analysis/util/RollingCharBuffer.java | 4 +-
.../org/tartarus/snowball/SnowballProgram.java | 4 +-
.../lucene/analysis/ja/JapaneseTokenizer.java | 5 +-
.../lucene50/Lucene50DocValuesProducer.java | 6 +-
.../codecs/blocktreeords/FSTOrdsOutputs.java | 2 +-
.../bloom/BloomFilteringPostingsFormat.java | 5 +-
.../codecs/memory/DirectPostingsFormat.java | 3 +-
.../codecs/memory/MemoryPostingsFormat.java | 5 +-
.../tokenattributes/CharTermAttributeImpl.java | 8 +-
.../org/apache/lucene/codecs/PointWriter.java | 2 +-
.../lucene54/Lucene54DocValuesProducer.java | 3 +-
.../codecs/lucene60/Lucene60PointFormat.java | 4 +-
.../perfield/PerFieldDocValuesFormat.java | 5 +-
.../org/apache/lucene/document/BinaryPoint.java | 2 +-
.../org/apache/lucene/document/DoublePoint.java | 40 +-
.../org/apache/lucene/document/FloatPoint.java | 40 +-
.../org/apache/lucene/document/IntPoint.java | 40 +-
.../org/apache/lucene/document/LongPoint.java | 40 +-
.../apache/lucene/index/BufferedUpdates.java | 16 +-
.../lucene/index/ConcurrentMergeScheduler.java | 6 +
.../apache/lucene/index/DocValuesUpdate.java | 14 +-
.../lucene/index/DocumentsWriterPerThread.java | 7 +-
.../index/FreqProxTermsWriterPerField.java | 10 +-
.../lucene/index/FrozenBufferedUpdates.java | 3 +-
.../lucene/index/ParallelPostingsArray.java | 4 +-
.../apache/lucene/index/PointValuesWriter.java | 6 +-
.../apache/lucene/index/PrefixCodedTerms.java | 4 +-
.../lucene/index/SortedDocValuesWriter.java | 4 +-
.../lucene/index/SortedSetDocValuesWriter.java | 6 +-
.../index/TermVectorsConsumerPerField.java | 3 +-
.../apache/lucene/search/CachingCollector.java | 8 +-
.../apache/lucene/search/ExactPointQuery.java | 153 ------
.../apache/lucene/search/PointRangeQuery.java | 491 ++++++++++++++++---
.../apache/lucene/search/ScoringRewrite.java | 3 +-
.../java/org/apache/lucene/util/ArrayUtil.java | 21 +-
.../org/apache/lucene/util/BytesRefArray.java | 6 +-
.../org/apache/lucene/util/BytesRefHash.java | 15 +-
.../org/apache/lucene/util/DocIdSetBuilder.java | 3 +-
.../org/apache/lucene/util/NumericUtils.java | 31 +-
.../apache/lucene/util/RamUsageEstimator.java | 41 +-
.../lucene/util/RecyclingIntBlockAllocator.java | 6 +-
.../org/apache/lucene/util/SentinelIntSet.java | 2 +-
.../apache/lucene/util/automaton/Automaton.java | 4 +-
.../lucene/util/automaton/SortedIntSet.java | 4 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 5 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 4 +-
.../lucene/util/bkd/OfflinePointReader.java | 5 +-
.../lucene/util/bkd/OfflinePointWriter.java | 6 +-
.../util/packed/AbstractPagedMutable.java | 4 +-
.../org/apache/lucene/util/packed/Direct16.java | 2 +-
.../org/apache/lucene/util/packed/Direct32.java | 2 +-
.../org/apache/lucene/util/packed/Direct64.java | 2 +-
.../org/apache/lucene/util/packed/Direct8.java | 2 +-
.../lucene/util/packed/GrowableWriter.java | 4 +-
.../lucene/util/packed/Packed16ThreeBlocks.java | 2 +-
.../org/apache/lucene/util/packed/Packed64.java | 4 +-
.../lucene/util/packed/Packed64SingleBlock.java | 2 +-
.../lucene/util/packed/Packed8ThreeBlocks.java | 2 +-
.../apache/lucene/util/packed/PackedInts.java | 2 +-
.../lucene/util/packed/PagedGrowableWriter.java | 4 +-
.../lucene/TestMergeSchedulerExternal.java | 3 +
.../index/TestDemoParallelLeafReader.java | 2 +-
.../apache/lucene/index/TestIntBlockPool.java | 11 +-
.../apache/lucene/search/TestPointQueries.java | 106 ++--
.../TestUsageTrackingFilterCachingPolicy.java | 2 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 12 +-
.../demo/facet/DistanceFacetsExample.java | 8 +-
.../lucene/demo/facet/RangeFacetsExample.java | 2 +-
.../facet/range/TestRangeFacetCounts.java | 20 +-
.../search/highlight/HighlighterTest.java | 2 +-
lucene/ivy-versions.properties | 4 +-
lucene/licenses/morfologik-fsa-2.0.1.jar.sha1 | 1 -
lucene/licenses/morfologik-fsa-2.1.0.jar.sha1 | 1 +
lucene/licenses/morfologik-fsa-LICENSE-BSD.txt | 2 +-
.../licenses/morfologik-polish-2.0.1.jar.sha1 | 1 -
.../licenses/morfologik-polish-2.1.0.jar.sha1 | 1 +
.../licenses/morfologik-polish-LICENSE-BSD.txt | 16 +-
.../licenses/morfologik-stemming-2.0.1.jar.sha1 | 1 -
.../licenses/morfologik-stemming-2.1.0.jar.sha1 | 1 +
.../morfologik-stemming-LICENSE-BSD.txt | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 10 +-
.../lucene/uninverting/FieldCacheImpl.java | 4 +-
.../org/apache/lucene/document/LatLonPoint.java | 4 +-
.../lucene/search/PointInPolygonQuery.java | 6 +-
.../apache/lucene/search/PointInRectQuery.java | 6 +-
.../lucene/search/TestDocValuesRangeQuery.java | 10 +-
.../spatial/prefix/ContainsPrefixTreeQuery.java | 2 +-
.../org/apache/lucene/geo3d/Geo3DPoint.java | 6 +-
.../lucene/geo3d/PointInGeo3DShapeQuery.java | 12 +-
.../search/suggest/tst/TernaryTreeNode.java | 2 +-
.../suggest/document/TestSuggestField.java | 2 +-
.../lucene/index/BasePointFormatTestCase.java | 6 +-
solr/CHANGES.txt | 18 +-
.../solrconfig.snippet.randomindexconfig.xml | 2 +-
.../apache/solr/handler/PingRequestHandler.java | 7 +-
.../solr/handler/component/SearchHandler.java | 19 +-
.../apache/solr/search/SolrIndexSearcher.java | 18 +
.../apache/solr/update/IndexFingerprint.java | 5 +-
.../java/org/apache/solr/update/PeerSync.java | 2 +-
.../collection1/conf/solrconfig-delpolicy1.xml | 3 +-
.../collection1/conf/solrconfig-delpolicy2.xml | 3 +-
.../conf/solrconfig-spellcheckcomponent.xml | 3 +-
.../solrconfig.snippet.randomindexconfig.xml | 3 +-
.../org/apache/solr/TestGroupingSearch.java | 12 +-
.../solr/cloud/ConnectionManagerTest.java | 46 ++
.../solr/cloud/TestMiniSolrCloudCluster.java | 12 +-
.../cloud/TestMiniSolrCloudClusterBase.java | 12 +-
.../cloud/TestSolrCloudWithKerberosAlt.java | 12 +-
.../test/org/apache/solr/core/TestNRTOpen.java | 8 +-
.../solr/handler/PingRequestHandlerTest.java | 3 +
.../handler/component/SearchHandlerTest.java | 47 ++
.../apache/solr/search/TestIndexSearcher.java | 11 +-
.../solr/update/DirectUpdateHandlerTest.java | 6 +-
.../org/apache/solr/update/PeerSyncTest.java | 8 +
.../solr/update/SolrCmdDistributorTest.java | 12 +-
solr/licenses/carrot2-mini-3.10.4.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.12.0.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-2.0.1.jar.sha1 | 1 -
solr/licenses/morfologik-fsa-2.1.0.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-LICENSE-BSD.txt | 2 +-
solr/licenses/morfologik-polish-2.0.1.jar.sha1 | 1 -
solr/licenses/morfologik-polish-2.1.0.jar.sha1 | 1 +
solr/licenses/morfologik-polish-LICENSE-BSD.txt | 16 +-
.../licenses/morfologik-stemming-2.0.1.jar.sha1 | 1 -
.../licenses/morfologik-stemming-2.1.0.jar.sha1 | 1 +
.../morfologik-stemming-LICENSE-BSD.txt | 2 +-
.../solr/common/cloud/ConnectionManager.java | 96 ++--
.../java/org/apache/solr/SolrTestCaseJ4.java | 45 ++
138 files changed, 1224 insertions(+), 685 deletions(-)
----------------------------------------------------------------------