You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/29 03:49:29 UTC
[1/6] git commit: make CM.Writer.close idempotent
Updated Branches:
refs/heads/cassandra-1.2 8a51a72ff -> 3eef54097
refs/heads/cassandra-2.0 0e0884f50 -> bbc089125
refs/heads/trunk e085e82b3 -> 35c2f9285
make CM.Writer.close idempotent
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3eef5409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3eef5409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3eef5409
Branch: refs/heads/cassandra-1.2
Commit: 3eef54097b8ec96d0bdd71499f944f0484787021
Parents: 8a51a72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:48:49 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:48:49 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eef5409/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 7a3f4e7..4cde415 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@ -360,7 +360,8 @@ public class CompressionMetadata
public void close() throws IOException
{
- getFD().sync();
+ if (getChannel().isOpen()) // if RAF.closed were public we could just use that, but it's not
+ getChannel().force(true);
super.close();
}
}
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbc08912
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc08912
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc08912
Branch: refs/heads/trunk
Commit: bbc089125a6031abd5fb5e1a175e1f3655a53d20
Parents: 0e0884f 3eef540
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:49:02 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:49:02 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc08912/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
[2/6] git commit: make CM.Writer.close idempotent
Posted by jb...@apache.org.
make CM.Writer.close idempotent
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3eef5409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3eef5409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3eef5409
Branch: refs/heads/cassandra-2.0
Commit: 3eef54097b8ec96d0bdd71499f944f0484787021
Parents: 8a51a72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:48:49 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:48:49 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eef5409/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 7a3f4e7..4cde415 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@ -360,7 +360,8 @@ public class CompressionMetadata
public void close() throws IOException
{
- getFD().sync();
+ if (getChannel().isOpen()) // if RAF.closed were public we could just use that, but it's not
+ getChannel().force(true);
super.close();
}
}
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bbc08912
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbc08912
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bbc08912
Branch: refs/heads/cassandra-2.0
Commit: bbc089125a6031abd5fb5e1a175e1f3655a53d20
Parents: 0e0884f 3eef540
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:49:02 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:49:02 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bbc08912/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
[3/6] git commit: make CM.Writer.close idempotent
Posted by jb...@apache.org.
make CM.Writer.close idempotent
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3eef5409
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3eef5409
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3eef5409
Branch: refs/heads/trunk
Commit: 3eef54097b8ec96d0bdd71499f944f0484787021
Parents: 8a51a72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:48:49 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:48:49 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eef5409/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
index 7a3f4e7..4cde415 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
@@ -360,7 +360,8 @@ public class CompressionMetadata
public void close() throws IOException
{
- getFD().sync();
+ if (getChannel().isOpen()) // if RAF.closed were public we could just use that, but it's not
+ getChannel().force(true);
super.close();
}
}
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/35c2f928
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35c2f928
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35c2f928
Branch: refs/heads/trunk
Commit: 35c2f9285f6ef310910888780dfef9908997cf7e
Parents: e085e82 bbc0891
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Dec 28 20:49:11 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Dec 28 20:49:11 2013 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/io/compress/CompressionMetadata.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------