natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

r/m unused HeartBeatState.heartbeat field. patch by Jaakko Laine; reviewed by jbellis for CASSANDRA-597 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-12-04 21:13:30 +00:00
parent 40ed496b91
commit eff8c61157
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -814,7 +814,7 @@ public class Gossiper implements IFailureDetectionEventListener, IEndPointStateC
EndPointState localState = endPointStateMap_.get(localEndPoint_);
if ( localState == null )
{
HeartBeatState hbState = new HeartBeatState(generationNbr, 0);
HeartBeatState hbState = new HeartBeatState(generationNbr);
localState = new EndPointState(hbState);
localState.isAlive(true);
localState.isAGossiper(true);

18
src/java/org/apache/cassandra/gms/HeartBeatState.java
View File

@ -18,7 +18,6 @@
package org.apache.cassandra.gms;
import java.util.concurrent.atomic.AtomicInteger;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@ -40,18 +39,16 @@ class HeartBeatState
}
int generation_;
AtomicInteger heartbeat_;
int version_;
HeartBeatState(int generation, int heartbeat)
HeartBeatState(int generation)
{
this(generation, heartbeat, 0);
this(generation, 0);
}
HeartBeatState(int generation, int heartbeat, int version)
HeartBeatState(int generation, int version)
{
generation_ = generation;
heartbeat_ = new AtomicInteger(heartbeat);
version_ = version;
}
@ -65,14 +62,8 @@ class HeartBeatState
return generation_;
}
int getHeartBeat()
{
return heartbeat_.get();
}
void updateHeartBeat()
{
heartbeat_.incrementAndGet();
version_ = VersionGenerator.getNextVersion();
}
@ -87,12 +78,11 @@ class HeartBeatStateSerializer implements ICompactSerializer<HeartBeatState>
public void serialize(HeartBeatState hbState, DataOutputStream dos) throws IOException
{
dos.writeInt(hbState.generation_);
dos.writeInt(hbState.heartbeat_.get());
dos.writeInt(hbState.version_);
}
public HeartBeatState deserialize(DataInputStream dis) throws IOException
{
return new HeartBeatState(dis.readInt(), dis.readInt(), dis.readInt());
return new HeartBeatState(dis.readInt(), dis.readInt());
}
}