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:08:37 UTC
[1/2] lucene-solr:branch_6x: SOLR-9233: avoid new string creation in
CollectionAction
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x e50613cb8 -> 3a9019e02
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/153ca1f6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/153ca1f6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/153ca1f6
Branch: refs/heads/branch_6x
Commit: 153ca1f6c277beb847487a27e3d82d950049d014
Parents: d3fcac7
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:38:04 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/153ca1f6/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:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3a9019e0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3a9019e0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3a9019e0
Branch: refs/heads/branch_6x
Commit: 3a9019e0200a0ed606bb56fc395d27e54a08b9b1
Parents: 153ca1f e50613c
Author: Noble Paul <no...@apache.org>
Authored: Tue Jun 21 13:38:30 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jun 21 13:38:30 2016 +0530
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.core.prefs | 3 +
lucene/CHANGES.txt | 3 +
.../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 -
.../java/org/apache/lucene/geo/GeoUtils.java | 34 +
.../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 +-
.../document/LatLonPointDistanceQuery.java | 35 +-
.../geopoint/search/GeoPointDistanceQuery.java | 3 +
.../search/GeoPointDistanceQueryImpl.java | 52 +-
.../search/GeoPointInBBoxQueryImpl.java | 14 +
.../search/GeoPointInPolygonQueryImpl.java | 5 +
.../geopoint/search/GeoPointMultiTermQuery.java | 29 +-
.../search/GeoPointNumericTermsEnum.java | 54 +-
.../search/GeoPointPrefixTermsEnum.java | 182 ++--
.../geopoint/search/GeoPointTermsEnum.java | 60 +-
.../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 -
35 files changed, 390 insertions(+), 2135 deletions(-)
----------------------------------------------------------------------