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/06/21 08:03:22 UTC
[1/2] lucene-solr:master: SOLR-9233: avoid new string creation in
CollectionAction
Repository: lucene-solr
Updated Branches:
refs/heads/master 9c88143bd -> 7cd151300
SOLR-9233: avoid new string creation in CollectionAction
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e5822a8f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e5822a8f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e5822a8f
Branch: refs/heads/master
Commit: e5822a8f73ba76cabfbd319118c70e4a16172e1d
Parents: bd9005d
Author: Noble Paul <no...@apache.org>
Authored: Tue Jun 21 13:32:53 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jun 21 13:32:53 2016 +0530
----------------------------------------------------------------------
.../solr/common/params/CollectionParams.java | 29 ++++++++++++--------
1 file changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e5822a8f/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
index 42cf372..e38ab4f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
@@ -16,7 +16,13 @@
*/
package org.apache.solr.common.params;
+import java.util.Collections;
import java.util.Locale;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toMap;
public interface CollectionParams {
/**
@@ -93,31 +99,32 @@ public interface CollectionParams {
MOCK_REPLICA_TASK(false, LockLevel.REPLICA)
;
public final boolean isWrite;
+
+ public final String lowerName;
public final LockLevel lockLevel;
CollectionAction(boolean isWrite, LockLevel level) {
this.isWrite = isWrite;
this.lockLevel = level;
+ lowerName = toString().toLowerCase(Locale.ROOT);
}
public static CollectionAction get(String p) {
- if (p != null) {
- try {
- return CollectionAction.valueOf(p.toUpperCase(Locale.ROOT));
- } catch (Exception ex) {
- }
- }
- return null;
+ return actions.get(p == null ? null : p.toLowerCase(Locale.ROOT));
}
public boolean isEqual(String s) {
- if (s == null) return false;
- return toString().equals(s.toUpperCase(Locale.ROOT));
+ return s != null && lowerName.equals(s.toLowerCase(Locale.ROOT));
}
public String toLower() {
- return toString().toLowerCase(Locale.ROOT);
+ return lowerName;
}
-
}
+
+ Map<String, CollectionAction> actions = Collections.unmodifiableMap(
+ Stream.of(
+ CollectionAction.values())
+ .collect(toMap(CollectionAction::toLower, Function.<CollectionAction>identity())));
+
}
[2/2] lucene-solr:master: 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/7cd15130
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7cd15130
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7cd15130
Branch: refs/heads/master
Commit: 7cd151300652f0aee667370ec415a0ef15a1a053
Parents: e5822a8 9c88143
Author: Noble Paul <no...@apache.org>
Authored: Tue Jun 21 13:33:13 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jun 21 13:33:13 2016 +0530
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 3 +
lucene/CHANGES.txt | 3 +
lucene/MIGRATE.txt | 88 +-
.../autoprefix/AutoPrefixPostingsFormat.java | 125 ---
.../lucene/codecs/autoprefix/package-info.java | 22 -
.../org.apache.lucene.codecs.PostingsFormat | 1 -
.../TestAutoPrefixPostingsFormat.java | 38 -
.../codecs/autoprefix/TestAutoPrefixTerms.java | 941 -------------------
.../apache/lucene/codecs/BlockTermState.java | 14 +-
.../codecs/blocktree/AutoPrefixTermsWriter.java | 438 ---------
.../codecs/blocktree/BlockTreeTermsReader.java | 11 +-
.../codecs/blocktree/BlockTreeTermsWriter.java | 222 +----
.../codecs/blocktree/IntersectTermsEnum.java | 2 -
.../lucene/document/CompressionTools.java | 150 ---
.../java/org/apache/lucene/geo/GeoUtils.java | 43 +-
.../org/apache/lucene/index/TermContext.java | 12 -
.../java/org/apache/lucene/index/TermState.java | 6 -
.../MultiTermQueryConstantScoreWrapper.java | 4 -
.../apache/lucene/search/ScoringRewrite.java | 2 +-
.../org/apache/lucene/search/TermQuery.java | 8 -
.../org/apache/lucene/store/RAMDirectory.java | 15 +-
.../lucene/document/TestBinaryDocument.java | 29 -
.../document/LatLonPointDistanceQuery.java | 35 +-
.../geopoint/search/GeoPointDistanceQuery.java | 15 +-
.../search/GeoPointDistanceQueryImpl.java | 63 +-
.../search/GeoPointInBBoxQueryImpl.java | 32 +-
.../search/GeoPointInPolygonQueryImpl.java | 14 +-
.../geopoint/search/GeoPointMultiTermQuery.java | 49 +-
.../geopoint/search/GeoPointTermsEnum.java | 212 ++---
.../lucene/store/MockDirectoryWrapper.java | 97 +-
.../lucene/store/TestMockDirectoryWrapper.java | 82 +-
solr/CHANGES.txt | 2 +
.../org/apache/solr/cloud/ElectionContext.java | 1 -
.../org/apache/solr/query/SolrRangeQuery.java | 4 -
solr/licenses/jackcess-NOTICE.txt | 3 +-
.../apache/solr/common/util/TestRetryUtil.java | 1 -
36 files changed, 348 insertions(+), 2439 deletions(-)
----------------------------------------------------------------------