-
Notifications
You must be signed in to change notification settings - Fork 959
ARTEMIS-6144 Improve getPagedResult #6563
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
GChuf
wants to merge
2
commits into
apache:main
Choose a base branch
from
GChuf:ARTEMIS-6144
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+303
−41
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
239 changes: 239 additions & 0 deletions
239
...src/main/java/org/apache/activemq/artemis/tests/performance/jmh/AbstractViewPerfTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| /* | ||
| * 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.activemq.artemis.tests.performance.jmh; | ||
|
|
||
| import org.apache.activemq.artemis.api.core.management.AddressControl; | ||
| import org.apache.activemq.artemis.core.management.impl.view.AddressField; | ||
| import org.apache.activemq.artemis.core.management.impl.view.AddressView; | ||
| import org.openjdk.jmh.annotations.State; | ||
| import org.openjdk.jmh.annotations.Fork; | ||
| import org.openjdk.jmh.annotations.Warmup; | ||
| import org.openjdk.jmh.annotations.Measurement; | ||
| import org.openjdk.jmh.annotations.BenchmarkMode; | ||
| import org.openjdk.jmh.annotations.OutputTimeUnit; | ||
| import org.openjdk.jmh.annotations.Scope; | ||
| import org.openjdk.jmh.annotations.Param; | ||
| import org.openjdk.jmh.annotations.Benchmark; | ||
| import org.openjdk.jmh.annotations.Level; | ||
| import org.openjdk.jmh.annotations.Setup; | ||
| import org.openjdk.jmh.annotations.Mode; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| @State(Scope.Benchmark) | ||
| @Fork(value = 1) | ||
| @Warmup(iterations = 2, time = 1) | ||
| @Measurement(iterations = 5, time = 1) | ||
| @BenchmarkMode(Mode.Throughput) | ||
| @OutputTimeUnit(TimeUnit.SECONDS) | ||
| public class AbstractViewPerfTest { | ||
|
|
||
| @Param({"1000", "10000"}) | ||
| private int addressCount; | ||
|
|
||
| @Param({"50"}) | ||
| private int pageSize; | ||
|
|
||
| private AddressView view; | ||
| private int middlePage; | ||
|
|
||
| @Setup(Level.Trial) | ||
| public void init() { | ||
| view = new AddressView(null); | ||
|
|
||
| // 1. Configure the view options using the internal JSON parsing mechanism | ||
| // This switches the target field to MESSAGE_COUNT and sets the sorting loop active | ||
| String optionsJson = "{" | ||
| + "\"field\":\"\"," | ||
| + "\"operation\":\"\"," | ||
| + "\"value\":\"\"," | ||
| + "\"sortField\":\"" + AddressField.MESSAGE_COUNT.getName() + "\"," | ||
| + "\"sortOrder\":\"desc\"" | ||
| + "}"; | ||
| view.setOptions(optionsJson); | ||
|
|
||
| // 2. Generate data rows | ||
| List<AddressControl> addresses = new ArrayList<>(addressCount); | ||
| for (int i = 0; i < addressCount; i++) { | ||
| addresses.add(stubAddress(i)); | ||
| } | ||
|
|
||
| // 3. Shuffle dataset to break TimSort's best-case O(N) shortcut paths | ||
| Collections.shuffle(addresses); | ||
|
|
||
| view.setCollection(addresses); | ||
| middlePage = (addressCount / 2) / pageSize + 1; | ||
| } | ||
|
|
||
| @Benchmark | ||
| public List<AddressControl> testFirstPage() { | ||
| return view.getPagedResult(1, pageSize); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public List<AddressControl> testMiddlePage() { | ||
| return view.getPagedResult(middlePage, pageSize); | ||
| } | ||
|
|
||
| @Benchmark | ||
| public List<AddressControl> testAllResults() { | ||
| return view.getPagedResult(-1, -1); | ||
| } | ||
|
|
||
| private static AddressControl stubAddress(long id) { | ||
| final long simulatedMessageCount = (id * 31) % 10000; | ||
| final String addressName = "address-" + id; | ||
|
|
||
| return new AddressControl() { | ||
| @Override public long getId() { | ||
| return id; | ||
| } | ||
| @Override public String getAddress() { | ||
| return addressName; | ||
| } | ||
|
|
||
| @Override | ||
| public long getMessageCount() { | ||
| // Mimic production cost: CPU loop simulating reading multiple live | ||
| // internal queue components and consolidating dynamic tracking fields. | ||
| long infrastructureTraversalCost = 0; | ||
| for (int i = 0; i < 4; i++) { | ||
| infrastructureTraversalCost += Thread.currentThread().hashCode() + simulatedMessageCount; | ||
| } | ||
| return simulatedMessageCount + (infrastructureTraversalCost & 0); | ||
| } | ||
|
|
||
| @Override public String[] getRoutingTypes() { | ||
| return new String[0]; | ||
| } | ||
| @Override public String getRoutingTypesAsJSON() { | ||
| return "[]"; | ||
| } | ||
| @Override public Object[] getRoles() { | ||
| return new Object[0]; | ||
| } | ||
| @Override public String getRolesAsJSON() { | ||
| return "[]"; | ||
| } | ||
| @Override public long getAddressSize() { | ||
| return 0L; | ||
| } | ||
| @Override public int getMaxPageReadBytes() { | ||
| return 0; | ||
| } | ||
| @Override public int getMaxPageReadMessages() { | ||
| return 0; | ||
| } | ||
| @Override public int getPrefetchPageBytes() { | ||
| return 0; | ||
| } | ||
| @Override public int getPrefetchPageMessages() { | ||
| return 0; | ||
| } | ||
| @Override public void schedulePageCleanup() { | ||
| } | ||
| @Override public long getNumberOfMessages() { | ||
| return 0L; | ||
| } | ||
| @Override public String[] getRemoteQueueNames() { | ||
| return new String[0]; | ||
| } | ||
| @Override public String[] getQueueNames() { | ||
| return new String[0]; | ||
| } | ||
| @Override public String[] getAllQueueNames() { | ||
| return new String[0]; | ||
| } | ||
| @Override public long getNumberOfPages() { | ||
| return 0L; | ||
| } | ||
| @Override public boolean isPaging() { | ||
| return false; | ||
| } | ||
| @Override public int getAddressLimitPercent() { | ||
| return 0; | ||
| } | ||
| @Override public boolean block() { | ||
| return false; | ||
| } | ||
| @Override public void unblock() { | ||
| } | ||
| @Override public boolean isBlockedViaManagement() { | ||
| return false; | ||
| } | ||
| @Override public long getNumberOfBytesPerPage() { | ||
| return 0L; | ||
| } | ||
| @Override public String[] getBindingNames() { | ||
| return new String[0]; | ||
| } | ||
| @Override public long getQueueCount() { | ||
| return 0L; | ||
| } | ||
| @Override public long getRoutedMessageCount() { | ||
| return 0L; | ||
| } | ||
| @Override public long getUnRoutedMessageCount() { | ||
| return 0L; | ||
| } | ||
| @Override public void pause() { | ||
| } | ||
| @Override public void pause(boolean persist) { | ||
| } | ||
| @Override public void resume() { | ||
| } | ||
| @Override public boolean isPaused() { | ||
| return false; | ||
| } | ||
| @Override public boolean isRetroactiveResource() { | ||
| return false; | ||
| } | ||
| @Override public long getCurrentDuplicateIdCacheSize() { | ||
| return 0L; | ||
| } | ||
| @Override public boolean clearDuplicateIdCache() { | ||
| return false; | ||
| } | ||
| @Override public boolean isAutoCreated() { | ||
| return false; | ||
| } | ||
| @Override public boolean isInternal() { | ||
| return false; | ||
| } | ||
| @Override public boolean isTemporary() { | ||
| return false; | ||
| } | ||
| @Override public long purge() { | ||
| return 0L; | ||
| } | ||
| @Override public void replay(String target, String filter) { | ||
| } | ||
| @Override public void replay(String startScan, String endScan, String target, String filter) { | ||
| } | ||
| @Override public String sendMessage(Map<String, String> headers, int type, String body, boolean durable, String user, String password) { | ||
| return null; | ||
| } | ||
| @Override public String sendMessage(Map<String, String> headers, int type, String body, boolean durable, String user, String password, boolean createMessageId) { | ||
| return null; | ||
| } | ||
| }; | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A payload with
SORT_COLUMNbut noSORT_ORDERnow throws where the old code didn't.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed by adding a check if
jsoncontainsSORT_ORDER.