Skip to content

Commit be802a9

Browse files
dondonzdondonz
committed
Merge branch 'master' into fix-client-locale
2 parents c7d1185 + 8aa04f6 commit be802a9

157 files changed

Lines changed: 24068 additions & 598 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ take the time to read it.
3232
### License
3333

3434
Copyright (c) 2015, Andreas Marek and [Contributors](https://github.com/graphql-java/graphql-java/graphs/contributors)
35+
36+
### Powered by
37+
[![IntelliJ IDEA logo](https://resources.jetbrains.com/storage/products/company/brand/logos/IntelliJ_IDEA.svg)](https://jb.gg/OpenSourceSupport)

‎agent-test/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
dependencies {
66
implementation(rootProject)
7-
implementation("net.bytebuddy:byte-buddy-agent:1.17.0")
7+
implementation("net.bytebuddy:byte-buddy-agent:1.17.2")
88

9-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
1010
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
1111

1212
testImplementation("org.assertj:assertj-core:3.27.3")

‎agent/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
implementation("net.bytebuddy:byte-buddy:1.17.0")
9+
implementation("net.bytebuddy:byte-buddy:1.17.2")
1010
// graphql-java itself
1111
implementation(rootProject)
1212
}

‎agent/src/main/java/graphql/agent/GraphQLJavaAgent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static void agentmain(String agentArgs, Instrumentation inst) {
7171
return builder
7272
.visit(Advice.to(DataLoaderHelperDispatchAdvice.class).on(nameMatches("dispatch")))
7373
.visit(Advice.to(DataLoaderHelperInvokeBatchLoaderAdvice.class)
74-
.on(nameMatches("invokeLoader").and(takesArguments(List.class, List.class))));
74+
.on(nameMatches("invokeLoader").and(takesArguments(List.class, List.class, List.class))));
7575
})
7676
.type(named("graphql.schema.DataFetchingEnvironmentImpl"))
7777
.transform((builder, typeDescription, classLoader, module, protectionDomain) -> {
@@ -207,6 +207,7 @@ public static class DataLoaderHelperInvokeBatchLoaderAdvice {
207207
@Advice.OnMethodEnter
208208
public static void invokeLoader(@Advice.Argument(0) List keys,
209209
@Advice.Argument(1) List keysContext,
210+
@Advice.Argument(2) List queuedFutures,
210211
@Advice.This(typing = Assigner.Typing.DYNAMIC) Object dataLoaderHelper) {
211212
DataLoader dataLoader = getDataLoaderForHelper(dataLoaderHelper);
212213
ExecutionId executionId = GraphQLJavaAgent.dataLoaderToExecutionId.get(dataLoader);

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,27 @@ jar {
9999
}
100100

101101
dependencies {
102-
compileOnly 'org.jetbrains:annotations:26.0.2'
103102
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
104-
api 'com.graphql-java:java-dataloader:3.3.0'
103+
api 'com.graphql-java:java-dataloader:3.4.0'
105104
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
105+
api "org.jspecify:jspecify:1.0.0"
106106
antlr 'org.antlr:antlr4:' + antlrVersion
107107
implementation 'com.google.guava:guava:' + guavaVersion
108108
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
109109
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
110-
testImplementation 'org.codehaus.groovy:groovy:3.0.23'
111-
testImplementation 'org.codehaus.groovy:groovy-json:3.0.23'
110+
testImplementation 'org.codehaus.groovy:groovy:3.0.24'
111+
testImplementation 'org.codehaus.groovy:groovy-json:3.0.24'
112112
testImplementation 'com.google.code.gson:gson:2.12.1'
113113
testImplementation 'org.eclipse.jetty:jetty-server:11.0.24'
114-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
114+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
115115
testImplementation 'org.awaitility:awaitility-groovy:4.2.0'
116116
testImplementation 'com.github.javafaker:javafaker:1.0.2'
117117

118118
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
119119
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
120-
testImplementation "io.projectreactor:reactor-core:3.7.2"
120+
testImplementation "io.projectreactor:reactor-core:3.7.3"
121121

122-
testImplementation 'org.testng:testng:7.10.2' // use for reactive streams test inheritance
122+
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
123123

124124
testImplementation 'org.openjdk.jmh:jmh-core:1.37'
125125
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'

‎performance-results/2025-02-14T05:39:11Z-a8e00c32c112ccef5695b0427cdda006da887a37-jdk17.json‎

Lines changed: 287 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,287 @@
1+
[
2+
{
3+
"jmhVersion" : "1.37",
4+
"benchmark" : "performance.ComplexQueryPerformance.benchMarkSimpleQueriesThroughput",
5+
"mode" : "thrpt",
6+
"threads" : 1,
7+
"forks" : 2,
8+
"jvm" : "/home/ec2-user/.sdkman/candidates/java/17.0.10-amzn/bin/java",
9+
"jvmArgs" : [
10+
],
11+
"jdkVersion" : "17.0.10",
12+
"vmName" : "OpenJDK 64-Bit Server VM",
13+
"vmVersion" : "17.0.10+7-LTS",
14+
"warmupIterations" : 2,
15+
"warmupTime" : "5 s",
16+
"warmupBatchSize" : 1,
17+
"measurementIterations" : 2,
18+
"measurementTime" : "10 s",
19+
"measurementBatchSize" : 1,
20+
"params" : {
21+
"howManyItems" : "5"
22+
},
23+
"primaryMetric" : {
24+
"score" : 3.404357283980617,
25+
"scoreError" : 0.03521914452873535,
26+
"scoreConfidence" : [
27+
3.3691381394518816,
28+
3.439576428509352
29+
],
30+
"scorePercentiles" : {
31+
"0.0" : 3.3966817360964723,
32+
"50.0" : 3.40558944367229,
33+
"90.0" : 3.4095685124814152,
34+
"95.0" : 3.4095685124814152,
35+
"99.0" : 3.4095685124814152,
36+
"99.9" : 3.4095685124814152,
37+
"99.99" : 3.4095685124814152,
38+
"99.999" : 3.4095685124814152,
39+
"99.9999" : 3.4095685124814152,
40+
"100.0" : 3.4095685124814152
41+
},
42+
"scoreUnit" : "ops/s",
43+
"rawData" : [
44+
[
45+
3.3966817360964723,
46+
3.4055314796534444
47+
],
48+
[
49+
3.4056474076911356,
50+
3.4095685124814152
51+
]
52+
]
53+
},
54+
"secondaryMetrics" : {
55+
}
56+
},
57+
{
58+
"jmhVersion" : "1.37",
59+
"benchmark" : "performance.ComplexQueryPerformance.benchMarkSimpleQueriesThroughput",
60+
"mode" : "thrpt",
61+
"threads" : 1,
62+
"forks" : 2,
63+
"jvm" : "/home/ec2-user/.sdkman/candidates/java/17.0.10-amzn/bin/java",
64+
"jvmArgs" : [
65+
],
66+
"jdkVersion" : "17.0.10",
67+
"vmName" : "OpenJDK 64-Bit Server VM",
68+
"vmVersion" : "17.0.10+7-LTS",
69+
"warmupIterations" : 2,
70+
"warmupTime" : "5 s",
71+
"warmupBatchSize" : 1,
72+
"measurementIterations" : 2,
73+
"measurementTime" : "10 s",
74+
"measurementBatchSize" : 1,
75+
"params" : {
76+
"howManyItems" : "10"
77+
},
78+
"primaryMetric" : {
79+
"score" : 1.7178122106916855,
80+
"scoreError" : 0.01023832001786633,
81+
"scoreConfidence" : [
82+
1.7075738906738192,
83+
1.728050530709552
84+
],
85+
"scorePercentiles" : {
86+
"0.0" : 1.7160908939955062,
87+
"50.0" : 1.7177309775482787,
88+
"90.0" : 1.7196959936746783,
89+
"95.0" : 1.7196959936746783,
90+
"99.0" : 1.7196959936746783,
91+
"99.9" : 1.7196959936746783,
92+
"99.99" : 1.7196959936746783,
93+
"99.999" : 1.7196959936746783,
94+
"99.9999" : 1.7196959936746783,
95+
"100.0" : 1.7196959936746783
96+
},
97+
"scoreUnit" : "ops/s",
98+
"rawData" : [
99+
[
100+
1.7170217100517866,
101+
1.7196959936746783
102+
],
103+
[
104+
1.7160908939955062,
105+
1.718440245044771
106+
]
107+
]
108+
},
109+
"secondaryMetrics" : {
110+
}
111+
},
112+
{
113+
"jmhVersion" : "1.37",
114+
"benchmark" : "performance.ComplexQueryPerformance.benchMarkSimpleQueriesThroughput",
115+
"mode" : "thrpt",
116+
"threads" : 1,
117+
"forks" : 2,
118+
"jvm" : "/home/ec2-user/.sdkman/candidates/java/17.0.10-amzn/bin/java",
119+
"jvmArgs" : [
120+
],
121+
"jdkVersion" : "17.0.10",
122+
"vmName" : "OpenJDK 64-Bit Server VM",
123+
"vmVersion" : "17.0.10+7-LTS",
124+
"warmupIterations" : 2,
125+
"warmupTime" : "5 s",
126+
"warmupBatchSize" : 1,
127+
"measurementIterations" : 2,
128+
"measurementTime" : "10 s",
129+
"measurementBatchSize" : 1,
130+
"params" : {
131+
"howManyItems" : "20"
132+
},
133+
"primaryMetric" : {
134+
"score" : 0.864719378037384,
135+
"scoreError" : 0.008385695422045172,
136+
"scoreConfidence" : [
137+
0.8563336826153388,
138+
0.8731050734594291
139+
],
140+
"scorePercentiles" : {
141+
"0.0" : 0.8635028724987689,
142+
"50.0" : 0.8645279250288825,
143+
"90.0" : 0.8663187895930019,
144+
"95.0" : 0.8663187895930019,
145+
"99.0" : 0.8663187895930019,
146+
"99.9" : 0.8663187895930019,
147+
"99.99" : 0.8663187895930019,
148+
"99.999" : 0.8663187895930019,
149+
"99.9999" : 0.8663187895930019,
150+
"100.0" : 0.8663187895930019
151+
},
152+
"scoreUnit" : "ops/s",
153+
"rawData" : [
154+
[
155+
0.8638420932589354,
156+
0.8663187895930019
157+
],
158+
[
159+
0.8635028724987689,
160+
0.8652137567988297
161+
]
162+
]
163+
},
164+
"secondaryMetrics" : {
165+
}
166+
},
167+
{
168+
"jmhVersion" : "1.37",
169+
"benchmark" : "performance.OverlappingFieldValidationPerformance.overlappingFieldValidationThroughput",
170+
"mode" : "thrpt",
171+
"threads" : 1,
172+
"forks" : 3,
173+
"jvm" : "/home/ec2-user/.sdkman/candidates/java/17.0.10-amzn/bin/java",
174+
"jvmArgs" : [
175+
],
176+
"jdkVersion" : "17.0.10",
177+
"vmName" : "OpenJDK 64-Bit Server VM",
178+
"vmVersion" : "17.0.10+7-LTS",
179+
"warmupIterations" : 2,
180+
"warmupTime" : "5 s",
181+
"warmupBatchSize" : 1,
182+
"measurementIterations" : 3,
183+
"measurementTime" : "10 s",
184+
"measurementBatchSize" : 1,
185+
"primaryMetric" : {
186+
"score" : 38.68765878419774,
187+
"scoreError" : 1.3595024579632389,
188+
"scoreConfidence" : [
189+
37.3281563262345,
190+
40.047161242160975
191+
],
192+
"scorePercentiles" : {
193+
"0.0" : 37.6176212727424,
194+
"50.0" : 38.91625003504807,
195+
"90.0" : 39.96719044176991,
196+
"95.0" : 39.96719044176991,
197+
"99.0" : 39.96719044176991,
198+
"99.9" : 39.96719044176991,
199+
"99.99" : 39.96719044176991,
200+
"99.999" : 39.96719044176991,
201+
"99.9999" : 39.96719044176991,
202+
"100.0" : 39.96719044176991
203+
},
204+
"scoreUnit" : "ops/s",
205+
"rawData" : [
206+
[
207+
38.07023523961371,
208+
37.6176212727424,
209+
37.7109409706809
210+
],
211+
[
212+
38.23620460941478,
213+
39.22998086295451,
214+
38.91625003504807
215+
],
216+
[
217+
39.96719044176991,
218+
39.195550172304046,
219+
39.244955453251286
220+
]
221+
]
222+
},
223+
"secondaryMetrics" : {
224+
}
225+
},
226+
{
227+
"jmhVersion" : "1.37",
228+
"benchmark" : "performance.OverlappingFieldValidationPerformance.overlappingFieldValidationAbgTime",
229+
"mode" : "avgt",
230+
"threads" : 1,
231+
"forks" : 3,
232+
"jvm" : "/home/ec2-user/.sdkman/candidates/java/17.0.10-amzn/bin/java",
233+
"jvmArgs" : [
234+
],
235+
"jdkVersion" : "17.0.10",
236+
"vmName" : "OpenJDK 64-Bit Server VM",
237+
"vmVersion" : "17.0.10+7-LTS",
238+
"warmupIterations" : 2,
239+
"warmupTime" : "5 s",
240+
"warmupBatchSize" : 1,
241+
"measurementIterations" : 3,
242+
"measurementTime" : "10 s",
243+
"measurementBatchSize" : 1,
244+
"primaryMetric" : {
245+
"score" : 0.02482110118000495,
246+
"scoreError" : 0.0012491594771989168,
247+
"scoreConfidence" : [
248+
0.023571941702806035,
249+
0.026070260657203866
250+
],
251+
"scorePercentiles" : {
252+
"0.0" : 0.02395586482057416,
253+
"50.0" : 0.0250229317475,
254+
"90.0" : 0.025947926660621762,
255+
"95.0" : 0.025947926660621762,
256+
"99.0" : 0.025947926660621762,
257+
"99.9" : 0.025947926660621762,
258+
"99.99" : 0.025947926660621762,
259+
"99.999" : 0.025947926660621762,
260+
"99.9999" : 0.025947926660621762,
261+
"100.0" : 0.025947926660621762
262+
},
263+
"scoreUnit" : "s/op",
264+
"rawData" : [
265+
[
266+
0.02557740179539642,
267+
0.02512524028822055,
268+
0.025947926660621762
269+
],
270+
[
271+
0.0250229317475,
272+
0.025267129606060607,
273+
0.024533764960784313
274+
],
275+
[
276+
0.02395586482057416,
277+
0.023976613050239234,
278+
0.023983037690647482
279+
]
280+
]
281+
},
282+
"secondaryMetrics" : {
283+
}
284+
}
285+
]
286+
287+

0 commit comments

Comments
 (0)