This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 4b0a4f2668 chore: move AsyncQueryUtils package. (#12537)
4b0a4f2668 is described below
commit 4b0a4f2668372cb2ded4219180c70bc1cef2c893
Author: Wan Kai <[email protected]>
AuthorDate: Fri Aug 16 13:25:04 2024 +0800
chore: move AsyncQueryUtils package. (#12537)
---
.../oap/query/graphql/{resolver => }/AsyncQueryUtils.java | 8 ++++++--
.../apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/BrowserLogQuery.java | 2 +-
.../oap/query/graphql/resolver/ContinuousProfilingQuery.java | 2 +-
.../oap/query/graphql/resolver/EBPFProcessProfilingQuery.java | 2 +-
.../apache/skywalking/oap/query/graphql/resolver/EventQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/HierarchyQuery.java | 2 +-
.../apache/skywalking/oap/query/graphql/resolver/LogQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/MetadataQueryV2.java | 2 +-
.../oap/query/graphql/resolver/MetricsExpressionQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/MetricsQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/ProfileQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/RecordsQuery.java | 2 +-
.../skywalking/oap/query/graphql/resolver/TopologyQuery.java | 2 +-
.../apache/skywalking/oap/query/graphql/resolver/TraceQuery.java | 2 +-
15 files changed, 20 insertions(+), 16 deletions(-)
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncQueryUtils.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/AsyncQueryUtils.java
similarity index 84%
rename from
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncQueryUtils.java
rename to
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/AsyncQueryUtils.java
index 5a1646b7b9..1d1019b59c 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AsyncQueryUtils.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/AsyncQueryUtils.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.query.graphql.resolver;
+package org.apache.skywalking.oap.query.graphql;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
@@ -25,11 +25,15 @@ import java.util.concurrent.ForkJoinPool;
import static
java.util.concurrent.ForkJoinPool.defaultForkJoinWorkerThreadFactory;
+/**
+ * The utility class for async GraphQL query.
+ * All the async GraphQL query should be wrapped by this class and shared the
same executor.
+ */
public class AsyncQueryUtils {
private static final Executor EXECUTOR = new ForkJoinPool(
Runtime.getRuntime().availableProcessors(),
defaultForkJoinWorkerThreadFactory, null, true);
- protected static <U> CompletableFuture<U> queryAsync(Callable<U> caller) {
+ public static <U> CompletableFuture<U> queryAsync(Callable<U> caller) {
return CompletableFuture.supplyAsync(() -> {
try {
return caller.call();
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
index 7a4bde0259..9108069084 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
@@ -49,7 +49,7 @@ import
org.apache.skywalking.oap.server.library.util.CollectionUtils;
import static com.google.common.base.Strings.isNullOrEmpty;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
import static
org.apache.skywalking.oap.server.library.util.CollectionUtils.isNotEmpty;
public class AlarmQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
index 5f3cfdd621..03d71418b5 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java
@@ -27,7 +27,7 @@ import
org.apache.skywalking.oap.server.core.query.input.BrowserErrorLogQueryCon
import org.apache.skywalking.oap.server.core.query.type.BrowserErrorLogs;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
@RequiredArgsConstructor
public class BrowserLogQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ContinuousProfilingQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ContinuousProfilingQuery.java
index 26b7a3c261..261511ea8e 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ContinuousProfilingQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ContinuousProfilingQuery.java
@@ -29,7 +29,7 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import java.util.List;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
public class ContinuousProfilingQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EBPFProcessProfilingQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EBPFProcessProfilingQuery.java
index 87c5f6857d..d53033f39b 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EBPFProcessProfilingQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EBPFProcessProfilingQuery.java
@@ -36,7 +36,7 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import java.util.List;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
public class EBPFProcessProfilingQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java
index 0ddc0eb2b3..3c18f36198 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java
@@ -26,7 +26,7 @@ import
org.apache.skywalking.oap.server.core.query.type.event.EventQueryConditio
import org.apache.skywalking.oap.server.core.query.type.event.Events;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
public class EventQuery implements GraphQLQueryResolver {
private EventQueryService queryService;
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HierarchyQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HierarchyQuery.java
index e72f0c5afe..a665a60c24 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HierarchyQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HierarchyQuery.java
@@ -28,7 +28,7 @@ import
org.apache.skywalking.oap.server.core.query.type.LayerLevel;
import org.apache.skywalking.oap.server.core.query.type.ServiceHierarchy;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
public class HierarchyQuery implements GraphQLQueryResolver {
private final ModuleManager moduleManager;
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
index 4b245d003f..3b077aff39 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java
@@ -38,7 +38,7 @@ import
org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.apache.skywalking.oap.server.library.util.StringUtil;
import static java.util.Objects.isNull;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
import static
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTraceContext.TRACE_CONTEXT;
public class LogQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java
index cc2815df07..32f70f7829 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java
@@ -36,7 +36,7 @@ import
org.apache.skywalking.oap.server.core.query.type.Service;
import org.apache.skywalking.oap.server.core.query.type.ServiceInstance;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
/**
* Metadata v2 query protocol implementation.
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsExpressionQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsExpressionQuery.java
index c88ef25a51..bef4329ba6 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsExpressionQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsExpressionQuery.java
@@ -38,7 +38,7 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import org.apache.skywalking.mqe.rt.grammar.MQELexer;
import org.apache.skywalking.mqe.rt.grammar.MQEParser;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
import static
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTraceContext.TRACE_CONTEXT;
public class MetricsExpressionQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java
index 0484d9bfaa..b74026be0d 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java
@@ -50,7 +50,7 @@ import
org.apache.skywalking.oap.server.core.query.type.Record;
import org.apache.skywalking.oap.server.core.query.type.SelectedRecord;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
/**
* Metrics v2 query protocol implementation.
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java
index 66583f05db..c681f70170 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java
@@ -31,7 +31,7 @@ import
org.apache.skywalking.oap.server.library.module.ModuleManager;
import java.util.List;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
/**
* profile query GraphQL resolver
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/RecordsQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/RecordsQuery.java
index edf7788972..48c24abca5 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/RecordsQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/RecordsQuery.java
@@ -29,7 +29,7 @@ import
org.apache.skywalking.oap.server.core.query.type.Record;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import java.util.List;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
public class RecordsQuery implements GraphQLQueryResolver {
private ModuleManager moduleManager;
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
index 8950097687..5df8d7b630 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java
@@ -33,7 +33,7 @@ import
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingSpan;
import
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTraceContext;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
import static
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTraceContext.TRACE_CONTEXT;
public class TopologyQuery implements GraphQLQueryResolver {
diff --git
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java
index 7aaa1d7798..b4ba9fc43e 100644
---
a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java
+++
b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java
@@ -41,7 +41,7 @@ import
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTrace
import org.apache.skywalking.oap.server.library.module.ModuleManager;
import static java.util.Objects.isNull;
-import static
org.apache.skywalking.oap.query.graphql.resolver.AsyncQueryUtils.queryAsync;
+import static
org.apache.skywalking.oap.query.graphql.AsyncQueryUtils.queryAsync;
import static
org.apache.skywalking.oap.server.core.query.type.debugging.DebuggingTraceContext.TRACE_CONTEXT;
public class TraceQuery implements GraphQLQueryResolver {
