You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/10 17:01:58 UTC
groovy git commit: Revert "Fix caches based on hash"
Repository: groovy
Updated Branches:
refs/heads/master fb00a0465 -> 4c44cb0ac
Revert "Fix caches based on hash"
This reverts commit fb00a04
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4c44cb0a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4c44cb0a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4c44cb0a
Branch: refs/heads/master
Commit: 4c44cb0ac9d9556c6af715cdfd9207cd8999d792
Parents: fb00a04
Author: sunlan <su...@apache.org>
Authored: Mon Dec 11 01:01:50 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Mon Dec 11 01:01:50 2017 +0800
----------------------------------------------------------------------
.../groovy/runtime/memoize/CacheKey.java | 56 --------------------
.../stc/StaticTypeCheckingSupport.java | 11 ++--
.../macro/transform/MacroMethodsCache.java | 9 ++--
3 files changed, 9 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/4c44cb0a/src/main/org/codehaus/groovy/runtime/memoize/CacheKey.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/memoize/CacheKey.java b/src/main/org/codehaus/groovy/runtime/memoize/CacheKey.java
deleted file mode 100644
index 1efb852..0000000
--- a/src/main/org/codehaus/groovy/runtime/memoize/CacheKey.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-package org.codehaus.groovy.runtime.memoize;
-
-import java.util.Objects;
-
-/**
- * Wrap objects to provide the basic equals and hashCode function, which are essential to collections(especially to collections based on hash)
- * @param <K> the type of key
- *
- * @since 2.5.0
- */
-public class CacheKey<K> {
- private K key;
-
- public CacheKey(K key) {
- if (null == key) {
- throw new IllegalArgumentException("key can not be null");
- }
-
- this.key = key;
- }
-
- public K getKey() {
- return key;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- CacheKey<?> cacheKey = (CacheKey<?>) o;
- return Objects.equals(key, cacheKey.key);
- }
-
- @Override
- public int hashCode() {
- return key.getClass().getCanonicalName().hashCode();
- }
-}
http://git-wip-us.apache.org/repos/asf/groovy/blob/4c44cb0a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
index 878bbd9..95919c9 100644
--- a/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
+++ b/src/main/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -46,7 +46,6 @@ import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods;
import org.codehaus.groovy.runtime.m12n.ExtensionModule;
import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner;
import org.codehaus.groovy.runtime.m12n.MetaInfExtensionModule;
-import org.codehaus.groovy.runtime.memoize.CacheKey;
import org.codehaus.groovy.runtime.memoize.CommonCache;
import org.codehaus.groovy.runtime.memoize.EvictableCache;
import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
@@ -2163,14 +2162,14 @@ public abstract class StaticTypeCheckingSupport {
* a method lookup.
*/
private static class ExtensionMethodCache {
- private final CommonCache<CacheKey<ClassLoader>, Map<String, List<MethodNode>>> cache = new CommonCache<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>(new WeakHashMap<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>());
+ private final CommonCache<ClassLoader, Map<String, List<MethodNode>>> cache = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<ClassLoader, Map<String, List<MethodNode>>>());
public Map<String, List<MethodNode>> getExtensionMethods(ClassLoader loader) {
return cache.getAndPut(
- new CacheKey<ClassLoader>(loader),
- new EvictableCache.ValueProvider<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>() {
+ loader,
+ new EvictableCache.ValueProvider<ClassLoader, Map<String, List<MethodNode>>>() {
@Override
- public Map<String, List<MethodNode>> provide(final CacheKey<ClassLoader> key) {
+ public Map<String, List<MethodNode>> provide(final ClassLoader key) {
final List<ExtensionModule> modules = new LinkedList<ExtensionModule>();
ExtensionModuleScanner scanner =
new ExtensionModuleScanner(
@@ -2186,7 +2185,7 @@ public abstract class StaticTypeCheckingSupport {
if (!skip) modules.add(module);
}
},
- key.getKey()
+ key
);
scanner.scanClasspathModules();
http://git-wip-us.apache.org/repos/asf/groovy/blob/4c44cb0a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
index 29a30ea..5a6af4a 100644
--- a/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
+++ b/subprojects/groovy-macro/src/main/groovy/org/codehaus/groovy/macro/transform/MacroMethodsCache.java
@@ -26,7 +26,6 @@ import org.codehaus.groovy.macro.runtime.Macro;
import org.codehaus.groovy.runtime.m12n.ExtensionModule;
import org.codehaus.groovy.runtime.m12n.ExtensionModuleScanner;
import org.codehaus.groovy.runtime.m12n.MetaInfExtensionModule;
-import org.codehaus.groovy.runtime.memoize.CacheKey;
import org.codehaus.groovy.runtime.memoize.CommonCache;
import org.codehaus.groovy.runtime.memoize.EvictableCache;
import org.codehaus.groovy.transform.stc.ExtensionMethodNode;
@@ -45,13 +44,13 @@ import java.util.WeakHashMap;
*/
class MacroMethodsCache {
private static final ClassNode MACRO_ANNOTATION_CLASS_NODE = ClassHelper.make(Macro.class);
- private static final CommonCache<CacheKey<ClassLoader>, Map<String, List<MethodNode>>> CACHE = new CommonCache<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>(new WeakHashMap<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>());
+ private static final CommonCache<ClassLoader, Map<String, List<MethodNode>>> CACHE = new CommonCache<ClassLoader, Map<String, List<MethodNode>>>(new WeakHashMap<ClassLoader, Map<String, List<MethodNode>>>());
public static Map<String, List<MethodNode>> get(final ClassLoader classLoader) {
- return CACHE.getAndPut(new CacheKey<ClassLoader>(classLoader), new EvictableCache.ValueProvider<CacheKey<ClassLoader>, Map<String, List<MethodNode>>>() {
+ return CACHE.getAndPut(classLoader, new EvictableCache.ValueProvider<ClassLoader, Map<String, List<MethodNode>>>() {
@Override
- public Map<String, List<MethodNode>> provide(CacheKey<ClassLoader> key) {
- return getMacroMethodsFromClassLoader(key.getKey());
+ public Map<String, List<MethodNode>> provide(ClassLoader key) {
+ return getMacroMethodsFromClassLoader(key);
}
});
}