You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jira@kafka.apache.org by GitBox <gi...@apache.org> on 2020/12/09 01:39:36 UTC
[GitHub] [kafka] vamossagar12 opened a new pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
vamossagar12 opened a new pull request #9717:
URL: https://github.com/apache/kafka/pull/9717
This PR aims to add unit test cases for RocksDBRangeIterator which were missing.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] guozhangwang merged pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
guozhangwang merged pull request #9717:
URL: https://github.com/apache/kafka/pull/9717
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] guozhangwang commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
guozhangwang commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-789095693
LGTM. Merged to trunk and cherry-picked to 2.8 cc @vvcephei
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-769037674
> honestly even I wasn't making the changes that I ended up making but I assumed that makeNext is the only method that needs to be tested wrt Range Iterator as other methods are inherited by it so those should have test cases separately.
Fair point. I would agree, if we had tests for `RocksDbIterator`, but we haven't. I thought, it would be easier to restrict the tests to the range iterator and in a second step refactor the code to test also the parent class.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r553484121
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,295 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.apache.kafka.streams.KeyValue;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.partialMockBuilder;
+import static org.easymock.EasyMock.replay;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.Is.is;
+
+public class RocksDBRangeIteratorTest {
+
+ private RocksDBRangeIterator mockRocksDBRangeIterator() {
+ return partialMockBuilder(RocksDBRangeIterator.class)
+ .addMockedMethod("getNext")
+ .addMockedMethod("getRawLastKey")
+ .addMockedMethod("isForward")
+ .addMockedMethod("getComparator")
+ .createMock();
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+ final RocksDBRangeIterator rocksDBRangeIterator = mockRocksDBRangeIterator();
+
+ final String key1 = "a";
+ final String key2 = "b";
+ final String key3 = "c";
+ final String key4 = "d";
+ final String value = "value";
+
+ final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ final byte[] valueBytes = value.getBytes();
+
+ expect(rocksDBRangeIterator.getNext())
+ .andReturn(KeyValue.pair(key1Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key2Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key3Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key4Bytes, valueBytes));
+
+ expect(rocksDBRangeIterator.getRawLastKey())
+ .andReturn(key3Bytes.get())
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.isForward())
+ .andReturn(true)
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.getComparator())
+ .andReturn(Bytes.BYTES_LEXICO_COMPARATOR)
+ .anyTimes();
+
+
+ replay(rocksDBRangeIterator);
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.makeNext(), is(nullValue()));
Review comment:
@cadonna , did you get a chance to review these changes?
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-782022385
@cadonna , i have added the test case for prefix scan as well.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r546260595
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,295 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.apache.kafka.streams.KeyValue;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.partialMockBuilder;
+import static org.easymock.EasyMock.replay;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.Is.is;
+
+public class RocksDBRangeIteratorTest {
+
+ private RocksDBRangeIterator mockRocksDBRangeIterator() {
+ return partialMockBuilder(RocksDBRangeIterator.class)
+ .addMockedMethod("getNext")
+ .addMockedMethod("getRawLastKey")
+ .addMockedMethod("isForward")
+ .addMockedMethod("getComparator")
+ .createMock();
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+ final RocksDBRangeIterator rocksDBRangeIterator = mockRocksDBRangeIterator();
+
+ final String key1 = "a";
+ final String key2 = "b";
+ final String key3 = "c";
+ final String key4 = "d";
+ final String value = "value";
+
+ final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ final byte[] valueBytes = value.getBytes();
+
+ expect(rocksDBRangeIterator.getNext())
+ .andReturn(KeyValue.pair(key1Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key2Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key3Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key4Bytes, valueBytes));
+
+ expect(rocksDBRangeIterator.getRawLastKey())
+ .andReturn(key3Bytes.get())
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.isForward())
+ .andReturn(true)
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.getComparator())
+ .andReturn(Bytes.BYTES_LEXICO_COMPARATOR)
+ .anyTimes();
+
+
+ replay(rocksDBRangeIterator);
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.makeNext(), is(nullValue()));
Review comment:
@cadonna , honestly even I wasn't making the changes that I ended up making but I assumed that makeNext is the only method that needs to be tested wrt Range Iterator as other methods are inherited by it so those should have test cases separately. I have changes the test cases now.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r581765904
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,447 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+ final Bytes toBytes = Bytes.increment(key4Bytes);
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key4Bytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+ // key range in state store: [c-f]
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid()).andReturn(false);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsLargerThanLargestKeyInStateStoreReverseDirection() {
+ // key range in state store: [c-f]
+ final String from = "g";
+ final String to = "h";
+ final Bytes fromBytes = Bytes.wrap(from.getBytes());
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ fromBytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final Bytes toBytes = Bytes.increment(key4Bytes);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldCloseIterator() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ rocksIterator.close();
+ expectLastCall().times(1);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true,
+ true
+ );
+ rocksDBRangeIterator.close();
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnNextKeyValueMatchingPrefix() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final Bytes prefixKey1 = Bytes.wrap("prefix-1".getBytes());
+ final Bytes prefixKey2 = Bytes.wrap("prefix-2".getBytes());
+ final Bytes prefix = Bytes.wrap("prefix".getBytes());
+ final Bytes toBytes = Bytes.increment(prefix);
+ rocksIterator.seek(prefix.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(prefixKey1.get())
+ .andReturn(prefixKey2.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ prefix,
+ toBytes,
+ true,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(prefixKey1));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(prefixKey2));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
Review comment:
If you change the `toInclusive` to `true` in this test, the test also passes. That means, that you are not testing `toInclusive` in this test.
I suggest the following test:
```
public void shouldExcludeEndOfRange() {
final RocksIterator rocksIterator = mock(RocksIterator.class);
rocksIterator.seek(key1Bytes.get());
expect(rocksIterator.isValid())
.andReturn(true)
.andReturn(true);
expect(rocksIterator.key())
.andReturn(key1Bytes.get())
.andReturn(key2Bytes.get());
expect(rocksIterator.value()).andReturn(valueBytes).times(2);
rocksIterator.next();
expectLastCall().times(2);
replay(rocksIterator);
final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
storeName,
rocksIterator,
Collections.emptySet(),
key1Bytes,
key2Bytes,
true,
false
);
assertThat(rocksDBRangeIterator.hasNext(), is(true));
assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
assertThat(rocksDBRangeIterator.hasNext(), is(false));
verify(rocksIterator);
}
```
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 edited a comment on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 edited a comment on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-770349573
@cadonna , done. Also, I need to create a new ticket to add the tests for prefix scan related changes. I will add them once the KIP-614 is merged.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r566045641
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
Review comment:
```suggestion
final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
storeName,
rocksIterator,
Collections.emptySet(),
key1Bytes,
key3Bytes,
true
);
```
Please also fix the other wrong indentations.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final String to = "a";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ toBytes,
+ key4Bytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+
+ // key range in state store: [c-f]
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
Review comment:
```suggestion
expect(rocksIterator.isValid()).andReturn(false);
```
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final String to = "a";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ toBytes,
+ key4Bytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+
+ // key range in state store: [c-f]
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+
+ }
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsLargerThanLargestKeyInStateStoreReverseDirection() {
+
+ // key range in state store: [c-f]
+ final String from = "g";
+ final String to = "h";
+
+ final Bytes fromBytes = Bytes.wrap(from.getBytes());
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ fromBytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void testCloseIterator() {
Review comment:
Please rename to `shouldCloseIterator()`.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final String to = "a";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ toBytes,
+ key4Bytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+
+ // key range in state store: [c-f]
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+
+ }
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsLargerThanLargestKeyInStateStoreReverseDirection() {
+
+ // key range in state store: [c-f]
+ final String from = "g";
+ final String to = "h";
+
+ final Bytes fromBytes = Bytes.wrap(from.getBytes());
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ fromBytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
Review comment:
See my comment above.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
Review comment:
```suggestion
final Bytes toBytes = Bytes.wrap(to.getBytes());
```
Please also check other occurrences of this additional space.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final String to = "a";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ toBytes,
+ key4Bytes,
+ false
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+
+ // key range in state store: [c-f]
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+
+ }
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsLargerThanLargestKeyInStateStoreReverseDirection() {
+
+ // key range in state store: [c-f]
+ final String from = "g";
+ final String to = "h";
+
+ final Bytes fromBytes = Bytes.wrap(from.getBytes());
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ fromBytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
Review comment:
I think, it would be good to verify that a second call to `peekNextKey()` right after the first call to `peekNextKey()` returns the same value, since this is the main difference between `next()` and `peekNextKey()`.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+
+ final String to = "f";
Review comment:
nit: Couldn't you Instead of using a literal, use `Bytes.increment(key4Bytes)` for the `to` parameter?
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,419 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+
Review comment:
Please remove empty lines here and in the other test methods.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r545110552
##########
File path: streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBRangeIterator.java
##########
@@ -55,20 +56,36 @@
}
}
+ public byte[] getRawLastKey() {
+ return rawLastKey;
+ }
+
+ public boolean isForward() {
+ return forward;
+ }
+
+ public KeyValue<Bytes, byte[]> getNext() {
+ return super.makeNext();
+ }
+
+ public Comparator<byte[]> getComparator() {
+ return comparator;
+ }
+
@Override
public KeyValue<Bytes, byte[]> makeNext() {
- final KeyValue<Bytes, byte[]> next = super.makeNext();
+ final KeyValue<Bytes, byte[]> next = getNext();
if (next == null) {
return allDone();
} else {
- if (forward) {
- if (comparator.compare(next.key.get(), rawLastKey) <= 0) {
+ if (isForward()) {
+ if (getComparator().compare(next.key.get(), getRawLastKey()) <= 0) {
return next;
} else {
return allDone();
}
} else {
- if (comparator.compare(next.key.get(), rawLastKey) >= 0) {
+ if (getComparator().compare(next.key.get(), getRawLastKey()) >= 0) {
Review comment:
It is not a good idea to change a class due to unit tests if it is not absolutely necessary. In this case it is definitely not necessary. See my suggestion how to change the tests.
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,295 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.apache.kafka.streams.KeyValue;
+import org.junit.Test;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.partialMockBuilder;
+import static org.easymock.EasyMock.replay;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.Is.is;
+
+public class RocksDBRangeIteratorTest {
+
+ private RocksDBRangeIterator mockRocksDBRangeIterator() {
+ return partialMockBuilder(RocksDBRangeIterator.class)
+ .addMockedMethod("getNext")
+ .addMockedMethod("getRawLastKey")
+ .addMockedMethod("isForward")
+ .addMockedMethod("getComparator")
+ .createMock();
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+ final RocksDBRangeIterator rocksDBRangeIterator = mockRocksDBRangeIterator();
+
+ final String key1 = "a";
+ final String key2 = "b";
+ final String key3 = "c";
+ final String key4 = "d";
+ final String value = "value";
+
+ final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ final byte[] valueBytes = value.getBytes();
+
+ expect(rocksDBRangeIterator.getNext())
+ .andReturn(KeyValue.pair(key1Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key2Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key3Bytes, valueBytes))
+ .andReturn(KeyValue.pair(key4Bytes, valueBytes));
+
+ expect(rocksDBRangeIterator.getRawLastKey())
+ .andReturn(key3Bytes.get())
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.isForward())
+ .andReturn(true)
+ .anyTimes();
+
+ expect(rocksDBRangeIterator.getComparator())
+ .andReturn(Bytes.BYTES_LEXICO_COMPARATOR)
+ .anyTimes();
+
+
+ replay(rocksDBRangeIterator);
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.makeNext().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.makeNext(), is(nullValue()));
Review comment:
You usually do not want to mock the class under test, because you want to test it. Also partial mocks should only be used if absolutely necessary. A rule of thumb is if a partial mock is needed then most probably the design has a flaw.
In this specific case, you should mock RocksDB's iterator. For the class under test, you should test `hasNext()`, `next()`, `peekNextKey()` and `close()`, because those are the one exposed (`makeNext()` should actually de declared as `protected`, IMO).
```suggestion
final String key1 = "a";
final String key2 = "b";
final String key3 = "c";
final String key4 = "d";
final String value = "value";
final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
final byte[] valueBytes = value.getBytes();
final RocksIterator rocksIterator = mock(RocksIterator.class);
rocksIterator.seek(key1Bytes.get());
expect(rocksIterator.isValid())
.andReturn(true)
.andReturn(true)
.andReturn(true)
.andReturn(true)
.andReturn(false);
expect(rocksIterator.key())
.andReturn(key1Bytes.get())
.andReturn(key2Bytes.get())
.andReturn(key3Bytes.get())
.andReturn(key4Bytes.get());
expect(rocksIterator.value()).andReturn(valueBytes).times(4);
rocksIterator.next();
expectLastCall().times(4);
replay(rocksIterator);
final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
STORE_NAME,
rocksIterator,
Collections.emptySet(),
key1Bytes,
key4Bytes,
true
);
assertThat(rocksDBRangeIterator.hasNext(), is(true));
assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
assertThat(rocksDBRangeIterator.hasNext(), is(true));
assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
assertThat(rocksDBRangeIterator.hasNext(), is(true));
assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
assertThat(rocksDBRangeIterator.hasNext(), is(true));
assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
assertThat(rocksDBRangeIterator.hasNext(), is(false));
verify(rocksIterator);
```
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna edited a comment on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna edited a comment on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-785750359
Call for committer approval: @guozhangwang @ableegoldman @vvcephei @mjsax @abbccdda
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-741415115
@cadonna , this is post our discussion on [prefix-scan-pr](https://github.com/apache/kafka/pull/9508). Plz review whenever you find the time.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-770349573
@cadonna , done. Also, I think I need to create a new ticket to add the tests for prefix scan related changes. I will add them once the KIP-614 is merged.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] vamossagar12 commented on a change in pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
vamossagar12 commented on a change in pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#discussion_r582629479
##########
File path: streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBRangeIteratorTest.java
##########
@@ -0,0 +1,447 @@
+/*
+ * 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.kafka.streams.state.internals;
+
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.Test;
+import org.rocksdb.RocksIterator;
+
+import java.util.Collections;
+import java.util.NoSuchElementException;
+
+import static org.easymock.EasyMock.mock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThrows;
+
+public class RocksDBRangeIteratorTest {
+
+ private final String storeName = "store";
+ private final String key1 = "a";
+ private final String key2 = "b";
+ private final String key3 = "c";
+ private final String key4 = "d";
+
+ private final String value = "value";
+ private final Bytes key1Bytes = Bytes.wrap(key1.getBytes());
+ private final Bytes key2Bytes = Bytes.wrap(key2.getBytes());
+ private final Bytes key3Bytes = Bytes.wrap(key3.getBytes());
+ private final Bytes key4Bytes = Bytes.wrap(key4.getBytes());
+ private final byte[] valueBytes = value.getBytes();
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.next();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInTheRangeReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key3Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(3);
+ rocksIterator.prev();
+ expectLastCall().times(3);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsGreaterThanLargestKeyInStateStoreInForwardDirection() {
+ final Bytes toBytes = Bytes.increment(key4Bytes);
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key1Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key4Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.next();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ toBytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnAllKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(key4Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get())
+ .andReturn(key2Bytes.get())
+ .andReturn(key1Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(4);
+ rocksIterator.prev();
+ expectLastCall().times(4);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key4Bytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key1Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsSmallerThanSmallestKeyInStateStoreForwardDirection() {
+ // key range in state store: [c-f]
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid()).andReturn(false);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnNoKeysWhenLastKeyIsLargerThanLargestKeyInStateStoreReverseDirection() {
+ // key range in state store: [c-f]
+ final String from = "g";
+ final String to = "h";
+ final Bytes fromBytes = Bytes.wrap(from.getBytes());
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(false);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ fromBytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnAllKeysInPartiallyOverlappingRangeInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final String to = "e";
+ final Bytes toBytes = Bytes.wrap(to.getBytes());
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInForwardDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key2Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key3Bytes,
+ true,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key2Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key2Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnTheCurrentKeyOnInvokingPeekNextKeyInReverseDirection() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final Bytes toBytes = Bytes.increment(key4Bytes);
+ rocksIterator.seekForPrev(toBytes.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(key4Bytes.get())
+ .andReturn(key3Bytes.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.prev();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key3Bytes,
+ toBytes,
+ false,
+ true
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key4Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key4Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.peekNextKey(), is(key3Bytes));
+ assertThat(rocksDBRangeIterator.next().key, is(key3Bytes));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ assertThrows(NoSuchElementException.class, rocksDBRangeIterator::peekNextKey);
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldCloseIterator() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ rocksIterator.seek(key1Bytes.get());
+ rocksIterator.close();
+ expectLastCall().times(1);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ key1Bytes,
+ key2Bytes,
+ true,
+ true
+ );
+ rocksDBRangeIterator.close();
+ verify(rocksIterator);
+ }
+
+ @Test
+ public void shouldReturnNextKeyValueMatchingPrefix() {
+ final RocksIterator rocksIterator = mock(RocksIterator.class);
+ final Bytes prefixKey1 = Bytes.wrap("prefix-1".getBytes());
+ final Bytes prefixKey2 = Bytes.wrap("prefix-2".getBytes());
+ final Bytes prefix = Bytes.wrap("prefix".getBytes());
+ final Bytes toBytes = Bytes.increment(prefix);
+ rocksIterator.seek(prefix.get());
+ expect(rocksIterator.isValid())
+ .andReturn(true)
+ .andReturn(true)
+ .andReturn(false);
+ expect(rocksIterator.key())
+ .andReturn(prefixKey1.get())
+ .andReturn(prefixKey2.get());
+ expect(rocksIterator.value()).andReturn(valueBytes).times(2);
+ rocksIterator.next();
+ expectLastCall().times(2);
+ replay(rocksIterator);
+ final RocksDBRangeIterator rocksDBRangeIterator = new RocksDBRangeIterator(
+ storeName,
+ rocksIterator,
+ Collections.emptySet(),
+ prefix,
+ toBytes,
+ true,
+ false
+ );
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(prefixKey1));
+ assertThat(rocksDBRangeIterator.hasNext(), is(true));
+ assertThat(rocksDBRangeIterator.next().key, is(prefixKey2));
+ assertThat(rocksDBRangeIterator.hasNext(), is(false));
+ verify(rocksIterator);
+ }
Review comment:
@cadonna , added this test.
----------------------------------------------------------------
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:
users@infra.apache.org
[GitHub] [kafka] cadonna commented on pull request #9717: KAFKA-10766: Unit test cases for RocksDBRangeIterator
Posted by GitBox <gi...@apache.org>.
cadonna commented on pull request #9717:
URL: https://github.com/apache/kafka/pull/9717#issuecomment-785750359
Call for committer approval: @guozhangwang @ableegoldman @vvcephei @mjsax
----------------------------------------------------------------
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:
users@infra.apache.org