Repository: incubator-ratis Updated Branches: refs/heads/master 523fb6383 -> 3b9d50ded
http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-proto/src/main/proto/Raft.proto ---------------------------------------------------------------------- diff --git a/ratis-proto/src/main/proto/Raft.proto b/ratis-proto/src/main/proto/Raft.proto new file mode 100644 index 0000000..535914d --- /dev/null +++ b/ratis-proto/src/main/proto/Raft.proto @@ -0,0 +1,307 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto3"; +option java_package = "org.apache.ratis.proto"; +option java_outer_classname = "RaftProtos"; +option java_generate_equals_and_hash = true; +package ratis.common; + +message RaftPeerProto { + bytes id = 1; // id of the peer + string address = 2; // e.g. IP address, hostname etc. +} + +message RaftGroupIdProto { + bytes id = 1; +} + +message RaftGroupProto { + RaftGroupIdProto groupId = 1; + repeated RaftPeerProto peers = 2; +} + +message RaftConfigurationProto { + repeated RaftPeerProto peers = 1; // the peers in the current or new conf + repeated RaftPeerProto oldPeers = 2; // the peers in the old conf +} + +message SMLogEntryProto { + // TODO: This is not super efficient if the SM itself uses PB to serialize its own data for a + // log entry. Data will be copied twice. We should directly support having any Message from SM + bytes data = 1; + + bytes stateMachineData = 2; // State machine specific data which is not written to log. + bool stateMachineDataAttached = 3; // set this flag when state machine data is attached. + uint64 serializedProtobufSize = 4; // size of the serialized LogEntryProto along with stateMachineData +} + +message LeaderNoOp { + // empty +} + +message LogEntryProto { + uint64 term = 1; + uint64 index = 2; + + oneof LogEntryBody { + SMLogEntryProto smLogEntry = 3; + RaftConfigurationProto configurationEntry = 4; + LeaderNoOp noOp = 5; + } + + // clientId and callId are used to rebuild the retry cache. They're not + // necessary for configuration change since re-conf is idempotent. + bytes clientId = 6; + uint64 callId = 7; +} + +message TermIndexProto { + uint64 term = 1; + uint64 index = 2; +} + +message RaftRpcRequestProto { + bytes requestorId = 1; + bytes replyId = 2; + RaftGroupIdProto raftGroupId = 3; + uint64 callId = 4; + + uint64 seqNum = 15; +} + +message RaftRpcReplyProto { + bytes requestorId = 1; + bytes replyId = 2; + RaftGroupIdProto raftGroupId = 3; + uint64 callId = 4; + + bool success = 15; +} + +message FileChunkProto { + string filename = 1; // relative to root + uint64 totalSize = 2; + bytes fileDigest = 3; + uint32 chunkIndex = 4; + uint64 offset = 5; + bytes data = 6; + bool done = 7; +} + +enum InstallSnapshotResult { + SUCCESS = 0; + NOT_LEADER = 1; +} + +message RequestVoteRequestProto { + RaftRpcRequestProto serverRequest = 1; + uint64 candidateTerm = 2; + TermIndexProto candidateLastEntry = 3; +} + +message RequestVoteReplyProto { + RaftRpcReplyProto serverReply = 1; + uint64 term = 2; + bool shouldShutdown = 3; +} + +message CommitInfoProto { + RaftPeerProto server = 1; + uint64 commitIndex = 2; +} + +message AppendEntriesRequestProto { + RaftRpcRequestProto serverRequest = 1; + uint64 leaderTerm = 2; + TermIndexProto previousLog = 3; + repeated LogEntryProto entries = 4; + uint64 leaderCommit = 5; + bool initializing = 6; + + repeated CommitInfoProto commitInfos = 15; +} + +message AppendEntriesReplyProto { + enum AppendResult { + SUCCESS = 0; + NOT_LEADER = 1; // the requester's term is not large enough + INCONSISTENCY = 2; // gap between the local log and the entries + } + + RaftRpcReplyProto serverReply = 1; + uint64 term = 2; + uint64 nextIndex = 3; + AppendResult result = 4; +} + +message InstallSnapshotRequestProto { + RaftRpcRequestProto serverRequest = 1; + string requestId = 2; // an identifier for chunked-requests. + uint32 requestIndex = 3; // the index for this request chunk. Starts from 0. + RaftConfigurationProto raftConfiguration = 4; + uint64 leaderTerm = 5; + TermIndexProto termIndex = 6; + repeated FileChunkProto fileChunks = 7; + uint64 totalSize = 8; + bool done = 9; // whether this is the final chunk for the same req. +} + +message InstallSnapshotReplyProto { + RaftRpcReplyProto serverReply = 1; + uint32 requestIndex = 2; + uint64 term = 3; + InstallSnapshotResult result = 4; +} + +message ClientMessageEntryProto { + bytes content = 1; +} + +enum ReplicationLevel { + MAJORITY = 0; + ALL = 1; +} + + +/** Role of raft peer */ +enum RaftPeerRole { + LEADER = 0; + CANDIDATE = 1; + FOLLOWER = 2; +} + +message WriteRequestTypeProto { + ReplicationLevel replication = 1; +} + +message ReadRequestTypeProto { +} + +message StaleReadRequestTypeProto { + uint64 minIndex = 1; +} + +// normal client request +message RaftClientRequestProto { + RaftRpcRequestProto rpcRequest = 1; + ClientMessageEntryProto message = 2; + + oneof Type { + WriteRequestTypeProto write = 3; + ReadRequestTypeProto read = 4; + StaleReadRequestTypeProto staleRead = 5; + } +} + +message NotLeaderExceptionProto { + RaftPeerProto suggestedLeader = 1; + repeated RaftPeerProto peersInConf = 2; +} + +message NotReplicatedExceptionProto { + uint64 callId = 1; + ReplicationLevel replication = 2; + uint64 logIndex = 3; +} + +message StateMachineExceptionProto { + string exceptionClassName = 1; + string errorMsg = 2; + bytes stacktrace = 3; +} + +message RaftClientReplyProto { + RaftRpcReplyProto rpcReply = 1; + ClientMessageEntryProto message = 2; + + oneof ExceptionDetails { + NotLeaderExceptionProto notLeaderException = 3; + NotReplicatedExceptionProto notReplicatedException = 4; + StateMachineExceptionProto stateMachineException = 5; + } + + repeated CommitInfoProto commitInfos = 15; +} + +// setConfiguration request +message SetConfigurationRequestProto { + RaftRpcRequestProto rpcRequest = 1; + repeated RaftPeerProto peers = 2; +} + +// A request to add a new group +message GroupAddRequestProto { + RaftGroupProto group = 1; // the group to be added. +} + +message GroupRemoveRequestProto { + RaftGroupIdProto groupId = 1; // the group to be removed. + bool deleteDirectory = 2; // delete the directory for that group? +} + +message GroupManagementRequestProto { + RaftRpcRequestProto rpcRequest = 1; + + oneof Op { + GroupAddRequestProto groupAdd = 2; + GroupRemoveRequestProto groupRemove = 3; + } +} + +// server info request +message ServerInformationRequestProto { + RaftRpcRequestProto rpcRequest = 1; +} + +message ServerRpcProto { + RaftPeerProto id = 1; + uint64 lastRpcElapsedTimeMs = 2; +} + +message LeaderInfoProto { + repeated ServerRpcProto followerInfo = 1; +} + +message FollowerInfoProto { + ServerRpcProto leaderInfo = 1; + bool inLogSync = 2; +} + +message CandidateInfoProto { + uint64 lastLeaderElapsedTimeMs = 1; +} + +message RoleInfoProto { + RaftPeerProto self = 1; + RaftPeerRole role = 2; + uint64 roleElapsedTimeMs = 3; + + oneof PeerInfo { + LeaderInfoProto leaderInfo = 4; + FollowerInfoProto followerInfo = 5; + CandidateInfoProto candidateInfo = 6; + } +} + +message ServerInformationReplyProto { + RaftRpcReplyProto rpcReply = 1; + RaftGroupProto group = 2; + RoleInfoProto role = 3; + bool isRaftStorageHealthy = 4; + repeated CommitInfoProto commitInfos = 5; +} http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-replicated-map/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-replicated-map/pom.xml b/ratis-replicated-map/pom.xml index 63fcad7..1eda796 100644 --- a/ratis-replicated-map/pom.xml +++ b/ratis-replicated-map/pom.xml @@ -25,7 +25,11 @@ <dependencies> <dependency> - <artifactId>ratis-proto-shaded</artifactId> + <groupId>org.apache.ratis</groupId> + <artifactId>ratis-thirdparty</artifactId> + </dependency> + <dependency> + <artifactId>ratis-proto</artifactId> <groupId>org.apache.ratis</groupId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/pom.xml ---------------------------------------------------------------------- diff --git a/ratis-server/pom.xml b/ratis-server/pom.xml index 14acf77..1bc4e77 100644 --- a/ratis-server/pom.xml +++ b/ratis-server/pom.xml @@ -25,7 +25,11 @@ <dependencies> <dependency> - <artifactId>ratis-proto-shaded</artifactId> + <groupId>org.apache.ratis</groupId> + <artifactId>ratis-thirdparty</artifactId> + </dependency> + <dependency> + <artifactId>ratis-proto</artifactId> <groupId>org.apache.ratis</groupId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/CommitInfoCache.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/CommitInfoCache.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/CommitInfoCache.java index e74ff9c..7b8cd6c 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/CommitInfoCache.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/CommitInfoCache.java @@ -19,7 +19,7 @@ package org.apache.ratis.server.impl; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.shaded.proto.RaftProtos.CommitInfoProto; +import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.util.ProtoUtils; import java.util.Objects; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java index 8c49005..c60352d 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java @@ -20,8 +20,8 @@ package org.apache.ratis.server.impl; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteRequestProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteReplyProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteRequestProto; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.util.Daemon; import org.apache.ratis.util.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java index 839aa69..e355d4f 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java @@ -22,9 +22,9 @@ import org.apache.ratis.protocol.*; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.RaftLog; -import org.apache.ratis.shaded.proto.RaftProtos.CommitInfoProto; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.CommitInfoProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesRequestProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.*; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/LogAppender.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LogAppender.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LogAppender.java index 58f5525..c237917 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LogAppender.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LogAppender.java @@ -26,8 +26,8 @@ import org.apache.ratis.server.storage.RaftLog.EntryWithData; import org.apache.ratis.server.storage.FileInfo; import org.apache.ratis.server.storage.RaftLog; import org.apache.ratis.server.storage.RaftLogIOException; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; -import org.apache.ratis.shaded.proto.RaftProtos.*; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; +import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.util.*; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java index cdb283f..a95184a 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java @@ -19,7 +19,7 @@ package org.apache.ratis.server.impl; import org.apache.ratis.protocol.*; import org.apache.ratis.server.impl.RetryCache.CacheEntry; -import org.apache.ratis.shaded.proto.RaftProtos.ReplicationLevel; +import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java index 92b3e96..c84f944 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java @@ -19,8 +19,8 @@ package org.apache.ratis.server.impl; import org.apache.ratis.protocol.*; import org.apache.ratis.server.impl.RetryCache.CacheEntry; -import org.apache.ratis.shaded.proto.RaftProtos.ReplicationLevel; -import org.apache.ratis.shaded.proto.RaftProtos.RaftClientRequestProto; +import org.apache.ratis.proto.RaftProtos.ReplicationLevel; +import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.Preconditions; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java index 66603a2..9de81ff 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java @@ -28,8 +28,8 @@ import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.FileInfo; import org.apache.ratis.server.storage.RaftLog; import org.apache.ratis.server.storage.RaftStorageDirectory; -import org.apache.ratis.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.ratis.shaded.proto.RaftProtos.*; +import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.statemachine.TransactionContext; @@ -47,9 +47,9 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto.AppendResult.*; -import static org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; -import static org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.SMLOGENTRY; +import static org.apache.ratis.proto.RaftProtos.AppendEntriesReplyProto.AppendResult.*; +import static org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; +import static org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.SMLOGENTRY; import static org.apache.ratis.util.LifeCycle.State.*; public class RaftServerImpl implements RaftServerProtocol, RaftServerAsynchronousProtocol, http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java index 2a119b2..f12905c 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java @@ -25,7 +25,7 @@ import org.apache.ratis.rpc.RpcType; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.RaftServerRpc; -import org.apache.ratis.shaded.proto.RaftProtos.*; +import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.CheckedFunction; import org.apache.ratis.util.IOUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/RetryCache.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RetryCache.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RetryCache.java index 81ce9ae..887f39c 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RetryCache.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RetryCache.java @@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit; import org.apache.ratis.protocol.ClientId; import org.apache.ratis.protocol.RaftClientReply; -import org.apache.ratis.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.ratis.shaded.com.google.common.cache.Cache; -import org.apache.ratis.shaded.com.google.common.cache.CacheBuilder; +import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.ratis.thirdparty.com.google.common.cache.Cache; +import org.apache.ratis.thirdparty.com.google.common.cache.CacheBuilder; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.TimeDuration; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/RoleInfo.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RoleInfo.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RoleInfo.java index 20ec951..9ee2aa1 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RoleInfo.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RoleInfo.java @@ -18,7 +18,7 @@ package org.apache.ratis.server.impl; -import org.apache.ratis.shaded.proto.RaftProtos.RaftPeerRole; +import org.apache.ratis.proto.RaftProtos.RaftPeerRole; import org.apache.ratis.util.Timestamp; import java.util.concurrent.atomic.AtomicReference; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java index 3774737..518db7c 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java @@ -28,9 +28,9 @@ import java.util.stream.Collectors; import org.apache.ratis.client.impl.ClientProtoUtils; import org.apache.ratis.protocol.*; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; -import org.apache.ratis.shaded.proto.RaftProtos.*; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto.*; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; +import org.apache.ratis.proto.RaftProtos.*; +import org.apache.ratis.proto.RaftProtos.AppendEntriesReplyProto.*; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java index 3f064a8..86b6b00 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java @@ -22,8 +22,8 @@ import org.apache.ratis.protocol.*; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.*; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotRequestProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.statemachine.TransactionContext; @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import static org.apache.ratis.server.impl.RaftServerImpl.LOG; -import static org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; +import static org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; /** * Common states of a raft peer. Protected by RaftServer's lock. @@ -379,4 +379,4 @@ public class ServerState implements Closeable { public long getLastAppliedIndex() { return stateMachineUpdater.getLastAppliedIndex(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java index c92f3ac..02dcb31 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java @@ -21,7 +21,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.Message; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.storage.RaftLog; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerAsynchronousProtocol.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerAsynchronousProtocol.java b/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerAsynchronousProtocol.java index d9461c7..d13f7f5 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerAsynchronousProtocol.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerAsynchronousProtocol.java @@ -18,8 +18,8 @@ package org.apache.ratis.server.protocol; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesRequestProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesReplyProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesRequestProto; import java.io.IOException; import java.util.concurrent.CompletableFuture; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerProtocol.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerProtocol.java b/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerProtocol.java index f1f5512..d1ef4f3 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerProtocol.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/protocol/RaftServerProtocol.java @@ -19,12 +19,12 @@ package org.apache.ratis.server.protocol; import java.io.IOException; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteRequestProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesReplyProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesRequestProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotReplyProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotRequestProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteReplyProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteRequestProto; public interface RaftServerProtocol { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/LogInputStream.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogInputStream.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogInputStream.java index 0edea13..22d7949 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogInputStream.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogInputStream.java @@ -24,7 +24,7 @@ import java.io.EOFException; import java.io.File; import java.io.IOException; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.IOUtils; import org.apache.ratis.util.Preconditions; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/LogOutputStream.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogOutputStream.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogOutputStream.java index dedfe7e..a09b90d 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogOutputStream.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogOutputStream.java @@ -18,8 +18,8 @@ package org.apache.ratis.server.storage; import org.apache.ratis.server.impl.RaftServerConstants; -import org.apache.ratis.shaded.com.google.protobuf.CodedOutputStream; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.thirdparty.com.google.protobuf.CodedOutputStream; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.IOUtils; import org.apache.ratis.util.PureJavaCrc32C; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/LogReader.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogReader.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogReader.java index 48a00e1..ce149dd 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogReader.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogReader.java @@ -19,9 +19,9 @@ package org.apache.ratis.server.storage; import org.apache.ratis.protocol.ChecksumException; import org.apache.ratis.server.impl.RaftServerConstants; -import org.apache.ratis.shaded.com.google.protobuf.CodedInputStream; -import org.apache.ratis.shaded.com.google.protobuf.CodedOutputStream; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.thirdparty.com.google.protobuf.CodedInputStream; +import org.apache.ratis.thirdparty.com.google.protobuf.CodedOutputStream; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.IOUtils; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.PureJavaCrc32C; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java index 2550855..abf92e5 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java @@ -19,10 +19,10 @@ package org.apache.ratis.server.storage; import org.apache.ratis.server.impl.ServerProtoUtils; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.ratis.shaded.com.google.common.cache.CacheLoader; -import org.apache.ratis.shaded.com.google.protobuf.CodedOutputStream; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting; +import org.apache.ratis.thirdparty.com.google.common.cache.CacheLoader; +import org.apache.ratis.thirdparty.com.google.protobuf.CodedOutputStream; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/MemoryRaftLog.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/MemoryRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/MemoryRaftLog.java index 7b3b1b9..71bed5c 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/MemoryRaftLog.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/MemoryRaftLog.java @@ -22,7 +22,7 @@ import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.impl.ServerProtoUtils; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.AutoCloseableLock; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLog.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLog.java index 296dce6..30d5c8f 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLog.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLog.java @@ -25,7 +25,7 @@ import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.impl.ServerProtoUtils; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.AutoCloseableLock; import org.apache.ratis.util.JavaUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogCache.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogCache.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogCache.java index e1ff84b..0cb1047 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogCache.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogCache.java @@ -25,7 +25,7 @@ import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.CacheInvalidationPolicy.CacheInvalidationPolicyDefault; import org.apache.ratis.server.storage.LogSegment.LogRecord; import org.apache.ratis.server.storage.RaftStorageDirectory.LogPathAndIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java index 68f303d..c0d1cb9 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java @@ -29,7 +29,7 @@ import org.apache.ratis.server.impl.ServerProtoUtils; import org.apache.ratis.server.storage.RaftLogCache.SegmentFileInfo; import org.apache.ratis.server.storage.RaftLogCache.TruncationSegments; import org.apache.ratis.server.storage.SegmentedRaftLog.Task; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.*; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/SegmentedRaftLog.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/SegmentedRaftLog.java index 9df16f8..b7cf920 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/SegmentedRaftLog.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/SegmentedRaftLog.java @@ -27,7 +27,7 @@ import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.LogSegment.LogRecord; import org.apache.ratis.server.storage.LogSegment.LogRecordWithEntry; import org.apache.ratis.server.storage.RaftStorageDirectory.LogPathAndIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.AutoCloseableLock; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java index ccccf22..77a9963 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/SnapshotManager.java @@ -24,8 +24,8 @@ import java.nio.channels.FileChannel; import org.apache.ratis.io.MD5Hash; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.shaded.proto.RaftProtos.FileChunkProto; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotRequestProto; +import org.apache.ratis.proto.RaftProtos.FileChunkProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotRequestProto; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.FileUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/statemachine/StateMachine.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/StateMachine.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/StateMachine.java index c76b2e4..6c8b2df 100644 --- a/ratis-server/src/main/java/org/apache/ratis/statemachine/StateMachine.java +++ b/ratis-server/src/main/java/org/apache/ratis/statemachine/StateMachine.java @@ -26,8 +26,8 @@ import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.RaftStorage; -import org.apache.ratis.shaded.proto.RaftProtos.RoleInfoProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.RoleInfoProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.LifeCycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/statemachine/TransactionContext.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/TransactionContext.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/TransactionContext.java index be92532..a112772 100644 --- a/ratis-server/src/main/java/org/apache/ratis/statemachine/TransactionContext.java +++ b/ratis-server/src/main/java/org/apache/ratis/statemachine/TransactionContext.java @@ -18,10 +18,10 @@ package org.apache.ratis.statemachine; import org.apache.ratis.protocol.RaftClientRequest; -import org.apache.ratis.shaded.proto.RaftProtos; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import java.io.IOException; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java index 16b4f6f..f43fdf8 100644 --- a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java +++ b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/BaseStateMachine.java @@ -27,7 +27,7 @@ import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.RaftStorage; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.statemachine.SnapshotInfo; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.statemachine.StateMachineStorage; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java index b49a443..5216cff 100644 --- a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java +++ b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java @@ -20,10 +20,10 @@ package org.apache.ratis.statemachine.impl; import java.io.IOException; import java.util.Objects; import org.apache.ratis.protocol.RaftClientRequest; -import org.apache.ratis.shaded.proto.RaftProtos; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java b/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java index 0740956..d2aef5b 100644 --- a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java +++ b/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java @@ -29,7 +29,7 @@ import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.RaftServerTestUtil; import org.apache.ratis.server.storage.MemoryRaftLog; import org.apache.ratis.server.storage.RaftLog; -import org.apache.ratis.shaded.proto.RaftProtos.ReplicationLevel; +import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.statemachine.impl.BaseStateMachine; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java index 3d80f5e..776e1f1 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java @@ -27,11 +27,11 @@ import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.RaftServerTestUtil; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; -import org.apache.ratis.shaded.com.google.protobuf.InvalidProtocolBufferException; -import org.apache.ratis.shaded.proto.RaftProtos.CommitInfoProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.ReplicationLevel; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; +import org.apache.ratis.thirdparty.com.google.protobuf.InvalidProtocolBufferException; +import org.apache.ratis.proto.RaftProtos.CommitInfoProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.JavaUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java index 8a41d90..9cd7b7a 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java @@ -32,8 +32,8 @@ import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.RaftServerTestUtil; import org.apache.ratis.server.impl.RetryCacheTestUtil; import org.apache.ratis.server.storage.RaftLog; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.ReplicationLevel; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.util.ExitUtils; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.LogUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java index e167f17..fa529b6 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java @@ -30,9 +30,9 @@ import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.ServerProtoUtils; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.RaftLog; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/TestRaftServerLeaderElectionTimeout.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/TestRaftServerLeaderElectionTimeout.java b/ratis-server/src/test/java/org/apache/ratis/TestRaftServerLeaderElectionTimeout.java index 04a2a8d..6ec321f 100644 --- a/ratis-server/src/test/java/org/apache/ratis/TestRaftServerLeaderElectionTimeout.java +++ b/ratis-server/src/test/java/org/apache/ratis/TestRaftServerLeaderElectionTimeout.java @@ -23,7 +23,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc; -import org.apache.ratis.shaded.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.LogUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java b/ratis-server/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java index 51af8af..b8ef87e 100644 --- a/ratis-server/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java +++ b/ratis-server/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java @@ -24,7 +24,7 @@ import org.apache.ratis.protocol.RaftPeerId; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc; -import org.apache.ratis.shaded.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.LogUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java b/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java index b454c31..30b7ed5 100644 --- a/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java +++ b/ratis-server/src/test/java/org/apache/ratis/protocol/TestRaftId.java @@ -18,7 +18,7 @@ package org.apache.ratis.protocol; import org.apache.ratis.BaseTest; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java index 6374a21..16536e7 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicReference; import static java.util.Arrays.asList; import static org.apache.ratis.server.impl.RaftServerTestUtil.waitAndCheckNewConf; -import static org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; +import static org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase.CONFIGURATIONENTRY; public abstract class RaftReconfigurationBaseTest extends BaseTest { static { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java index 9e63063..b31c7e8 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RetryCacheTestUtil.java @@ -18,7 +18,7 @@ package org.apache.ratis.server.impl; import org.apache.ratis.protocol.ClientId; -import org.apache.ratis.shaded.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.util.TimeDuration; import org.junit.Assert; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerInformationBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerInformationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerInformationBaseTest.java index 2862e0d..dd440cb 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerInformationBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerInformationBaseTest.java @@ -23,7 +23,7 @@ import org.apache.ratis.MiniRaftCluster; import org.apache.ratis.RaftTestUtil; import org.apache.ratis.client.RaftClient; import org.apache.ratis.protocol.*; -import org.apache.ratis.shaded.proto.RaftProtos.CommitInfoProto; +import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.util.LogUtils; import org.junit.Assert; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java index df0545d..d5545cb 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerReply.java @@ -19,9 +19,9 @@ package org.apache.ratis.server.simulation; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftRpcMessage; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotReplyProto; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteReplyProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesReplyProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotReplyProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteReplyProto; import org.apache.ratis.util.ProtoUtils; import java.util.Objects; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java index e38296c..1ec791e 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/simulation/RaftServerRequest.java @@ -19,9 +19,9 @@ package org.apache.ratis.server.simulation; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftRpcMessage; -import org.apache.ratis.shaded.proto.RaftProtos.AppendEntriesRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.InstallSnapshotRequestProto; -import org.apache.ratis.shaded.proto.RaftProtos.RequestVoteRequestProto; +import org.apache.ratis.proto.RaftProtos.AppendEntriesRequestProto; +import org.apache.ratis.proto.RaftProtos.InstallSnapshotRequestProto; +import org.apache.ratis.proto.RaftProtos.RequestVoteRequestProto; import org.apache.ratis.util.ProtoUtils; class RaftServerRequest implements RaftRpcMessage { http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java b/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java index d9bbc43..52de86f 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java @@ -21,7 +21,7 @@ import org.apache.ratis.protocol.*; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.RaftServerRpc; import org.apache.ratis.server.impl.RaftServerProxy; -import org.apache.ratis.shaded.proto.RaftProtos.*; +import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.util.Daemon; import org.apache.ratis.util.IOUtils; import org.apache.ratis.util.JavaUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java index cc9d76d..ad8308e 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java @@ -19,7 +19,7 @@ package org.apache.ratis.server.storage; import org.apache.log4j.Level; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.proto.RaftProtos; +import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.util.AutoCloseableLock; import org.apache.ratis.util.LogUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java index c94fb73..124f7b8 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestCacheEviction.java @@ -29,7 +29,7 @@ import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.ServerState; import org.apache.ratis.server.storage.CacheInvalidationPolicy.CacheInvalidationPolicyDefault; import org.apache.ratis.server.storage.TestSegmentedRaftLog.SegmentRange; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; import org.apache.ratis.statemachine.StateMachine; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java index 42e63ea..eeb7ea0 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogCache.java @@ -25,7 +25,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.ClientId; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.RaftLogCache.TruncationSegments; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.ProtoUtils; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java index cb512a5..c218179 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogReadWrite.java @@ -25,8 +25,8 @@ import org.apache.ratis.protocol.ClientId; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.impl.RaftServerConstants.StartupOption; -import org.apache.ratis.shaded.com.google.protobuf.CodedOutputStream; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.thirdparty.com.google.protobuf.CodedOutputStream; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.ProtoUtils; import org.apache.ratis.util.SizeInBytes; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java index 690ad59..ce5a92d 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestRaftLogSegment.java @@ -24,8 +24,8 @@ import org.apache.ratis.protocol.ClientId; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerConstants.StartupOption; import org.apache.ratis.server.storage.LogSegment.LogRecordWithEntry; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.ProtoUtils; import org.apache.ratis.util.SizeInBytes; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java index a95627f..7b26733 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/TestSegmentedRaftLog.java @@ -29,7 +29,7 @@ import org.apache.ratis.server.impl.RetryCacheTestUtil; import org.apache.ratis.server.impl.RetryCache; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.protocol.TermIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.LogUtils; import org.apache.ratis.util.ProtoUtils; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java index cf0f611..584812e 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java @@ -32,7 +32,7 @@ import org.apache.ratis.server.impl.RaftServerTestUtil; import org.apache.ratis.server.storage.RaftLog; import org.apache.ratis.server.storage.RaftStorageDirectory; import org.apache.ratis.server.storage.RaftStorageDirectory.LogPathAndIndex; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.util.FileUtils; import org.apache.ratis.util.LogUtils; import org.junit.After; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java index b6d6d3f..cafd98d 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java @@ -33,10 +33,10 @@ import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.storage.LogInputStream; import org.apache.ratis.server.storage.LogOutputStream; import org.apache.ratis.server.storage.RaftStorage; -import org.apache.ratis.shaded.com.google.protobuf.ByteString; -import org.apache.ratis.shaded.proto.RaftProtos.RoleInfoProto; -import org.apache.ratis.shaded.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; +import org.apache.ratis.proto.RaftProtos.RoleInfoProto; +import org.apache.ratis.proto.RaftProtos.LogEntryProto; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.statemachine.impl.BaseStateMachine; import org.apache.ratis.statemachine.impl.SimpleStateMachineStorage; import org.apache.ratis.statemachine.impl.SingleFileSnapshotInfo; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/3b9d50de/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java index 07039b1..189c9da 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java @@ -28,7 +28,7 @@ import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc; -import org.apache.ratis.shaded.proto.RaftProtos.SMLogEntryProto; +import org.apache.ratis.proto.RaftProtos.SMLogEntryProto; import org.apache.ratis.statemachine.impl.TransactionContextImpl; import org.apache.ratis.util.LogUtils; import org.junit.*;
