Skip to content

Commit

Permalink
[core-edge] Remove unused remote lock infrastructure.
Browse files Browse the repository at this point in the history
We only use local lock managers now, so there is no need to have
infrastructure for remote locking.
  • Loading branch information
apcj committed Dec 8, 2015
1 parent dc1dffe commit 598497c
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 895 deletions.
Expand Up @@ -40,8 +40,6 @@
import org.neo4j.coreedge.catchup.tx.core.TxPullResponseEncoder;
import org.neo4j.coreedge.server.ListenSocketAddress;
import org.neo4j.coreedge.catchup.storecopy.edge.GetStoreRequestDecoder;
import org.neo4j.coreedge.raft.locks.LockRequestDecoder;
import org.neo4j.coreedge.raft.locks.LockResponseEncoder;
import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseEncoder;
import org.neo4j.coreedge.catchup.storecopy.FileHeaderEncoder;
Expand Down Expand Up @@ -122,7 +120,6 @@ protected void initChannel( SocketChannel ch ) throws Exception
pipeline.addLast( new StoreCopyFinishedResponseEncoder() );
pipeline.addLast( new TxStreamFinishedResponseEncoder() );
pipeline.addLast( new FileHeaderEncoder() );
pipeline.addLast( new LockResponseEncoder() );

pipeline.addLast( new ServerMessageTypeHandler( protocol, logProvider ) );

Expand All @@ -135,8 +132,6 @@ protected void initChannel( SocketChannel ch ) throws Exception
pipeline.addLast( new GetStoreRequestHandler( protocol, dataSourceSupplier,
checkPointerSupplier ) );

pipeline.addLast( new LockRequestDecoder( protocol ) );

pipeline.addLast( new ExceptionLoggingHandler( log ) );
}
} );
Expand Down
Expand Up @@ -24,22 +24,21 @@
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.LengthFieldPrepender;

import org.neo4j.coreedge.catchup.CatchupClientProtocol;
import org.neo4j.coreedge.catchup.ClientMessageTypeHandler;
import org.neo4j.coreedge.catchup.RequestMessageTypeEncoder;
import org.neo4j.coreedge.catchup.ResponseMessageTypeEncoder;
import org.neo4j.coreedge.catchup.storecopy.FileContentHandler;
import org.neo4j.coreedge.catchup.storecopy.FileHeaderDecoder;
import org.neo4j.coreedge.raft.locks.LockRequestEncoder;
import org.neo4j.coreedge.catchup.CatchupClientProtocol;
import org.neo4j.coreedge.catchup.storecopy.FileHeaderHandler;
import org.neo4j.coreedge.catchup.tx.edge.TxPullRequestEncoder;
import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseDecoder;
import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseHandler;
import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseDecoder;
import org.neo4j.coreedge.catchup.tx.edge.TxStreamFinishedResponseHandler;
import org.neo4j.coreedge.catchup.ClientMessageTypeHandler;
import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
import org.neo4j.coreedge.server.Expiration;
import org.neo4j.coreedge.catchup.tx.edge.TxPullRequestEncoder;
import org.neo4j.coreedge.catchup.tx.edge.TxPullResponseDecoder;
import org.neo4j.coreedge.server.ExpiryScheduler;
import org.neo4j.coreedge.catchup.storecopy.FileContentHandler;
import org.neo4j.coreedge.catchup.storecopy.FileHeaderHandler;
import org.neo4j.coreedge.server.logging.ExceptionLoggingHandler;
import org.neo4j.logging.LogProvider;

public class EdgeToCoreClient extends CoreClient
Expand Down Expand Up @@ -75,7 +74,6 @@ protected void initChannel( SocketChannel ch ) throws Exception

pipeline.addLast( new TxPullRequestEncoder() );
pipeline.addLast( new GetStoreRequestEncoder() );
pipeline.addLast( new LockRequestEncoder() );
pipeline.addLast( new ResponseMessageTypeEncoder() );
pipeline.addLast( new RequestMessageTypeEncoder() );

Expand Down
Expand Up @@ -17,7 +17,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.neo4j.coreedge.raft.locks;
package org.neo4j.coreedge.raft;

import org.neo4j.coreedge.raft.replication.ReplicatedContent;

Expand Down
Expand Up @@ -20,7 +20,6 @@
package org.neo4j.coreedge.raft;

import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.locks.LockSupport;

Expand All @@ -39,7 +38,6 @@
import org.neo4j.coreedge.raft.state.TermStore;
import org.neo4j.coreedge.raft.state.VoteStore;
import org.neo4j.coreedge.server.core.RaftStorageExceptionHandler;
import org.neo4j.kernel.impl.util.Listener;
import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider;

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 598497c

Please sign in to comment.