Skip to content

Commit

Permalink
Fixing merge conflict on jmh tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Jacobs committed May 31, 2015
1 parent da0aada commit 7facd20
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 238 deletions.
102 changes: 0 additions & 102 deletions hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingMaxPerfTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.concurrent.TimeUnit;

public class RollingMaxPerfTest {
<<<<<<< HEAD
@State(Scope.Thread)
public static class CounterState {
HystrixRollingNumber counter;
Expand Down Expand Up @@ -118,105 +117,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
}
=======
@State(Scope.Thread)
public static class CounterState {
HystrixRollingNumber counter;

@Setup(Level.Iteration)
public void setUp() {
counter = new HystrixRollingNumber(
HystrixProperty.Factory.asProperty(100),
HystrixProperty.Factory.asProperty(10));
}
}

@State(Scope.Thread)
public static class ValueState {
final Random r = new Random();

int value;

@Setup(Level.Invocation)
public void setUp() {
value = r.nextInt(100);
}
}

@Benchmark
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
return counterState.counter;
}

@Benchmark
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long readOnly(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
}

@Benchmark
@Group("writeHeavy")
@GroupThreads(7)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber writeHeavyUpdateMax(CounterState counterState, ValueState valueState) {
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("writeHeavy")
@GroupThreads(1)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long writeHeavyReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
}

@Benchmark
@Group("evenSplit")
@GroupThreads(4)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber evenSplitUpdateMax(CounterState counterState, ValueState valueState) {
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("evenSplit")
@GroupThreads(4)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long evenSplitReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
}

@Benchmark
@Group("readHeavy")
@GroupThreads(1)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber readHeavyUpdateMax(CounterState counterState, ValueState valueState) {
counterState.counter.updateRollingMax(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("readHeavy")
@GroupThreads(7)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long readHeavyReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getRollingMaxValue(HystrixRollingNumberEvent.COMMAND_MAX_ACTIVE);
}
>>>>>>> rollback-hdr-histogram
}
136 changes: 0 additions & 136 deletions hystrix-core/src/jmh/java/com/netflix/hystrix/perf/RollingNumberPerfTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.concurrent.TimeUnit;

public class RollingNumberPerfTest {
<<<<<<< HEAD
@State(Scope.Thread)
public static class CounterState {
HystrixRollingNumber counter;
Expand Down Expand Up @@ -152,139 +151,4 @@ public long readHeavyReadMetrics(CounterState counterState) {
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
}
=======
@State(Scope.Thread)
public static class CounterState {
HystrixRollingNumber counter;

@Setup(Level.Iteration)
public void setUp() {
counter = new HystrixRollingNumber(
HystrixProperty.Factory.asProperty(100),
HystrixProperty.Factory.asProperty(10));
}
}

@State(Scope.Thread)
public static class ValueState {
final Random r = new Random();

int value;
HystrixRollingNumberEvent type;

@Setup(Level.Invocation)
public void setUp() {
value = r.nextInt(100);
int typeInt = r.nextInt(3);
switch(typeInt) {
case 0:
type = HystrixRollingNumberEvent.SUCCESS;
break;
case 1:
type = HystrixRollingNumberEvent.FAILURE;
break;
case 2:
type = HystrixRollingNumberEvent.TIMEOUT;
break;
default: throw new RuntimeException("Unexpected : " + typeInt);
}
}
}

@Benchmark
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber writeOnly(CounterState counterState, ValueState valueState) {
counterState.counter.add(valueState.type, valueState.value);
return counterState.counter;
}

@Benchmark
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long readOnly(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
}

@Benchmark
@Group("writeHeavy")
@GroupThreads(7)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber writeHeavyCounterAdd(CounterState counterState, ValueState valueState) {
counterState.counter.add(valueState.type, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("writeHeavy")
@GroupThreads(1)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long writeHeavyReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
}

@Benchmark
@Group("evenSplit")
@GroupThreads(4)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber evenSplitCounterAdd(CounterState counterState, ValueState valueState) {
counterState.counter.add(valueState.type, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("evenSplit")
@GroupThreads(4)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long evenSplitReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
}

@Benchmark
@Group("readHeavy")
@GroupThreads(1)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public HystrixRollingNumber readHeavyCounterAdd(CounterState counterState, ValueState valueState) {
counterState.counter.add(valueState.type, valueState.value);
return counterState.counter;
}

@Benchmark
@Group("readHeavy")
@GroupThreads(7)
@BenchmarkMode({Mode.Throughput})
@OutputTimeUnit(TimeUnit.MILLISECONDS)
public long readHeavyReadMetrics(CounterState counterState) {
HystrixRollingNumber counter = counterState.counter;
return counter.getCumulativeSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getCumulativeSum(HystrixRollingNumberEvent.FAILURE) +
counter.getCumulativeSum(HystrixRollingNumberEvent.TIMEOUT) +
counter.getRollingSum(HystrixRollingNumberEvent.SUCCESS) +
counter.getRollingSum(HystrixRollingNumberEvent.FAILURE) +
counter.getRollingSum(HystrixRollingNumberEvent.TIMEOUT);
}
>>>>>>> rollback-hdr-histogram
}

0 comments on commit 7facd20

Please sign in to comment.