Skip to content

Commit 7facd20

Browse files
author
Matt Jacobs
committed
Fixing merge conflict on jmh tests
1 parent da0aada commit 7facd20

File tree

2 files changed

+0
-238
lines changed

2 files changed

+0
-238
lines changed

‎hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.concurrent.TimeUnit;
1919

2020
public class RollingMaxPerfTest {
21-
<<<<<<< HEAD
2221
@State(Scope.Thread)
2322
public static class CounterState {
2423
HystrixRollingNumber counter;
@@ -118,105 +117,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
118117
HystrixRollingNumber counter = counterState.counter;
119118
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
120119
}
121-
=======
122-
@State(Scope.Thread)
123-
public static class CounterState {
124-
HystrixRollingNumber counter;
125-
126-
@Setup(Level.Iteration)
127-
public void setUp() {
128-
counter = new HystrixRollingNumber(
129-
HystrixProperty.Factory.asProperty(100),
130-
HystrixProperty.Factory.asProperty(10));
131-
}
132-
}
133-
134-
@State(Scope.Thread)
135-
public static class ValueState {
136-
final Random r = new Random();
137-
138-
int value;
139-
140-
@Setup(Level.Invocation)
141-
public void setUp() {
142-
value = r.nextInt(100);
143-
}
144-
}
145-
146-
@Benchmark
147-
@BenchmarkMode({Mode.Throughput})
148-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
149-
public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
150-
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
151-
return counterState.counter;
152-
}
153-
154-
@Benchmark
155-
@BenchmarkMode({Mode.Throughput})
156-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
157-
public long readOnly(CounterState counterState) {
158-
HystrixRollingNumber counter = counterState.counter;
159-
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
160-
}
161-
162-
@Benchmark
163-
@Group("writeHeavy")
164-
@GroupThreads(7)
165-
@BenchmarkMode({Mode.Throughput})
166-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
167-
public HystrixRollingNumber writeHeavyUpdateMax(CounterState counterState, ValueState valueState) {
168-
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
169-
return counterState.counter;
170-
}
171-
172-
@Benchmark
173-
@Group("writeHeavy")
174-
@GroupThreads(1)
175-
@BenchmarkMode({Mode.Throughput})
176-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
177-
public long writeHeavyReadMetrics(CounterState counterState) {
178-
HystrixRollingNumber counter = counterState.counter;
179-
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
180-
}
181-
182-
@Benchmark
183-
@Group("evenSplit")
184-
@GroupThreads(4)
185-
@BenchmarkMode({Mode.Throughput})
186-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
187-
public HystrixRollingNumber evenSplitUpdateMax(CounterState counterState, ValueState valueState) {
188-
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
189-
return counterState.counter;
190-
}
191-
192-
@Benchmark
193-
@Group("evenSplit")
194-
@GroupThreads(4)
195-
@BenchmarkMode({Mode.Throughput})
196-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
197-
public long evenSplitReadMetrics(CounterState counterState) {
198-
HystrixRollingNumber counter = counterState.counter;
199-
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
200-
}
201-
202-
@Benchmark
203-
@Group("readHeavy")
204-
@GroupThreads(1)
205-
@BenchmarkMode({Mode.Throughput})
206-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
207-
public HystrixRollingNumber readHeavyUpdateMax(CounterState counterState, ValueState valueState) {
208-
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
209-
return counterState.counter;
210-
}
211-
212-
@Benchmark
213-
@Group("readHeavy")
214-
@GroupThreads(7)
215-
@BenchmarkMode({Mode.Throughput})
216-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
217-
public long readHeavyReadMetrics(CounterState counterState) {
218-
HystrixRollingNumber counter = counterState.counter;
219-
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
220-
}
221-
>>>>>>> rollback-hdr-histogram
222120
}

‎hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java‎

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.concurrent.TimeUnit;
1919

