You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2017/06/01 09:42:11 UTC
bookkeeper git commit: BOOKKEEPER-1084: Make variables finale if
necessary
Repository: bookkeeper
Updated Branches:
refs/heads/master 0eca5ff57 -> 77a01dc7e
BOOKKEEPER-1084: Make variables finale if necessary
not all logger in bookkeeper & hedwig are static. some class like PendnigReadOp and LedgerEntry would have lots of objects, it might be bad. so this task is to make logger as a static variable if it didn't.
with benefit, cleaning up the imports when touching that file.
RB_ID=141138
Author: Sijie Guo <si...@twitter.com>
Reviewers: Jia Zhai, Enrico Olivelli
Closes #172 from sijie/make_finale
Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/77a01dc7
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/77a01dc7
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/77a01dc7
Branch: refs/heads/master
Commit: 77a01dc7e6431092f82a7efb02789beb165b75e2
Parents: 0eca5ff
Author: Sijie Guo <si...@twitter.com>
Authored: Thu Jun 1 11:42:04 2017 +0200
Committer: Enrico Olivelli <eo...@apache.org>
Committed: Thu Jun 1 11:42:04 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/bookkeeper/client/LedgerEntry.java | 4 +---
.../java/org/apache/bookkeeper/client/PendingReadOp.java | 2 +-
.../org/apache/bookkeeper/proto/PerChannelBookieClient.java | 1 -
.../org/apache/bookkeeper/streaming/LedgerInputStream.java | 2 +-
.../org/apache/bookkeeper/streaming/LedgerOutputStream.java | 2 +-
.../java/org/apache/bookkeeper/test/LoopbackClient.java | 9 ++++-----
6 files changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
index c01ec54..ed9fb29 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerEntry.java
@@ -1,5 +1,3 @@
-package org.apache.bookkeeper.client;
-
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +18,7 @@ package org.apache.bookkeeper.client;
* under the License.
*
*/
+package org.apache.bookkeeper.client;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream;
@@ -31,7 +30,6 @@ import java.io.InputStream;
* the entry content.
*
*/
-
public class LedgerEntry {
long ledgerId;
long entryId;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
index da15aab..fd69849 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
*
*/
class PendingReadOp implements Enumeration<LedgerEntry>, ReadEntryCallback {
- private final static Logger LOG = LoggerFactory.getLogger(PendingReadOp.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PendingReadOp.class);
final int speculativeReadTimeout;
final private ScheduledExecutorService scheduler;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
index 99d257b..e8e2cb0 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/PerChannelBookieClient.java
@@ -88,7 +88,6 @@ import org.apache.bookkeeper.proto.BookkeeperProtocol.Response;
import org.apache.bookkeeper.proto.BookkeeperProtocol.StatusCode;
import org.apache.bookkeeper.proto.BookkeeperProtocol.WriteLacRequest;
import org.apache.bookkeeper.proto.BookkeeperProtocol.WriteLacResponse;
-
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
index 7e01bdc..a56003a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerInputStream.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
public class LedgerInputStream extends InputStream {
private final static Logger LOG = LoggerFactory.getLogger(LedgerInputStream.class);
- private LedgerHandle lh;
+ private final LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
long lastEntry = 0;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
index 05d390b..ac7e04f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/streaming/LedgerOutputStream.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public class LedgerOutputStream extends OutputStream {
private final static Logger LOG = LoggerFactory.getLogger(LedgerOutputStream.class);
- private LedgerHandle lh;
+ private final LedgerHandle lh;
private ByteBuffer bytebuff;
byte[] bbytes;
int defaultSize = 1024 * 1024; // 1MB default size
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/77a01dc7/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
index 771628b..4aca808 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LoopbackClient.java
@@ -39,13 +39,11 @@ import org.slf4j.LoggerFactory;
/**
* This class tests BookieClient. It just sends the a new entry to itself.
- *
- *
- *
*/
-
class LoopbackClient implements WriteCallback {
- private final static Logger LOG = LoggerFactory.getLogger(LoopbackClient.class);
+
+ private static final Logger LOG = LoggerFactory.getLogger(LoopbackClient.class);
+
BookieClient client;
static int recvTimeout = 2000;
long begin = 0;
@@ -81,6 +79,7 @@ class LoopbackClient implements WriteCallback {
client.addEntry(addr, ledgerId, passwd, entry, Unpooled.wrappedBuffer(data), cb, ctx, BookieProtocol.FLAG_NONE);
}
+ @Override
public void writeComplete(int rc, long ledgerId, long entryId, BookieSocketAddress addr, Object ctx) {
Counter counter = (Counter) ctx;
counter.increment();