You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Robert Muir <rc...@gmail.com> on 2015/04/08 21:07:52 UTC
Re: svn commit: r1672133 - in /lucene/dev/trunk/solr: ./ core/
core/src/java/org/apache/solr/store/blockcache/ core/src/test/org/apache/solr/store/blockcache/
licenses/
Did you run precommit before committing this?
I don't see the version of this library declared anywhere in the
commit. No wonder ivy cannot find it.
On Wed, Apr 8, 2015 at 2:23 PM, <el...@apache.org> wrote:
> Author: elyograg
> Date: Wed Apr 8 18:23:19 2015
> New Revision: 1672133
>
> URL: http://svn.apache.org/r1672133
> Log:
> SOLR-7355: Switch from ConcurrentLinkedHashMap to Caffeine. Trunk-only change, as it requires java 8.
>
> Added:
> lucene/dev/trunk/solr/licenses/caffeine-1.0.1.jar.sha1 (with props)
> lucene/dev/trunk/solr/licenses/caffeine-LICENSE-ASL.txt (with props)
> lucene/dev/trunk/solr/licenses/caffeine-NOTICE.txt (with props)
> Removed:
> lucene/dev/trunk/solr/licenses/concurrentlinkedhashmap-lru-1.2.jar.sha1
> lucene/dev/trunk/solr/licenses/concurrentlinkedhashmap-lru-LICENSE-ASL.txt
> lucene/dev/trunk/solr/licenses/concurrentlinkedhashmap-lru-NOTICE.txt
> Modified:
> lucene/dev/trunk/solr/CHANGES.txt
> lucene/dev/trunk/solr/core/ivy.xml
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java
> lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
>
> Modified: lucene/dev/trunk/solr/CHANGES.txt
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1672133&r1=1672132&r2=1672133&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/CHANGES.txt (original)
> +++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 8 18:23:19 2015
> @@ -58,6 +58,9 @@ Other Changes
>
> * SOLR-6954: Deprecated SolrClient.shutdown() method removed (Alan Woodward)
>
> +* SOLR-7355: Switch from Google's ConcurrentLinkedHashMap to Caffeine. Only
> + affects HDFS support. (Ben Manes via Shawn Heisey)
> +
> ================== 5.2.0 ==================
>
> Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
>
> Modified: lucene/dev/trunk/solr/core/ivy.xml
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1672133&r1=1672132&r2=1672133&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/core/ivy.xml (original)
> +++ lucene/dev/trunk/solr/core/ivy.xml Wed Apr 8 18:23:19 2015
> @@ -66,7 +66,7 @@
> <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="compile.hadoop"/>
>
> <dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile.hadoop"/>
> - <dependency org="com.googlecode.concurrentlinkedhashmap" name="concurrentlinkedhashmap-lru" rev="${/com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru}" conf="compile.hadoop"/>
> + <dependency org="com.github.ben-manes.caffeine" name="caffeine" rev="${/com.github.ben-manes.caffeine/caffeine}" conf="compile.hadoop"/>
> <dependency org="org.htrace" name="htrace-core" rev="${/org.htrace/htrace-core}" conf="compile.hadoop"/>
>
> <!-- Hadoop DfsMiniCluster Dependencies-->
>
> Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java?rev=1672133&r1=1672132&r2=1672133&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java (original)
> +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java Wed Apr 8 18:23:19 2015
> @@ -21,8 +21,9 @@ import java.nio.ByteBuffer;
> import java.util.concurrent.ConcurrentMap;
> import java.util.concurrent.atomic.AtomicInteger;
>
> -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
> -import com.googlecode.concurrentlinkedhashmap.EvictionListener;
> +import com.github.benmanes.caffeine.cache.Cache;
> +import com.github.benmanes.caffeine.cache.Caffeine;
> +import com.github.benmanes.caffeine.cache.RemovalListener;
>
> /**
> * @lucene.experimental
> @@ -31,7 +32,7 @@ public class BlockCache {
>
> public static final int _128M = 134217728;
> public static final int _32K = 32768;
> - private final ConcurrentMap<BlockCacheKey,BlockCacheLocation> cache;
> + private final Cache<BlockCacheKey,BlockCacheLocation> cache;
> private final ByteBuffer[] banks;
> private final BlockLocks[] locks;
> private final AtomicInteger[] lockCounters;
> @@ -68,20 +69,18 @@ public class BlockCache {
> locks[i] = new BlockLocks(numberOfBlocksPerBank);
> lockCounters[i] = new AtomicInteger();
> }
> -
> - EvictionListener<BlockCacheKey,BlockCacheLocation> listener = new EvictionListener<BlockCacheKey,BlockCacheLocation>() {
> - @Override
> - public void onEviction(BlockCacheKey key, BlockCacheLocation location) {
> - releaseLocation(location);
> - }
> - };
> - cache = new ConcurrentLinkedHashMap.Builder<BlockCacheKey,BlockCacheLocation>()
> - .maximumWeightedCapacity(maxEntries).listener(listener).build();
> +
> + RemovalListener<BlockCacheKey,BlockCacheLocation> listener =
> + notification -> releaseLocation(notification.getValue());
> + cache = Caffeine.newBuilder()
> + .removalListener(listener)
> + .maximumSize(maxEntries)
> + .build();
> this.blockSize = blockSize;
> }
>
> public void release(BlockCacheKey key) {
> - releaseLocation(cache.remove(key));
> + cache.invalidate(key);
> }
>
> private void releaseLocation(BlockCacheLocation location) {
> @@ -104,7 +103,7 @@ public class BlockCache {
> + blockSize + "] got length [" + length + "] with blockOffset ["
> + blockOffset + "]");
> }
> - BlockCacheLocation location = cache.get(blockCacheKey);
> + BlockCacheLocation location = cache.getIfPresent(blockCacheKey);
> boolean newLocation = false;
> if (location == null) {
> newLocation = true;
> @@ -122,7 +121,7 @@ public class BlockCache {
> bank.position(bankOffset + blockOffset);
> bank.put(data, offset, length);
> if (newLocation) {
> - releaseLocation(cache.put(blockCacheKey.clone(), location));
> + cache.put(blockCacheKey.clone(), location);
> metrics.blockCacheSize.incrementAndGet();
> }
> return true;
> @@ -130,7 +129,7 @@ public class BlockCache {
>
> public boolean fetch(BlockCacheKey blockCacheKey, byte[] buffer,
> int blockOffset, int off, int length) {
> - BlockCacheLocation location = cache.get(blockCacheKey);
> + BlockCacheLocation location = cache.getIfPresent(blockCacheKey);
> if (location == null) {
> return false;
> }
> @@ -201,6 +200,6 @@ public class BlockCache {
> }
>
> public int getSize() {
> - return cache.size();
> + return cache.asMap().size();
> }
> }
>
> Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java?rev=1672133&r1=1672132&r2=1672133&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java (original)
> +++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java Wed Apr 8 18:23:19 2015
> @@ -22,6 +22,8 @@ import java.io.IOException;
> import java.util.Map;
> import java.util.Random;
>
> +import com.github.benmanes.caffeine.cache.Caffeine;
> +
> import org.apache.lucene.store.Directory;
> import org.apache.lucene.store.FSDirectory;
> import org.apache.lucene.store.IOContext;
> @@ -34,12 +36,13 @@ import org.junit.After;
> import org.junit.Before;
> import org.junit.Test;
>
> -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
> -
> public class BlockDirectoryTest extends SolrTestCaseJ4 {
>
> private class MapperCache implements Cache {
> - public Map<String, byte[]> map = new ConcurrentLinkedHashMap.Builder<String, byte[]>().maximumWeightedCapacity(8).build();
> + public Map<String, byte[]> map = Caffeine.newBuilder()
> + .maximumSize(8)
> + .<String, byte[]>build()
> + .asMap();
>
> @Override
> public void update(String name, long blockId, int blockOffset, byte[] buffer, int offset, int length) {
> @@ -167,7 +170,10 @@ public class BlockDirectoryTest extends
>
> @Test
> public void testRandomAccessWritesLargeCache() throws IOException {
> - mapperCache.map = new ConcurrentLinkedHashMap.Builder<String, byte[]>().maximumWeightedCapacity(10000).build();
> + mapperCache.map = Caffeine.newBuilder()
> + .maximumSize(10_000)
> + .<String, byte[]>build()
> + .asMap();
> testRandomAccessWrites();
> }
>
>
> Added: lucene/dev/trunk/solr/licenses/caffeine-1.0.1.jar.sha1
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/caffeine-1.0.1.jar.sha1?rev=1672133&view=auto
> ==============================================================================
> --- lucene/dev/trunk/solr/licenses/caffeine-1.0.1.jar.sha1 (added)
> +++ lucene/dev/trunk/solr/licenses/caffeine-1.0.1.jar.sha1 Wed Apr 8 18:23:19 2015
> @@ -0,0 +1 @@
> +eb95a1eb55cb02018b8e0bc1609ce569b455ea98
>
> Added: lucene/dev/trunk/solr/licenses/caffeine-LICENSE-ASL.txt
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/caffeine-LICENSE-ASL.txt?rev=1672133&view=auto
> ==============================================================================
> --- lucene/dev/trunk/solr/licenses/caffeine-LICENSE-ASL.txt (added)
> +++ lucene/dev/trunk/solr/licenses/caffeine-LICENSE-ASL.txt Wed Apr 8 18:23:19 2015
> @@ -0,0 +1,403 @@
> +
> +
> + Apache License
> +
> + Version 2.0, January 2004
> +
> + http://www.apache.org/licenses/
> +
> +
> +
> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> +
> +
> +
> + 1. Definitions.
> +
> +
> +
> + "License" shall mean the terms and conditions for use, reproduction,
> +
> + and distribution as defined by Sections 1 through 9 of this document.
> +
> +
> +
> + "Licensor" shall mean the copyright owner or entity authorized by
> +
> + the copyright owner that is granting the License.
> +
> +
> +
> + "Legal Entity" shall mean the union of the acting entity and all
> +
> + other entities that control, are controlled by, or are under common
> +
> + control with that entity. For the purposes of this definition,
> +
> + "control" means (i) the power, direct or indirect, to cause the
> +
> + direction or management of such entity, whether by contract or
> +
> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
> +
> + outstanding shares, or (iii) beneficial ownership of such entity.
> +
> +
> +
> + "You" (or "Your") shall mean an individual or Legal Entity
> +
> + exercising permissions granted by this License.
> +
> +
> +
> + "Source" form shall mean the preferred form for making modifications,
> +
> + including but not limited to software source code, documentation
> +
> + source, and configuration files.
> +
> +
> +
> + "Object" form shall mean any form resulting from mechanical
> +
> + transformation or translation of a Source form, including but
> +
> + not limited to compiled object code, generated documentation,
> +
> + and conversions to other media types.
> +
> +
> +
> + "Work" shall mean the work of authorship, whether in Source or
> +
> + Object form, made available under the License, as indicated by a
> +
> + copyright notice that is included in or attached to the work
> +
> + (an example is provided in the Appendix below).
> +
> +
> +
> + "Derivative Works" shall mean any work, whether in Source or Object
> +
> + form, that is based on (or derived from) the Work and for which the
> +
> + editorial revisions, annotations, elaborations, or other modifications
> +
> + represent, as a whole, an original work of authorship. For the purposes
> +
> + of this License, Derivative Works shall not include works that remain
> +
> + separable from, or merely link (or bind by name) to the interfaces of,
> +
> + the Work and Derivative Works thereof.
> +
> +
> +
> + "Contribution" shall mean any work of authorship, including
> +
> + the original version of the Work and any modifications or additions
> +
> + to that Work or Derivative Works thereof, that is intentionally
> +
> + submitted to Licensor for inclusion in the Work by the copyright owner
> +
> + or by an individual or Legal Entity authorized to submit on behalf of
> +
> + the copyright owner. For the purposes of this definition, "submitted"
> +
> + means any form of electronic, verbal, or written communication sent
> +
> + to the Licensor or its representatives, including but not limited to
> +
> + communication on electronic mailing lists, source code control systems,
> +
> + and issue tracking systems that are managed by, or on behalf of, the
> +
> + Licensor for the purpose of discussing and improving the Work, but
> +
> + excluding communication that is conspicuously marked or otherwise
> +
> + designated in writing by the copyright owner as "Not a Contribution."
> +
> +
> +
> + "Contributor" shall mean Licensor and any individual or Legal Entity
> +
> + on behalf of whom a Contribution has been received by Licensor and
> +
> + subsequently incorporated within the Work.
> +
> +
> +
> + 2. Grant of Copyright License. Subject to the terms and conditions of
> +
> + this License, each Contributor hereby grants to You a perpetual,
> +
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> +
> + copyright license to reproduce, prepare Derivative Works of,
> +
> + publicly display, publicly perform, sublicense, and distribute the
> +
> + Work and such Derivative Works in Source or Object form.
> +
> +
> +
> + 3. Grant of Patent License. Subject to the terms and conditions of
> +
> + this License, each Contributor hereby grants to You a perpetual,
> +
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> +
> + (except as stated in this section) patent license to make, have made,
> +
> + use, offer to sell, sell, import, and otherwise transfer the Work,
> +
> + where such license applies only to those patent claims licensable
> +
> + by such Contributor that are necessarily infringed by their
> +
> + Contribution(s) alone or by combination of their Contribution(s)
> +
> + with the Work to which such Contribution(s) was submitted. If You
> +
> + institute patent litigation against any entity (including a
> +
> + cross-claim or counterclaim in a lawsuit) alleging that the Work
> +
> + or a Contribution incorporated within the Work constitutes direct
> +
> + or contributory patent infringement, then any patent licenses
> +
> + granted to You under this License for that Work shall terminate
> +
> + as of the date such litigation is filed.
> +
> +
> +
> + 4. Redistribution. You may reproduce and distribute copies of the
> +
> + Work or Derivative Works thereof in any medium, with or without
> +
> + modifications, and in Source or Object form, provided that You
> +
> + meet the following conditions:
> +
> +
> +
> + (a) You must give any other recipients of the Work or
> +
> + Derivative Works a copy of this License; and
> +
> +
> +
> + (b) You must cause any modified files to carry prominent notices
> +
> + stating that You changed the files; and
> +
> +
> +
> + (c) You must retain, in the Source form of any Derivative Works
> +
> + that You distribute, all copyright, patent, trademark, and
> +
> + attribution notices from the Source form of the Work,
> +
> + excluding those notices that do not pertain to any part of
> +
> + the Derivative Works; and
> +
> +
> +
> + (d) If the Work includes a "NOTICE" text file as part of its
> +
> + distribution, then any Derivative Works that You distribute must
> +
> + include a readable copy of the attribution notices contained
> +
> + within such NOTICE file, excluding those notices that do not
> +
> + pertain to any part of the Derivative Works, in at least one
> +
> + of the following places: within a NOTICE text file distributed
> +
> + as part of the Derivative Works; within the Source form or
> +
> + documentation, if provided along with the Derivative Works; or,
> +
> + within a display generated by the Derivative Works, if and
> +
> + wherever such third-party notices normally appear. The contents
> +
> + of the NOTICE file are for informational purposes only and
> +
> + do not modify the License. You may add Your own attribution
> +
> + notices within Derivative Works that You distribute, alongside
> +
> + or as an addendum to the NOTICE text from the Work, provided
> +
> + that such additional attribution notices cannot be construed
> +
> + as modifying the License.
> +
> +
> +
> + You may add Your own copyright statement to Your modifications and
> +
> + may provide additional or different license terms and conditions
> +
> + for use, reproduction, or distribution of Your modifications, or
> +
> + for any such Derivative Works as a whole, provided Your use,
> +
> + reproduction, and distribution of the Work otherwise complies with
> +
> + the conditions stated in this License.
> +
> +
> +
> + 5. Submission of Contributions. Unless You explicitly state otherwise,
> +
> + any Contribution intentionally submitted for inclusion in the Work
> +
> + by You to the Licensor shall be under the terms and conditions of
> +
> + this License, without any additional terms or conditions.
> +
> + Notwithstanding the above, nothing herein shall supersede or modify
> +
> + the terms of any separate license agreement you may have executed
> +
> + with Licensor regarding such Contributions.
> +
> +
> +
> + 6. Trademarks. This License does not grant permission to use the trade
> +
> + names, trademarks, service marks, or product names of the Licensor,
> +
> + except as required for reasonable and customary use in describing the
> +
> + origin of the Work and reproducing the content of the NOTICE file.
> +
> +
> +
> + 7. Disclaimer of Warranty. Unless required by applicable law or
> +
> + agreed to in writing, Licensor provides the Work (and each
> +
> + Contributor provides its Contributions) on an "AS IS" BASIS,
> +
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> +
> + implied, including, without limitation, any warranties or conditions
> +
> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> +
> + PARTICULAR PURPOSE. You are solely responsible for determining the
> +
> + appropriateness of using or redistributing the Work and assume any
> +
> + risks associated with Your exercise of permissions under this License.
> +
> +
> +
> + 8. Limitation of Liability. In no event and under no legal theory,
> +
> + whether in tort (including negligence), contract, or otherwise,
> +
> + unless required by applicable law (such as deliberate and grossly
> +
> + negligent acts) or agreed to in writing, shall any Contributor be
> +
> + liable to You for damages, including any direct, indirect, special,
> +
> + incidental, or consequential damages of any character arising as a
> +
> + result of this License or out of the use or inability to use the
> +
> + Work (including but not limited to damages for loss of goodwill,
> +
> + work stoppage, computer failure or malfunction, or any and all
> +
> + other commercial damages or losses), even if such Contributor
> +
> + has been advised of the possibility of such damages.
> +
> +
> +
> + 9. Accepting Warranty or Additional Liability. While redistributing
> +
> + the Work or Derivative Works thereof, You may choose to offer,
> +
> + and charge a fee for, acceptance of support, warranty, indemnity,
> +
> + or other liability obligations and/or rights consistent with this
> +
> + License. However, in accepting such obligations, You may act only
> +
> + on Your own behalf and on Your sole responsibility, not on behalf
> +
> + of any other Contributor, and only if You agree to indemnify,
> +
> + defend, and hold each Contributor harmless for any liability
> +
> + incurred by, or claims asserted against, such Contributor by reason
> +
> + of your accepting any such warranty or additional liability.
> +
> +
> +
> + END OF TERMS AND CONDITIONS
> +
> +
> +
> + APPENDIX: How to apply the Apache License to your work.
> +
> +
> +
> + To apply the Apache License to your work, attach the following
> +
> + boilerplate notice, with the fields enclosed by brackets "[]"
> +
> + replaced with your own identifying information. (Don't include
> +
> + the brackets!) The text should be enclosed in the appropriate
> +
> + comment syntax for the file format. We also recommend that a
> +
> + file or class name and description of purpose be included on the
> +
> + same "printed page" as the copyright notice for easier
> +
> + identification within third-party archives.
> +
> +
> +
> + Copyright [yyyy] [name of copyright owner]
> +
> +
> +
> + Licensed under the Apache License, Version 2.0 (the "License");
> +
> + you may not use this file except in compliance with the License.
> +
> + You may obtain a copy of the License at
> +
> +
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> +
> +
> + Unless required by applicable law or agreed to in writing, software
> +
> + distributed under the License is distributed on an "AS IS" BASIS,
> +
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> +
> + See the License for the specific language governing permissions and
> +
> + limitations under the License.
> \ No newline at end of file
>
> Added: lucene/dev/trunk/solr/licenses/caffeine-NOTICE.txt
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/caffeine-NOTICE.txt?rev=1672133&view=auto
> ==============================================================================
> --- lucene/dev/trunk/solr/licenses/caffeine-NOTICE.txt (added)
> +++ lucene/dev/trunk/solr/licenses/caffeine-NOTICE.txt Wed Apr 8 18:23:19 2015
> @@ -0,0 +1 @@
> +Copyright 2015 by Ben Manes
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1672133 - in /lucene/dev/trunk/solr: ./ core/ core/src/java/org/apache/solr/store/blockcache/
core/src/test/org/apache/solr/store/blockcache/ licenses/
Posted by Shawn Heisey <ap...@elyograg.org>.
On 4/8/2015 1:07 PM, Robert Muir wrote:
> Did you run precommit before committing this?
>
I did, it passed.
The problem was user error, completely my fault. I was running solr
tests after the precommit, and when that finished, I proceeded with the
commit -- but didn't realize I was still sitting in the solr directory.
There is a followup commit from the correct place that updated the ivy
versions.
Thanks,
Shawn
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org