jsedding commented on a change in pull request #25: URL: https://github.com/apache/sling-org-apache-sling-graphql-core/pull/25#discussion_r656099353
########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingField.java ########## @@ -0,0 +1,44 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.function.Supplier; + +/** Helper for a single lazy-loading value */ +public class LazyLoadingField<T> { + private Supplier<T> supplier; + private T value; + + public LazyLoadingField(Supplier<T> supplier) { + this.supplier = supplier; + } + + public T get() { + if(value == null) { Review comment: AFAIK double-checked locking requires the checked field to be volatile. Why not make supplier volatile, use that one exclusively for checking and get support for "null" values as well? Granted, your current code looks like it can support null values, but in case of a null value, it will always enter the synchronized block even when the computation was already performed. ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { + super.remove(key); + return suppliers.put(key, supplier); + } + } else { + return suppliers.put(key, supplier); + } + } + + @Override + public T get(Object key) { + return lazyCompute(key); + } + + @SuppressWarnings("unchecked") + private T lazyCompute(Object key) { + if(key == null) { + return null; + } + T value = super.get(key); Review comment: Consider whether `Map#comuteIfAbsent()` would make the code more concise here. ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { + super.remove(key); + return suppliers.put(key, supplier); + } + } else { + return suppliers.put(key, supplier); + } + } + + @Override + public T get(Object key) { + return lazyCompute(key); + } + + @SuppressWarnings("unchecked") + private T lazyCompute(Object key) { + if(key == null) { + return null; + } + T value = super.get(key); + if(value == null) { + synchronized(this) { + if(value == null) { + final Supplier<T> s = suppliers.remove(key); + if(s != null) { + suppliersCallCount++; + value = s.get(); + super.put((K)key, value); + } + } + } + } + return value; + } + + + /** This indicates how many Supplier calls have been made. + * Can be useful in case of doubt, as several methods need + * to call computeAll(). + */ + public int getSuppliersCallCount() { Review comment: Getting the number of `Supplier` still to be called could also be interesting. Maybe provide a `Stats` object with this sort of meta-information? ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { + super.remove(key); + return suppliers.put(key, supplier); + } + } else { + return suppliers.put(key, supplier); + } + } + + @Override + public T get(Object key) { + return lazyCompute(key); + } + + @SuppressWarnings("unchecked") + private T lazyCompute(Object key) { + if(key == null) { + return null; + } + T value = super.get(key); + if(value == null) { + synchronized(this) { + if(value == null) { + final Supplier<T> s = suppliers.remove(key); + if(s != null) { + suppliersCallCount++; + value = s.get(); + super.put((K)key, value); + } + } + } + } + return value; + } + + + /** This indicates how many Supplier calls have been made. + * Can be useful in case of doubt, as several methods need + * to call computeAll(). + */ + public int getSuppliersCallCount() { + return suppliersCallCount; + } + + @Override + public T remove(Object key) { + synchronized(this) { + lazyCompute(key); Review comment: We could opt to skip computation here. I understand that this would violate the contract regarding the return value. But we could document that `null`is returned if the value was never computed. For the few cases where the return value is indeed used, it would then be possible to call `get()` before removing. ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { Review comment: I don't think we need to synchronize here. `HashMap` is not thread-safe, so `LazyLoadingMap` which extends `HashMap` and uses it internally, will also not be thread-safe. Or am I missing something? ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { + super.remove(key); + return suppliers.put(key, supplier); + } + } else { + return suppliers.put(key, supplier); + } + } + + @Override + public T get(Object key) { + return lazyCompute(key); + } + + @SuppressWarnings("unchecked") + private T lazyCompute(Object key) { + if(key == null) { Review comment: `HashMap` supports the `null` key, so it could easily supported here as well. Not sure why anyone would use it, but why write extra code in order to impose artificial restrictions? ########## File path: src/main/java/org/apache/sling/graphql/helpers/layzloading/LazyLoadingMap.java ########## @@ -0,0 +1,177 @@ +/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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.apache.sling.graphql.helpers.layzloading; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class LazyLoadingMap<K, T> extends HashMap<K, T> { + + private final Logger log = LoggerFactory.getLogger(getClass()); + private final Map<K, Supplier<T>> suppliers = new HashMap<>(); + private int suppliersCallCount; + + /** Calls computeAll - should be avoided if possible */ + @Override + public boolean equals(Object o) { + if(!(o instanceof LazyLoadingMap)) { + return false; + } + final LazyLoadingMap<?,?> other = (LazyLoadingMap<?,?>)o; + + // Equality seems complicated to compute without this + computeAll(); + return super.equals(other); + } + + @Override + public int hashCode() { + return super.hashCode() + suppliers.hashCode(); + } + + /** Adds a Supplier that provides a lazy loaded value. + * Removes existing value with the same key if it exists. + */ + public Supplier<T> put(K key, Supplier<T> supplier) { + if(super.containsKey(key)) { + synchronized(this) { + super.remove(key); + return suppliers.put(key, supplier); + } + } else { + return suppliers.put(key, supplier); + } + } + + @Override + public T get(Object key) { + return lazyCompute(key); + } + + @SuppressWarnings("unchecked") + private T lazyCompute(Object key) { + if(key == null) { + return null; + } + T value = super.get(key); + if(value == null) { + synchronized(this) { + if(value == null) { + final Supplier<T> s = suppliers.remove(key); + if(s != null) { + suppliersCallCount++; + value = s.get(); + super.put((K)key, value); + } + } + } + } + return value; + } + + + /** This indicates how many Supplier calls have been made. + * Can be useful in case of doubt, as several methods need + * to call computeAll(). + */ + public int getSuppliersCallCount() { + return suppliersCallCount; + } + + @Override + public T remove(Object key) { + synchronized(this) { + lazyCompute(key); + return super.remove(key); + } + } + + @Override + public void clear() { + synchronized(this) { + suppliers.clear(); + super.clear(); + } + } + + @Override + public boolean containsKey(Object key) { + return super.containsKey(key) || suppliers.containsKey(key); + } + + @Override + public int size() { + return keySet().size(); + } + + @Override + public boolean isEmpty() { + return super.isEmpty() && suppliers.isEmpty(); + } + + @Override + public Set<K> keySet() { + final Set<K> result = new HashSet<>(); + result.addAll(super.keySet()); + result.addAll(suppliers.keySet()); + return result; + } + + /** Required for some methods that need all our values + * Calling those methods should be avoided if possible + */ + private void computeAll() { + log.info("computeAll called, all remaining lazy values will be evaluated now"); + suppliers.entrySet().forEach(e -> { Review comment: Does `suppliers.keySet().forEach(key -> this.get(key))` also work? Or does it cause `ConcurrentmodificationException` because `suppliers` has its elements removed during iteration? If that's the case, copying `suppliers.keySet()` before iteration should work. On a related note: I think the current implementation needs to call `suppliers.clear()` to be correct. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
