Repository: incubator-ratis Updated Branches: refs/heads/master bbfb8754d -> b0dc99205
RATIS-340. org.apache.hadoop.ipc.protobuf is shaded to org.apache.ratis.shaded.*. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/b0dc9920 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/b0dc9920 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/b0dc9920 Branch: refs/heads/master Commit: b0dc99205ff6394f4f7698b443a5b2989947bcf5 Parents: bbfb875 Author: Tsz Wo Nicholas Sze <[email protected]> Authored: Sat Oct 6 08:25:41 2018 +0800 Committer: Tsz Wo Nicholas Sze <[email protected]> Committed: Sat Oct 6 08:25:41 2018 +0800 ---------------------------------------------------------------------- BUILDING.md | 13 ++++++++----- README.md | 6 ++++-- .../org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java | 6 +++--- 3 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/b0dc9920/BUILDING.md ---------------------------------------------------------------------- diff --git a/BUILDING.md b/BUILDING.md index c9a806b..ca2e526 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -30,9 +30,12 @@ See the next section for more info. # Thirdparty -We centralize all bundled thirdparty dependencies in the ratis-thirdparty module. This -module is not attached to the core Ratis build as it only needs to change when one -of these dependencies are changed. All dependencies included in ratis-thirdparty +All bundled thirdparty dependencies are centralized in the *ratis-thirdparty* module +and the *ratis-thirdparty-hadoop* module. +These modules are located in a separated repository (https://github.com/apache/incubator-ratis-thirdparty) +but not attached to the core Apache Ratis repository (https://git-wip-us.apache.org/repos/asf?p=incubator-ratis.git) +as they only need to change when one of these dependencies are changed. +All dependencies included in ratis-thirdparty/ratis-thirdparty-hadoop must be relocated to a different package to ensure no downstream classpath pollution. Ratis developers should rely on these relocated thirdparty classes. @@ -50,7 +53,7 @@ build are limited only to the code in Ratis itself. | `com.google.thirdparty.publicsuffix`| `org.apache.ratis.thirdparty.com.google.thirdparty.publicsuffix` | | `io.grpc` | `org.apache.ratis.thirdparty.io.grpc` | | `io.netty` | `org.apache.ratis.thirdparty.io.netty` | -| `org.apache.hadoop.ipc.protobuf` | `org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf` | +| `org.apache.hadoop.ipc.protobuf` | `org.apache.ratis.thirdparty.org.apache.hadoop.ipc.protobuf` | -All compiled protocol-buffer definitions in `ratis-shaded` are stored in the +All compiled protocol-buffer definitions in `ratis-proto` are stored in the `org.apache.ratis.proto` Java package. http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/b0dc9920/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 28d5077..650e5f4 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,10 @@ limitations under the License. See accompanying LICENSE file. --> -# Ratis -Ratis is a java library that implements the RAFT protocol[1]. The Raft paper can be accessed at [this link] (https://raft.github.io/raft.pdf). The paper introduces Raft and states its motivations in following words: +# Apache Ratis +Apache Ratis is a java library that implements the RAFT protocol [1]. +The Raft paper can be accessed at (https://raft.github.io/raft.pdf). +The paper introduces Raft and states its motivations in following words: > Raft is a consensus algorithm for managing a replicated log. It produces a result equivalent to (multi-)Paxos, and it is as efficient as Paxos, but its structure is different from Paxos; this makes Raft more understandable than Paxos and also provides a better foundation for building practical systems. Ratis aims to make raft available as a java library that can be used by any system that needs to use a replicated log. It provides pluggability for state machine implementations to manage replicated states. It also provides pluggability for Raft log, and rpc implementations to make it easy for integration with other projects. Another important goal is to support high throughput data ingest so that it can be used for more general data replication use cases. http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/b0dc9920/ratis-hadoop/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java ---------------------------------------------------------------------- diff --git a/ratis-hadoop/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java b/ratis-hadoop/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java index b8fd2f0..79ebff6 100644 --- a/ratis-hadoop/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java +++ b/ratis-hadoop/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngineShaded.java @@ -35,9 +35,9 @@ import org.apache.hadoop.util.ProtoUtil; import org.apache.hadoop.util.Time; import org.apache.ratis.thirdparty.com.google.protobuf.*; import org.apache.ratis.thirdparty.com.google.protobuf.Descriptors.MethodDescriptor; -import org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProto; -import org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcRequestHeaderProto; -import org.apache.ratis.shaded.org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto; +import org.apache.ratis.thirdparty.org.apache.hadoop.ipc.protobuf.ProtobufRpcEngineProtos.RequestHeaderProto; +import org.apache.ratis.thirdparty.org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcRequestHeaderProto; +import org.apache.ratis.thirdparty.org.apache.hadoop.ipc.protobuf.RpcHeaderProtos.RpcResponseHeaderProto; import javax.net.SocketFactory; import java.io.DataInput;
