Skip to content

Commit

Permalink
Merge pull request #182 from dongjoon-hyun/reef_0.15
Browse files Browse the repository at this point in the history
Update Apache REEF and Checkstyle.
  • Loading branch information
yunseong committed May 31, 2016
2 parents 72b6ea5 + eb32ba4 commit 55ee12a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
Expand Up @@ -139,8 +139,8 @@ private class BatchGenerator {
private final List<Matrix> matrixList;
private final List<Integer> labelList;

public BatchGenerator(final List<Pair<Pair<Matrix, int[]>, Boolean>> dataList,
final boolean isValidation) {
BatchGenerator(final List<Pair<Pair<Matrix, int[]>, Boolean>> dataList,
final boolean isValidation) {
this.dataList = dataList;
this.isValidation = isValidation;
this.matrixList = new ArrayList<>(batchSize);
Expand Down
Expand Up @@ -104,7 +104,7 @@ private boolean validate(final int expectedResult) throws IntegerValidationExcep
}

private static class IntegerValidationException extends Exception {
public IntegerValidationException(final int key, final int expected, final int actual) {
IntegerValidationException(final int key, final int expected, final int actual) {
super(String.format("For key %d, expected value %d but received %d", key, expected, actual));
}
}
Expand Down
Expand Up @@ -171,7 +171,7 @@ private class PushOp implements Op<K, V> {
private final K key;
private final P preValue;

public PushOp(final K key, final P preValue) {
PushOp(final K key, final P preValue) {
this.key = key;
this.preValue = preValue;
}
Expand Down Expand Up @@ -202,7 +202,7 @@ private class PullOp implements Op<K, V> {
private final K key;
private final String srcId;

public PullOp(final K key, final String srcId) {
PullOp(final K key, final String srcId) {
this.key = key;
this.srcId = srcId;
}
Expand Down Expand Up @@ -246,7 +246,7 @@ private static class Partition<K, V> implements Runnable {

private volatile boolean shutdown = false;

public Partition(final int queueSize) {
Partition(final int queueSize) {
this.kvStore = new HashMap<>();
this.queue = new ArrayBlockingQueue<>(queueSize);
this.drainSize = queueSize / 10;
Expand Down
Expand Up @@ -23,7 +23,7 @@ class EncodedKey<K> {
private final int hash;
private final byte[] encoded;

public EncodedKey(final K key, final Codec<K> keyCodec) {
EncodedKey(final K key, final Codec<K> keyCodec) {
this.key = key;
this.encoded = keyCodec.encode(key);
this.hash = computeHash();
Expand Down
Expand Up @@ -275,7 +275,7 @@ private interface Op<K, V> {
private static class Wrapped<V> {
private V value;

public Wrapped(final V value) {
Wrapped(final V value) {
this.value = value;
}

Expand All @@ -295,7 +295,7 @@ private class PushOp implements Op<K, V> {
private final EncodedKey<K> encodedKey;
private final P preValue;

public PushOp(final EncodedKey<K> encodedKey, final P preValue) {
PushOp(final EncodedKey<K> encodedKey, final P preValue) {
this.encodedKey = encodedKey;
this.preValue = preValue;
}
Expand Down Expand Up @@ -333,7 +333,7 @@ private class PullOp implements Op<K, V> {
private final EncodedKey<K> encodedKey;
private V value;

public PullOp(final EncodedKey<K> encodedKey) {
PullOp(final EncodedKey<K> encodedKey) {
this.encodedKey = encodedKey;
}

Expand Down Expand Up @@ -399,11 +399,11 @@ private static class Partition<K, P, V> implements Runnable {
private volatile boolean close = false;
private volatile boolean shutdown = false;

public Partition(final ConcurrentMap<K, PullFuture<V>> pendingPulls,
final ServerResolver serverResolver,
final InjectionFuture<PartitionedWorkerMsgSender<K, P>> sender,
final int queueSize,
final long expireTimeout) {
Partition(final ConcurrentMap<K, PullFuture<V>> pendingPulls,
final ServerResolver serverResolver,
final InjectionFuture<PartitionedWorkerMsgSender<K, P>> sender,
final int queueSize,
final long expireTimeout) {
kvCache = CacheBuilder.newBuilder()
.concurrencyLevel(1)
.expireAfterWrite(expireTimeout, TimeUnit.MILLISECONDS)
Expand Down
Expand Up @@ -158,7 +158,7 @@ private static class MockPartitionedServerSideReplySender
private volatile int latest = -1;

@Inject
public MockPartitionedServerSideReplySender() {
MockPartitionedServerSideReplySender() {
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -33,12 +33,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<reef.version>0.14.0</reef.version>
<reef.version>0.15.0</reef.version>
<hadoop.version>2.4.0</hadoop.version>
<mahout.version>0.9</mahout.version>
<rat.version>0.11</rat.version>
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
<checkstyle.version>6.6</checkstyle.version>
<checkstyle.version>6.17</checkstyle.version>
<protobuf.version>2.5.0</protobuf.version>
<avro.version>1.7.7</avro.version>
<mockito.version>1.10.19</mockito.version>
Expand Down

0 comments on commit 55ee12a

Please sign in to comment.