You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/03/05 21:07:32 UTC
[1/3] cassandra git commit: nit remove redundant int cast
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0e621317e -> 4ce409e33
refs/heads/trunk 3fededce1 -> f6d8d88ce
nit remove redundant int cast
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ce409e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ce409e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ce409e3
Branch: refs/heads/cassandra-2.1
Commit: 4ce409e33ffce7b0976d95b66b0a43c68f2a7d88
Parents: 0e62131
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Mar 5 20:07:14 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Mar 5 20:07:14 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ce409e3/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
index e6f5083..ac924ec 100644
--- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
+++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
@@ -123,7 +123,7 @@ public class DataIntegrityMetadata
incrementalChecksum.update(buffer, start, end);
incrementalChecksumValue = (int) incrementalChecksum.getValue();
- incrementalOut.writeInt((int) incrementalChecksumValue);
+ incrementalOut.writeInt(incrementalChecksumValue);
incrementalChecksum.reset();
fullChecksum.update(buffer, start, end);
@@ -131,7 +131,7 @@ public class DataIntegrityMetadata
if (checksumIncrementalResult)
{
ByteBuffer byteBuffer = ByteBuffer.allocate(4);
- byteBuffer.putInt((int) incrementalChecksumValue);
+ byteBuffer.putInt(incrementalChecksumValue);
fullChecksum.update(byteBuffer.array(), 0, byteBuffer.array().length);
}
}
[2/3] cassandra git commit: nit remove redundant int cast
Posted by be...@apache.org.
nit remove redundant int cast
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ce409e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ce409e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ce409e3
Branch: refs/heads/trunk
Commit: 4ce409e33ffce7b0976d95b66b0a43c68f2a7d88
Parents: 0e62131
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Mar 5 20:07:14 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Mar 5 20:07:14 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ce409e3/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
index e6f5083..ac924ec 100644
--- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
+++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
@@ -123,7 +123,7 @@ public class DataIntegrityMetadata
incrementalChecksum.update(buffer, start, end);
incrementalChecksumValue = (int) incrementalChecksum.getValue();
- incrementalOut.writeInt((int) incrementalChecksumValue);
+ incrementalOut.writeInt(incrementalChecksumValue);
incrementalChecksum.reset();
fullChecksum.update(buffer, start, end);
@@ -131,7 +131,7 @@ public class DataIntegrityMetadata
if (checksumIncrementalResult)
{
ByteBuffer byteBuffer = ByteBuffer.allocate(4);
- byteBuffer.putInt((int) incrementalChecksumValue);
+ byteBuffer.putInt(incrementalChecksumValue);
fullChecksum.update(byteBuffer.array(), 0, byteBuffer.array().length);
}
}
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6d8d88c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6d8d88c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6d8d88c
Branch: refs/heads/trunk
Commit: f6d8d88ce3b54e3afdc41b30e2055d974594ac0c
Parents: 3fededc 4ce409e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Mar 5 20:07:19 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Mar 5 20:07:19 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6d8d88c/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------