hangc0276 commented on code in PR #15607: URL: https://github.com/apache/pulsar/pull/15607#discussion_r877158551
########## managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java: ########## @@ -0,0 +1,169 @@ +/** + * 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.bookkeeper.mledger.impl; + +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Range; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; +import org.apache.pulsar.common.util.collections.ConcurrentOpenLongPairRangeSet; +import org.apache.pulsar.common.util.collections.LongPairRangeSet; + +/** + * Wraps other Range classes, and adds LRU, marking dirty data and other features on this basis. + * This range set is not thread safety. + * + * @param <T> + */ +public class RangeSetWrapper<T extends Comparable<T>> implements LongPairRangeSet<T> { + + private final LongPairRangeSet<T> rangeSet; + private final LongPairConsumer<T> rangeConverter; + private final ManagedLedgerConfig config; + private final boolean enableMultiEntry; + + /** + * Record which Ledger is dirty. + */ + private final DefaultRangeSet<Long> dirtyLedgers = new LongPairRangeSet.DefaultRangeSet<>( + (LongPairConsumer<Long>) (key, value) -> key); + + public RangeSetWrapper(LongPairConsumer<T> rangeConverter, ManagedCursorImpl managedCursor) { Review Comment: We only use `managedCursor` to get config, can we just pass the config? ########## managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java: ########## @@ -0,0 +1,169 @@ +/** + * 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.bookkeeper.mledger.impl; + +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Range; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; +import org.apache.pulsar.common.util.collections.ConcurrentOpenLongPairRangeSet; +import org.apache.pulsar.common.util.collections.LongPairRangeSet; + +/** + * Wraps other Range classes, and adds LRU, marking dirty data and other features on this basis. + * This range set is not thread safety. + * + * @param <T> + */ +public class RangeSetWrapper<T extends Comparable<T>> implements LongPairRangeSet<T> { + + private final LongPairRangeSet<T> rangeSet; + private final LongPairConsumer<T> rangeConverter; + private final ManagedLedgerConfig config; + private final boolean enableMultiEntry; + + /** + * Record which Ledger is dirty. + */ + private final DefaultRangeSet<Long> dirtyLedgers = new LongPairRangeSet.DefaultRangeSet<>( + (LongPairConsumer<Long>) (key, value) -> key); + + public RangeSetWrapper(LongPairConsumer<T> rangeConverter, ManagedCursorImpl managedCursor) { + checkNotNull(managedCursor); + this.config = managedCursor.getConfig(); + this.rangeConverter = rangeConverter; + this.rangeSet = config.isUnackedRangesOpenCacheSetEnabled() + ? new ConcurrentOpenLongPairRangeSet<>(4096, rangeConverter) + : new LongPairRangeSet.DefaultRangeSet<>(rangeConverter); + this.enableMultiEntry = config.isPersistentUnackedRangesWithMultipleEntriesEnabled(); + } + + @Override + public void addOpenClosed(long lowerKey, long lowerValue, long upperKey, long upperValue) { + if (enableMultiEntry) { + dirtyLedgers.addOpenClosed(lowerKey, 0, upperKey, 0); + } + rangeSet.addOpenClosed(lowerKey, lowerValue, upperKey, upperValue); + } + + @Override + public boolean contains(long key, long value) { + return rangeSet.contains(key, value); + } + + @Override + public Range<T> rangeContaining(long key, long value) { + return rangeSet.rangeContaining(key, value); + } + + @Override + public void removeAtMost(long key, long value) { + if (enableMultiEntry) { + dirtyLedgers.removeAtMost(key, 0); + } + rangeSet.removeAtMost(key, value); + } + + @Override + public boolean isEmpty() { + return rangeSet.isEmpty(); + } + + @Override + public void clear() { + rangeSet.clear(); + dirtyLedgers.clear(); + } + + @Override + public Range<T> span() { + return rangeSet.span(); + } + + @Override + public Collection<Range<T>> asRanges() { + Collection<Range<T>> collection = rangeSet.asRanges(); + if (collection instanceof List) { + return collection; + } + return new ArrayList<>(collection); + } + + @Override + public void forEach(RangeProcessor<T> action) { + rangeSet.forEach(action); + } + + @Override + public void forEach(RangeProcessor<T> action, LongPairConsumer<? extends T> consumer) { + rangeSet.forEach(action, consumer); + } + + @Override + public int size() { + return rangeSet.size(); + } + + @Override + public Range<T> firstRange() { + return rangeSet.firstRange(); + } + + @Override + public Range<T> lastRange() { + return rangeSet.lastRange(); + } + + @VisibleForTesting + void add(Range<LongPair> range) { + if (!(rangeSet instanceof ConcurrentOpenLongPairRangeSet)) { + throw new UnsupportedOperationException("Only ConcurrentOpenLongPairRangeSet support this method"); + } + ConcurrentOpenLongPairRangeSet<LongPair> set = (ConcurrentOpenLongPairRangeSet<LongPair>) rangeSet; + set.add(range); + } + + @VisibleForTesting + void remove(Range<T> range) { Review Comment: We'd better use. ```java void remove(Range<T> range) { if (rangeSet instanceof ConcurrentOpenLongPairRangeSet) { ((ConcurrentOpenLongPairRangeSet<T>) rangeSet).remove((Range<LongPair>) range); } else { ((DefaultRangeSet<T>) rangeSet).remove(range); } } ``` ########## managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java: ########## @@ -0,0 +1,169 @@ +/** + * 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.bookkeeper.mledger.impl; + +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Range; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; +import org.apache.pulsar.common.util.collections.ConcurrentOpenLongPairRangeSet; +import org.apache.pulsar.common.util.collections.LongPairRangeSet; + +/** + * Wraps other Range classes, and adds LRU, marking dirty data and other features on this basis. + * This range set is not thread safety. + * + * @param <T> + */ +public class RangeSetWrapper<T extends Comparable<T>> implements LongPairRangeSet<T> { + + private final LongPairRangeSet<T> rangeSet; + private final LongPairConsumer<T> rangeConverter; Review Comment: `rangeConverter` never used. ########## managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/RangeSetWrapper.java: ########## @@ -0,0 +1,169 @@ +/** + * 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.bookkeeper.mledger.impl; + +import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.Range; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.apache.bookkeeper.mledger.ManagedLedgerConfig; +import org.apache.pulsar.common.util.collections.ConcurrentOpenLongPairRangeSet; +import org.apache.pulsar.common.util.collections.LongPairRangeSet; + +/** + * Wraps other Range classes, and adds LRU, marking dirty data and other features on this basis. + * This range set is not thread safety. + * + * @param <T> + */ +public class RangeSetWrapper<T extends Comparable<T>> implements LongPairRangeSet<T> { + + private final LongPairRangeSet<T> rangeSet; + private final LongPairConsumer<T> rangeConverter; + private final ManagedLedgerConfig config; + private final boolean enableMultiEntry; + + /** + * Record which Ledger is dirty. + */ + private final DefaultRangeSet<Long> dirtyLedgers = new LongPairRangeSet.DefaultRangeSet<>( + (LongPairConsumer<Long>) (key, value) -> key); + + public RangeSetWrapper(LongPairConsumer<T> rangeConverter, ManagedCursorImpl managedCursor) { + checkNotNull(managedCursor); + this.config = managedCursor.getConfig(); + this.rangeConverter = rangeConverter; + this.rangeSet = config.isUnackedRangesOpenCacheSetEnabled() + ? new ConcurrentOpenLongPairRangeSet<>(4096, rangeConverter) + : new LongPairRangeSet.DefaultRangeSet<>(rangeConverter); + this.enableMultiEntry = config.isPersistentUnackedRangesWithMultipleEntriesEnabled(); + } + + @Override + public void addOpenClosed(long lowerKey, long lowerValue, long upperKey, long upperValue) { + if (enableMultiEntry) { + dirtyLedgers.addOpenClosed(lowerKey, 0, upperKey, 0); + } + rangeSet.addOpenClosed(lowerKey, lowerValue, upperKey, upperValue); + } + + @Override + public boolean contains(long key, long value) { + return rangeSet.contains(key, value); + } + + @Override + public Range<T> rangeContaining(long key, long value) { + return rangeSet.rangeContaining(key, value); + } + + @Override + public void removeAtMost(long key, long value) { + if (enableMultiEntry) { + dirtyLedgers.removeAtMost(key, 0); + } + rangeSet.removeAtMost(key, value); + } + + @Override + public boolean isEmpty() { + return rangeSet.isEmpty(); + } + + @Override + public void clear() { + rangeSet.clear(); + dirtyLedgers.clear(); + } + + @Override + public Range<T> span() { + return rangeSet.span(); + } + + @Override + public Collection<Range<T>> asRanges() { + Collection<Range<T>> collection = rangeSet.asRanges(); + if (collection instanceof List) { + return collection; + } + return new ArrayList<>(collection); + } + + @Override + public void forEach(RangeProcessor<T> action) { + rangeSet.forEach(action); + } + + @Override + public void forEach(RangeProcessor<T> action, LongPairConsumer<? extends T> consumer) { + rangeSet.forEach(action, consumer); + } + + @Override + public int size() { + return rangeSet.size(); + } + + @Override + public Range<T> firstRange() { + return rangeSet.firstRange(); + } + + @Override + public Range<T> lastRange() { + return rangeSet.lastRange(); + } + + @VisibleForTesting + void add(Range<LongPair> range) { + if (!(rangeSet instanceof ConcurrentOpenLongPairRangeSet)) { + throw new UnsupportedOperationException("Only ConcurrentOpenLongPairRangeSet support this method"); + } + ConcurrentOpenLongPairRangeSet<LongPair> set = (ConcurrentOpenLongPairRangeSet<LongPair>) rangeSet; Review Comment: We'd better use ```java ((ConcurrentOpenLongPairRangeSet<T>) rangeSet).add(range); ``` -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