2020
public class RollingNumberPerfTest {
21-
<<<<<<< HEAD
2221
@State(Scope.Thread)
2322
public static class CounterState {
2423
HystrixRollingNumber counter;
@@ -152,139 +151,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
152151
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
153152
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
154153
}
155-
=======
156-
@State(Scope.Thread)
157-
public static class CounterState {
158-
HystrixRollingNumber counter;
159-
160-
@Setup(Level.Iteration)
161-
public void setUp() {
162-
counter = new HystrixRollingNumber(
163-
HystrixProperty.Factory.asProperty(100),
164-
HystrixProperty.Factory.asProperty(10));
165-
}
166-
}
167-
168-
@State(Scope.Thread)
169-
public static class ValueState {
170-
final Random r = new Random();
171-
172-
int value;
173-
HystrixRollingNumberEvent type;
174-
175-
@Setup(Level.Invocation)
176-
public void setUp() {
177-
value = r.nextInt(100);
178-
int typeInt = r.nextInt(3);
179-
switch(typeInt) {
180-
case 0:
181-
type = HystrixRollingNumberEvent.SUCCESS;
182-
break;
183-
case 1:
184-
type = HystrixRollingNumberEvent.FAILURE;
185-
break;
186-
case 2:
187-
type = HystrixRollingNumberEvent.TIMEOUT;
188-
break;
189-
default: throw new RuntimeException("Unexpected : " + typeInt);
190-
}
191-
}
192-
}
193-
194-
@Benchmark
195-
@BenchmarkMode({Mode.Throughput})
196-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
197-
public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
198-
counterState.counter.add(valueState.type, valueState.value);
199-
return counterState.counter;
200-
}
201-
202-
@Benchmark
203-
@BenchmarkMode({Mode.Throughput})
204-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
205-
public long readOnly(CounterState counterState) {
206-
HystrixRollingNumber counter = counterState.counter;
207-
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
208-
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
209-
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
210-
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
211-
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
212-
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
213-
}
214-
215-
@Benchmark
216-
@Group("writeHeavy")
217-
@GroupThreads(7)
218-
@BenchmarkMode({Mode.Throughput})
219-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
220-
public HystrixRollingNumber writeHeavyCounterAdd(CounterState counterState, ValueState valueState) {
221-
counterState.counter.add(valueState.type, valueState.value);
222-
return counterState.counter;
223-
}
224-
225-
@Benchmark
226-
@Group("writeHeavy")
227-
@GroupThreads(1)
228-
@BenchmarkMode({Mode.Throughput})
229-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
230-
public long writeHeavyReadMetrics(CounterState counterState) {
231-
HystrixRollingNumber counter = counterState.counter;
232-
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
233-
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
234-
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
235-
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
236-
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
237-
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
238-
}
239-
240-
@Benchmark
241-
@Group("evenSplit")
242-
@GroupThreads(4)
243-
@BenchmarkMode({Mode.Throughput})
244-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
245-
public HystrixRollingNumber evenSplitCounterAdd(CounterState counterState, ValueState valueState) {
246-
counterState.counter.add(valueState.type, valueState.value);
247-
return counterState.counter;
248-
}
249-
250-
@Benchmark
251-
@Group("evenSplit")
252-
@GroupThreads(4)
253-
@BenchmarkMode({Mode.Throughput})
254-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
255-
public long evenSplitReadMetrics(CounterState counterState) {
256-
HystrixRollingNumber counter = counterState.counter;
257-
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
258-
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
259-
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
260-
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
261-
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
262-
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
263-
}
264-
265-
@Benchmark
266-
@Group("readHeavy")
267-
@GroupThreads(1)
268-
@BenchmarkMode({Mode.Throughput})
269-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
270-
public HystrixRollingNumber readHeavyCounterAdd(CounterState counterState, ValueState valueState) {
271-
counterState.counter.add(valueState.type, valueState.value);
272-
return counterState.counter;
273-
}
274-
275-
@Benchmark
276-
@Group("readHeavy")
277-
@GroupThreads(7)
278-
@BenchmarkMode({Mode.Throughput})
279-
@OutputTimeUnit(TimeUnit.MILLISECONDS)
280-
public long readHeavyReadMetrics(CounterState counterState) {
281-
HystrixRollingNumber counter = counterState.counter;
282-
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
283-
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
284-
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
285-
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
286-
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
287-
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
288-
}
289-
>>>>>>> rollback-hdr-histogram
290154
}

0 commit comments

Comments
 (0)