You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2018/10/06 17:28:32 UTC
[bookkeeper] branch branch-4.7 updated: [BUILD] Fix checkstyle
issues on branch47
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch branch-4.7
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/branch-4.7 by this push:
new 970bf54 [BUILD] Fix checkstyle issues on branch47
970bf54 is described below
commit 970bf548ce18ea32c0f5bd0e1c838c15e16e63fb
Author: Sijie Guo <gu...@gmail.com>
AuthorDate: Sat Oct 6 10:28:28 2018 -0700
[BUILD] Fix checkstyle issues on branch47
Descriptions of the changes in this PR:
*Motivation*
I saw all CI jobs are failing when changes are cherry-picked for 4.7.3.
It turns about some cherry-picks broke the build before.
*Changes*
Fix the checkstyle issues on branch47
Author: Sijie Guo <si...@apache.org>
Author: Enrico Olivelli <eo...@apache.org>
Author: Matteo Merli <mm...@apache.org>
Author: Nicolas Michael <nm...@salesforce.com>
Author: Jia Zhai <zh...@apache.org>
Author: Samuel Just <sj...@salesforce.com>
Author: Ethan Li <et...@gmail.com>
Author: arunlakshman <ar...@gmail.com>
Author: JV Jujjuri <vj...@salesforce.com>
Author: Ivan Kelly <iv...@apache.org>
Author: Andrey Yegorov <ay...@salesforce.com>
Author: Andrey Yegorov <dl...@users.noreply.github.com>
Author: Qi Wang <co...@gmail.com>
Author: Sijie Guo <gu...@gmail.com>
Author: cguttapalem <cg...@salesforce.com>
Author: Ivan Kelly <iv...@ivankelly.net>
Reviewers: Matteo Merli <mm...@apache.org>, Enrico Olivelli <eo...@gmail.com>
This closes #1743 from sijie/fix_checkstyle_in_branch47
---
.../src/main/java/org/apache/bookkeeper/client/PendingReadOp.java | 3 ++-
.../java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOp.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
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 07c6321..4787aef 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
@@ -534,7 +534,8 @@ class PendingReadOp implements ReadEntryCallback, SafeRunnable {
for (LedgerEntryRequest entry : seq) {
entry.read();
if (!parallelRead && lh.bk.getReadSpeculativeRequestPolicy().isPresent()) {
- speculativeTask = lh.bk.getReadSpeculativeRequestPolicy().get().initiateSpeculativeRequest(scheduler, entry);
+ speculativeTask =
+ lh.bk.getReadSpeculativeRequestPolicy().get().initiateSpeculativeRequest(scheduler, entry);
}
}
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOp.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOp.java
index 164b166..b38ee07 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOp.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOp.java
@@ -495,7 +495,8 @@ class ReadLastConfirmedAndEntryOp implements BookkeeperInternalCallbacks.ReadEnt
request.read();
if (!parallelRead && lh.getBk().getReadLACSpeculativeRequestPolicy().isPresent()) {
- speculativeTask = lh.getBk().getReadLACSpeculativeRequestPolicy().get().initiateSpeculativeRequest(scheduler, this);
+ speculativeTask =
+ lh.getBk().getReadLACSpeculativeRequestPolicy().get().initiateSpeculativeRequest(scheduler, this);
}
}