jasonstack commented on code in PR #3649: URL: https://github.com/apache/cassandra/pull/3649#discussion_r1832154044
########## test/distributed/org/apache/cassandra/fuzz/sai/PagingStaticsTortureTest.java: ########## @@ -0,0 +1,54 @@ +/* + * 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.cassandra.fuzz.sai; + +import org.junit.BeforeClass; + +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.harry.sut.injvm.InJvmSut; +import org.apache.cassandra.harry.sut.injvm.InJvmSutBase; + +public class PagingStaticsTortureTest extends StaticsTortureTest +{ + private static final int FETCH_SIZE = 10; + + @BeforeClass + public static void before() throws Throwable + { + cluster = Cluster.build() + .withNodes(1) + .withConfig(InJvmSutBase.defaultConfig()) + .createWithoutStarting(); + cluster.setUncaughtExceptionsFilter(t -> { + logger.error("Caught exception, reporting during shutdown. Ignoring.", t); Review Comment: is it always reported during shutdown? ########## src/java/org/apache/cassandra/utils/InsertionOrderedNavigableSet.java: ########## @@ -0,0 +1,297 @@ +/* + * 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.cassandra.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.SortedSet; + +import com.google.common.base.Preconditions; + +/** + * A {@link NavigableSet} that enforces in-order insertion of elements. This is helpful when we + * have an already-ordered collection with no duplicates and want constant time insertion. + * <p> + * Note: Not all methods of {@link NavigableSet} are implemented. + * + * @param <E> the type of elements maintained by this set + */ +public class InsertionOrderedNavigableSet<E> implements NavigableSet<E> +{ + private final ArrayList<E> elements; + private final Comparator<? super E> comparator; + + public InsertionOrderedNavigableSet(Comparator<? super E> comparator) + { + this.elements = new ArrayList<>(); + this.comparator = comparator; + } + + @Override + public E lower(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E floor(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E ceiling(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E higher(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E pollFirst() + { + if (isEmpty()) + return null; + + return elements.remove(0); + } + + @Override + public E pollLast() + { + if (isEmpty()) + return null; + + return elements.remove(size() - 1); + } + + @Override + public int size() + { + return elements.size(); + } + + @Override + public boolean isEmpty() + { + return elements.isEmpty(); + } + + @Override + public boolean contains(Object o) + { + return elements.contains(o); + } + + @Override + public Iterator<E> iterator() + { + return elements.iterator(); + } + + @Override + public Object[] toArray() + { + return elements.toArray(); + } + + @Override + public <T> T[] toArray(T[] a) + { + return elements.toArray(a); + } + + @Override + public boolean add(E e) + { + if (!isEmpty() && comparator.compare(e, last()) <= 0) + throw new IllegalStateException("Cannot add element less than or equal to current last element"); + + return elements.add(e); + } + + @Override + public boolean remove(Object o) + { + return elements.remove(o); + } + + @Override + public boolean containsAll(Collection<?> c) + { + return elements.containsAll(c); + } + + @Override + public boolean addAll(Collection<? extends E> c) + { + boolean modified = false; + for (E element : c) + if (add(element)) + modified = true; + return modified; + } + + @Override + public boolean retainAll(Collection<?> c) + { + return elements.retainAll(c); + } + + @Override + public boolean removeAll(Collection<?> c) + { + return elements.removeAll(c); + } + + @Override + public void clear() + { + elements.clear(); + } + + @Override + public NavigableSet<E> descendingSet() + { + throw new UnsupportedOperationException(); + } + + @Override + public Iterator<E> descendingIterator() + { + throw new UnsupportedOperationException(); + } + + @Override + public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) + { + throw new UnsupportedOperationException(); + } + + @Override + public NavigableSet<E> headSet(E toElement, boolean inclusive) + { + Preconditions.checkNotNull(toElement); + + if (isEmpty()) + return Collections.emptyNavigableSet(); + + NavigableSet<E> head = new InsertionOrderedNavigableSet<>(comparator); + + for (E element : elements) + { + int comparison = comparator.compare(element, toElement); + if (comparison > 0 || comparison == 0 && inclusive ) Review Comment: if it's not inclusive and the same comparison, we skip it. ########## src/java/org/apache/cassandra/utils/InsertionOrderedNavigableSet.java: ########## @@ -0,0 +1,297 @@ +/* + * 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.cassandra.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.SortedSet; + +import com.google.common.base.Preconditions; + +/** + * A {@link NavigableSet} that enforces in-order insertion of elements. This is helpful when we + * have an already-ordered collection with no duplicates and want constant time insertion. + * <p> + * Note: Not all methods of {@link NavigableSet} are implemented. + * + * @param <E> the type of elements maintained by this set + */ +public class InsertionOrderedNavigableSet<E> implements NavigableSet<E> +{ + private final ArrayList<E> elements; + private final Comparator<? super E> comparator; + + public InsertionOrderedNavigableSet(Comparator<? super E> comparator) + { + this.elements = new ArrayList<>(); + this.comparator = comparator; + } + + @Override + public E lower(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E floor(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E ceiling(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E higher(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E pollFirst() + { + if (isEmpty()) + return null; + + return elements.remove(0); + } + + @Override + public E pollLast() + { + if (isEmpty()) + return null; + + return elements.remove(size() - 1); + } + + @Override + public int size() + { + return elements.size(); + } + + @Override + public boolean isEmpty() + { + return elements.isEmpty(); + } + + @Override + public boolean contains(Object o) + { + return elements.contains(o); + } + + @Override + public Iterator<E> iterator() + { + return elements.iterator(); + } + + @Override + public Object[] toArray() + { + return elements.toArray(); + } + + @Override + public <T> T[] toArray(T[] a) + { + return elements.toArray(a); + } + + @Override + public boolean add(E e) + { + if (!isEmpty() && comparator.compare(e, last()) <= 0) + throw new IllegalStateException("Cannot add element less than or equal to current last element"); + + return elements.add(e); + } + + @Override + public boolean remove(Object o) + { + return elements.remove(o); + } + + @Override + public boolean containsAll(Collection<?> c) + { + return elements.containsAll(c); + } + + @Override + public boolean addAll(Collection<? extends E> c) + { + boolean modified = false; + for (E element : c) + if (add(element)) + modified = true; + return modified; + } + + @Override + public boolean retainAll(Collection<?> c) + { + return elements.retainAll(c); + } + + @Override + public boolean removeAll(Collection<?> c) + { + return elements.removeAll(c); + } + + @Override + public void clear() + { + elements.clear(); + } + + @Override + public NavigableSet<E> descendingSet() + { + throw new UnsupportedOperationException(); + } + + @Override + public Iterator<E> descendingIterator() + { + throw new UnsupportedOperationException(); + } + + @Override + public NavigableSet<E> subSet(E fromElement, boolean fromInclusive, E toElement, boolean toInclusive) + { + throw new UnsupportedOperationException(); + } + + @Override + public NavigableSet<E> headSet(E toElement, boolean inclusive) + { + Preconditions.checkNotNull(toElement); + + if (isEmpty()) + return Collections.emptyNavigableSet(); + + NavigableSet<E> head = new InsertionOrderedNavigableSet<>(comparator); + + for (E element : elements) + { + int comparison = comparator.compare(element, toElement); + if (comparison > 0 || comparison == 0 && inclusive ) Review Comment: ```suggestion if (comparison > 0 || comparison == 0 && !inclusive) ``` ########## src/java/org/apache/cassandra/utils/InsertionOrderedNavigableSet.java: ########## @@ -0,0 +1,297 @@ +/* + * 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.cassandra.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.SortedSet; + +import com.google.common.base.Preconditions; + +/** + * A {@link NavigableSet} that enforces in-order insertion of elements. This is helpful when we + * have an already-ordered collection with no duplicates and want constant time insertion. + * <p> + * Note: Not all methods of {@link NavigableSet} are implemented. + * + * @param <E> the type of elements maintained by this set + */ +public class InsertionOrderedNavigableSet<E> implements NavigableSet<E> +{ + private final ArrayList<E> elements; + private final Comparator<? super E> comparator; + + public InsertionOrderedNavigableSet(Comparator<? super E> comparator) + { + this.elements = new ArrayList<>(); + this.comparator = comparator; + } + + @Override + public E lower(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E floor(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E ceiling(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E higher(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E pollFirst() + { + if (isEmpty()) + return null; + + return elements.remove(0); + } + + @Override + public E pollLast() + { + if (isEmpty()) + return null; + + return elements.remove(size() - 1); + } + + @Override + public int size() + { + return elements.size(); + } + + @Override + public boolean isEmpty() + { + return elements.isEmpty(); + } + + @Override + public boolean contains(Object o) + { + return elements.contains(o); + } + + @Override + public Iterator<E> iterator() + { + return elements.iterator(); + } + + @Override + public Object[] toArray() + { + return elements.toArray(); + } + + @Override + public <T> T[] toArray(T[] a) + { + return elements.toArray(a); + } + + @Override + public boolean add(E e) + { + if (!isEmpty() && comparator.compare(e, last()) <= 0) + throw new IllegalStateException("Cannot add element less than or equal to current last element"); Review Comment: would be nice to `e` into exception message ########## src/java/org/apache/cassandra/utils/InsertionOrderedNavigableSet.java: ########## @@ -0,0 +1,297 @@ +/* + * 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.cassandra.utils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.SortedSet; + +import com.google.common.base.Preconditions; + +/** + * A {@link NavigableSet} that enforces in-order insertion of elements. This is helpful when we + * have an already-ordered collection with no duplicates and want constant time insertion. + * <p> + * Note: Not all methods of {@link NavigableSet} are implemented. + * + * @param <E> the type of elements maintained by this set + */ +public class InsertionOrderedNavigableSet<E> implements NavigableSet<E> +{ + private final ArrayList<E> elements; + private final Comparator<? super E> comparator; + + public InsertionOrderedNavigableSet(Comparator<? super E> comparator) + { + this.elements = new ArrayList<>(); + this.comparator = comparator; + } + + @Override + public E lower(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E floor(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E ceiling(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E higher(E e) + { + throw new UnsupportedOperationException(); + } + + @Override + public E pollFirst() + { + if (isEmpty()) + return null; + + return elements.remove(0); + } + + @Override + public E pollLast() + { + if (isEmpty()) + return null; + + return elements.remove(size() - 1); + } + + @Override + public int size() + { + return elements.size(); + } + + @Override + public boolean isEmpty() + { + return elements.isEmpty(); + } + + @Override + public boolean contains(Object o) + { + return elements.contains(o); + } + + @Override + public Iterator<E> iterator() + { + return elements.iterator(); + } + + @Override + public Object[] toArray() + { + return elements.toArray(); + } + + @Override + public <T> T[] toArray(T[] a) + { + return elements.toArray(a); + } + + @Override + public boolean add(E e) + { + if (!isEmpty() && comparator.compare(e, last()) <= 0) + throw new IllegalStateException("Cannot add element less than or equal to current last element"); Review Comment: would be nice to include `e` into exception message -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
