You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2022/10/09 09:13:10 UTC
[GitHub] [pulsar] poorbarcode opened a new pull request, #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
poorbarcode opened a new pull request, #17976:
URL: https://github.com/apache/pulsar/pull/17976
### Motivation & Modifications
`CompactedTopicImpl.findStartPointLoop` uses the binary search, but the implementation had a flaw that caused several more loops to be executed. If an array like this: `[1,2,3...100]`, and we search value `2` in this array, `CompactedTopicImpl.findStartPointLoop` will execute the following loops:
```
start: 0, mid:50, end: 100
start: 0, mid:25, end: 50
start: 0, mid:12, end: 25
start: 0, mid:6, end: 12
start: 0, mid:3, end: 6
start: 0, mid:1, end: 3
start: 1, mid:1, end: 1 bingo!
```
We can optimize the loop like this:
```
start: 0, mid:50, end: 100
start: 1, mid:25, end: 50 bingo!
```
### Documentation
<!-- DO NOT REMOVE THIS SECTION. CHECK THE PROPER BOX ONLY. -->
- [ ] `doc` <!-- Your PR contains doc changes -->
- [ ] `doc-required` <!-- Your PR changes impact docs and you will update later -->
- [x] `doc-not-needed` <!-- Your PR changes do not impact docs -->
- [ ] `doc-complete` <!-- Docs have been already added -->
### Matching PR in forked repository
PR in forked repository:
- https://github.com/poorbarcode/pulsar/pull/20
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r991783039
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,147 @@
+/**
+ * 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.pulsar.compaction;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long, Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L, 0L);
+ ORIGIN_SPARSE_LEDGER.put(1L, 1L);
+ ORIGIN_SPARSE_LEDGER.put(2L, 1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L, 1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L, 1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L, 1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L, 1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L, 1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE, Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop() {
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker) {
+ // Mock ledger.
+ final TreeMap<Long, Long> sparseLedger = new TreeMap<>();
+ sparseLedger.putAll(ORIGIN_SPARSE_LEDGER.subMap(start, end + 1));
+ sparseLedger.put(Long.MAX_VALUE, Long.MAX_VALUE);
+
+ Function<Long, Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
+
+ // Calculate the correct position.
+ for (long i = start; i <= end; i++) {
+ if (findMessageIdFunc.apply(i) >= targetMessageId) {
+ bingoMarker.set(i);
+ break;
+ }
+ }
+
+ return new CacheLoader<Long, MessageIdData>() {
+ @Override
+ public @Nullable MessageIdData load(@NonNull Long entryId) throws Exception {
+ MessageIdData messageIdData = new MessageIdData();
+ messageIdData.setLedgerId(DEFAULT_LEDGER_ID);
+ messageIdData.setEntryId(findMessageIdFunc.apply(entryId));
+ return messageIdData;
+ }
+ };
+ }
+
+ @Test(dataProvider = "argsForFindStartPointLoop")
+ public void testFindStartPointLoop(long start, long end, long targetMessageId) {
+ AtomicLong bingoMarker = new AtomicLong();
+ // Mock cache.
+ AsyncLoadingCache<Long, MessageIdData> cache = Caffeine.newBuilder()
+ .buildAsync(mockCacheLoader(start, end, targetMessageId, bingoMarker));
+ // Do test.
+ PositionImpl targetPosition = PositionImpl.get(DEFAULT_LEDGER_ID, targetMessageId);
+ CompletableFuture<Long> promise = new CompletableFuture<>();
+ CompactedTopicImpl.findStartPointLoop(targetPosition, start, end, promise, cache);
+ long result = promise.join();
+ assertEquals(result, bingoMarker.get());
+ }
+
+ /**
+ * Why should we check the recursion number of "findStartPointLoop", see: #17976
+ */
+ @Test
+ public void testRecursionNumberOfFindStartPointLoop() throws Exception {
Review Comment:
Already removed. Thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] codelipenghui merged pull request #17976: [improve][broker] Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
codelipenghui merged PR #17976:
URL: https://github.com/apache/pulsar/pull/17976
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r990940214
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop(){
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker){
+ // Mock ledger.
+ final TreeMap<Long,Long> sparseLedger = new TreeMap<>();
+ sparseLedger.putAll(ORIGIN_SPARSE_LEDGER.subMap(start, end + 1));
+ sparseLedger.put(Long.MAX_VALUE,Long.MAX_VALUE);
+
+ Function<Long,Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
Review Comment:
Already fixed
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop(){
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker){
+ // Mock ledger.
+ final TreeMap<Long,Long> sparseLedger = new TreeMap<>();
+ sparseLedger.putAll(ORIGIN_SPARSE_LEDGER.subMap(start, end + 1));
+ sparseLedger.put(Long.MAX_VALUE,Long.MAX_VALUE);
+
+ Function<Long,Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
Review Comment:
Already fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r990940482
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
Review Comment:
Already fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] labuladong commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
labuladong commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r991178256
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,147 @@
+/**
+ * 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.pulsar.compaction;
+
+import static org.mockito.Mockito.*;
+import static org.testng.Assert.*;
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long, Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L, 0L);
+ ORIGIN_SPARSE_LEDGER.put(1L, 1L);
+ ORIGIN_SPARSE_LEDGER.put(2L, 1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L, 1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L, 1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L, 1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L, 1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L, 1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE, Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop() {
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker) {
+ // Mock ledger.
+ final TreeMap<Long, Long> sparseLedger = new TreeMap<>();
+ sparseLedger.putAll(ORIGIN_SPARSE_LEDGER.subMap(start, end + 1));
+ sparseLedger.put(Long.MAX_VALUE, Long.MAX_VALUE);
+
+ Function<Long, Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
+
+ // Calculate the correct position.
+ for (long i = start; i <= end; i++) {
+ if (findMessageIdFunc.apply(i) >= targetMessageId) {
+ bingoMarker.set(i);
+ break;
+ }
+ }
+
+ return new CacheLoader<Long, MessageIdData>() {
+ @Override
+ public @Nullable MessageIdData load(@NonNull Long entryId) throws Exception {
+ MessageIdData messageIdData = new MessageIdData();
+ messageIdData.setLedgerId(DEFAULT_LEDGER_ID);
+ messageIdData.setEntryId(findMessageIdFunc.apply(entryId));
+ return messageIdData;
+ }
+ };
+ }
+
+ @Test(dataProvider = "argsForFindStartPointLoop")
+ public void testFindStartPointLoop(long start, long end, long targetMessageId) {
+ AtomicLong bingoMarker = new AtomicLong();
+ // Mock cache.
+ AsyncLoadingCache<Long, MessageIdData> cache = Caffeine.newBuilder()
+ .buildAsync(mockCacheLoader(start, end, targetMessageId, bingoMarker));
+ // Do test.
+ PositionImpl targetPosition = PositionImpl.get(DEFAULT_LEDGER_ID, targetMessageId);
+ CompletableFuture<Long> promise = new CompletableFuture<>();
+ CompactedTopicImpl.findStartPointLoop(targetPosition, start, end, promise, cache);
+ long result = promise.join();
+ assertEquals(result, bingoMarker.get());
+ }
+
+ /**
+ * Why should we check the recursion number of "findStartPointLoop", see: #17976
+ */
+ @Test
+ public void testRecursionNumberOfFindStartPointLoop() throws Exception {
Review Comment:
Seems that this function won't throw any `Exceptions`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r990940376
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop(){
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker){
+ // Mock ledger.
+ final TreeMap<Long,Long> sparseLedger = new TreeMap<>();
Review Comment:
Already fixed
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
Review Comment:
Already fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#issuecomment-1272832830
Hi @codelipenghui
> How can the test cover the new improvement?
already append test "testRecursionNumberOfFindStartPointLoop" to cover this case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] codelipenghui commented on a diff in pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
codelipenghui commented on code in PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#discussion_r990871388
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
Review Comment:
```suggestion
ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE, Long.MAX_VALUE);
```
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop(){
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker){
+ // Mock ledger.
+ final TreeMap<Long,Long> sparseLedger = new TreeMap<>();
Review Comment:
```suggestion
final TreeMap<Long, Long> sparseLedger = new TreeMap<>();
```
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
+
+ static {
+ ORIGIN_SPARSE_LEDGER.put(0L,0L);
+ ORIGIN_SPARSE_LEDGER.put(1L,1L);
+ ORIGIN_SPARSE_LEDGER.put(2L,1001L);
+ ORIGIN_SPARSE_LEDGER.put(3L,1002L);
+ ORIGIN_SPARSE_LEDGER.put(4L,1003L);
+ ORIGIN_SPARSE_LEDGER.put(10L,1010L);
+ ORIGIN_SPARSE_LEDGER.put(20L,1020L);
+ ORIGIN_SPARSE_LEDGER.put(50L,1050L);
+ ORIGIN_SPARSE_LEDGER.put(Long.MAX_VALUE,Long.MAX_VALUE);
+ }
+
+ @DataProvider(name = "argsForFindStartPointLoop")
+ public Object[][] argsForFindStartPointLoop(){
+ return new Object[][]{
+ {0, 100, 0},// first value.
+ {0, 100, 1},// second value.
+ {0, 100, 1003},// not first value.
+ {0, 100, 1015},// value not exists.
+ {3, 40, 50},// less than first value & find in a range.
+ {3, 40, 1002},// first value & find in a range.
+ {3, 40, 1003},// second value & find in a range.
+ {3, 40, 1010},// not first value & find in a range.
+ {3, 40, 1015}// value not exists & find in a range.
+ };
+ }
+
+ private static CacheLoader<Long, MessageIdData> mockCacheLoader(long start, long end, final long targetMessageId,
+ AtomicLong bingoMarker){
+ // Mock ledger.
+ final TreeMap<Long,Long> sparseLedger = new TreeMap<>();
+ sparseLedger.putAll(ORIGIN_SPARSE_LEDGER.subMap(start, end + 1));
+ sparseLedger.put(Long.MAX_VALUE,Long.MAX_VALUE);
+
+ Function<Long,Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
Review Comment:
```suggestion
Function<Long, Long> findMessageIdFunc = entryId -> sparseLedger.ceilingEntry(entryId).getValue();
```
##########
pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactedTopicImplTest.java:
##########
@@ -0,0 +1,113 @@
+/**
+ * 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.pulsar.compaction;
+
+import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
+import com.github.benmanes.caffeine.cache.CacheLoader;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.api.proto.MessageIdData;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-compaction")
+public class CompactedTopicImplTest {
+
+ private static final long DEFAULT_LEDGER_ID = 1;
+
+ // Sparse ledger makes multi entry has same data, this is used to construct complex environments to verify that the
+ // smallest position with the correct data is found.
+ private static final TreeMap<Long,Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
Review Comment:
```suggestion
private static final TreeMap<Long, Long> ORIGIN_SPARSE_LEDGER = new TreeMap<>();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] poorbarcode commented on pull request #17976: [improve][broker]Make CompactedTopicImpl.findStartPointLoop work more efficiently
Posted by GitBox <gi...@apache.org>.
poorbarcode commented on PR #17976:
URL: https://github.com/apache/pulsar/pull/17976#issuecomment-1274159209
/pulsarbot rerun-failure-checks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@pulsar.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org