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/09/19 23:54:32 UTC
[1/6] git commit: bump Distruptor Thrift Server version to 0.3.2
Updated Branches:
refs/heads/cassandra-2.0 b4bc50e44 -> 023b55f3b
refs/heads/trunk fee30d5ad -> 681312393
bump Distruptor Thrift Server version to 0.3.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4bc50e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4bc50e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4bc50e4
Branch: refs/heads/trunk
Commit: b4bc50e44d3cb1c1a528132e11e6641212b5bc3c
Parents: 72be2a4
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Thu Sep 19 14:08:38 2013 -0700
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Thu Sep 19 14:08:38 2013 -0700
----------------------------------------------------------------------
build.xml | 4 ++--
lib/thrift-server-0.3.0.jar | Bin 123898 -> 0 bytes
lib/thrift-server-0.3.2.jar | Bin 0 -> 123920 bytes
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4bc50e4/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6aab42a..72291e2 100644
--- a/build.xml
+++ b/build.xml
@@ -354,7 +354,7 @@
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/>
@@ -452,7 +452,7 @@
<dependency groupId="edu.stanford.ppl" artifactId="snaptree"/>
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
<dependency groupId="log4j" artifactId="log4j"/>
<!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider at runtime -->
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4bc50e4/lib/thrift-server-0.3.0.jar
----------------------------------------------------------------------
diff --git a/lib/thrift-server-0.3.0.jar b/lib/thrift-server-0.3.0.jar
deleted file mode 100644
index 3c93bb9..0000000
Binary files a/lib/thrift-server-0.3.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4bc50e4/lib/thrift-server-0.3.2.jar
----------------------------------------------------------------------
diff --git a/lib/thrift-server-0.3.2.jar b/lib/thrift-server-0.3.2.jar
new file mode 100644
index 0000000..5b03c4d
Binary files /dev/null and b/lib/thrift-server-0.3.2.jar differ
[3/6] git commit: use non-pooling readers with openForBatch patch by
jbellis; reviewed by yukim for CASSANDRA-6067
Posted by jb...@apache.org.
use non-pooling readers with openForBatch
patch by jbellis; reviewed by yukim for CASSANDRA-6067
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a7cc11f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a7cc11f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a7cc11f
Branch: refs/heads/cassandra-2.0
Commit: 5a7cc11f29c69265d6302a54690476b7ef2de61a
Parents: b4bc50e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:49:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:50:17 2013 -0500
----------------------------------------------------------------------
.../cassandra/io/sstable/SSTableReader.java | 14 ++++++++++---
.../io/util/BufferedSegmentedFile.java | 21 +++++++++-----------
2 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a7cc11f/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e0c096f..4da579c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -160,8 +160,17 @@ public class SSTableReader extends SSTable implements Closeable
partitioner,
System.currentTimeMillis(),
sstableMetadata);
- // don't save index summary to disk if we needed to build one
- sstable.load(false, false);
+
+ // special implementation of load to use non-pooled SegmentedFile builders
+ SegmentedFile.Builder ibuilder = new BufferedSegmentedFile.Builder();
+ SegmentedFile.Builder dbuilder = sstable.compression
+ ? new CompressedSegmentedFile.Builder()
+ : new BufferedSegmentedFile.Builder();
+ if (!loadSummary(sstable, ibuilder, dbuilder, sstable.metadata))
+ sstable.buildSummary(false, ibuilder, dbuilder, false);
+ sstable.ifile = ibuilder.complete(sstable.descriptor.filenameFor(Component.PRIMARY_INDEX));
+ sstable.dfile = dbuilder.complete(sstable.descriptor.filenameFor(Component.DATA));
+
sstable.bf = FilterFactory.AlwaysPresent;
return sstable;
}
@@ -411,7 +420,6 @@ public class SSTableReader extends SSTable implements Closeable
? SegmentedFile.getCompressedBuilder()
: SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode());
-
boolean summaryLoaded = loadSummary(this, ibuilder, dbuilder, metadata);
if (recreateBloomFilter || !summaryLoaded)
buildSummary(recreateBloomFilter, ibuilder, dbuilder, summaryLoaded);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a7cc11f/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
index 49972c8..790b42b 100644
--- a/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
@@ -19,7 +19,7 @@ package org.apache.cassandra.io.util;
import java.io.File;
-public class BufferedSegmentedFile extends PoolingSegmentedFile
+public class BufferedSegmentedFile extends SegmentedFile
{
public BufferedSegmentedFile(String path, long length)
{
@@ -28,20 +28,11 @@ public class BufferedSegmentedFile extends PoolingSegmentedFile
public static class Builder extends SegmentedFile.Builder
{
- /**
- * Adds a position that would be a safe place for a segment boundary in the file. For a block/row based file
- * format, safe boundaries are block/row edges.
- * @param boundary The absolute position of the potential boundary in the file.
- */
public void addPotentialBoundary(long boundary)
{
// only one segment in a standard-io file
}
- /**
- * Called after all potential boundaries have been added to apply this Builder to a concrete file on disk.
- * @param path The file on disk.
- */
public SegmentedFile complete(String path)
{
long length = new File(path).length();
@@ -49,8 +40,14 @@ public class BufferedSegmentedFile extends PoolingSegmentedFile
}
}
- protected RandomAccessReader createReader(String path)
+ public FileDataInput getSegment(long position)
+ {
+ RandomAccessReader reader = RandomAccessReader.open(new File(path));
+ reader.seek(position);
+ return reader;
+ }
+
+ public void cleanup()
{
- return RandomAccessReader.open(new File(path), this);
}
}
[4/6] git commit: edit for 2.0.1 re-roll
Posted by jb...@apache.org.
edit for 2.0.1 re-roll
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/023b55f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023b55f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023b55f3
Branch: refs/heads/trunk
Commit: 023b55f3b45722873737258820aefe47672af67e
Parents: 5a7cc11
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:49:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:50:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/023b55f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 979d6b0..a6938f4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,7 @@
-2.0.2
+2.0.1
* Improve memory use defaults (CASSANDRA-5069)
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
* Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
-Merged from 1.2:
- * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
-
-
-2.0.1
* add file_cache_size_in_mb setting (CASSANDRA-5661)
* Improve error message when yaml contains invalid properties (CASSANDRA-5958)
* Improve leveled compaction's ability to find non-overlapping L0 compactions
@@ -36,6 +31,7 @@ Merged from 1.2:
* Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
* Support named bind variables in CQL (CASSANDRA-6033)
Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[6/6] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68131239
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68131239
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68131239
Branch: refs/heads/trunk
Commit: 681312393b03be50e000c5ffeb2e6e3ff2672f1b
Parents: fee30d5 023b55f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:54:26 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:54:26 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 ++-----
build.xml | 4 ++--
lib/thrift-server-0.3.0.jar | Bin 123898 -> 0 bytes
lib/thrift-server-0.3.2.jar | Bin 0 -> 123920 bytes
.../cassandra/io/sstable/SSTableReader.java | 14 ++++++++++---
.../io/util/BufferedSegmentedFile.java | 21 ++++++++-----------
6 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68131239/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2b5bf79,a6938f4..578da35
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,4 +1,12 @@@
+2.1
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+
+
- 2.0.2
+ 2.0.1
* Improve memory use defaults (CASSANDRA-5069)
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
* Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68131239/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d0bb1c5,72291e2..5be37ca
--- a/build.xml
+++ b/build.xml
@@@ -355,9 -354,7 +355,9 @@@
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.github.stephenc.high-scale-lib" artifactId="high-scale-lib" version="1.1.2"/>
<dependency groupId="com.github.stephenc" artifactId="jamm" version="0.2.5"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0">
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
++ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2">
+ <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
+ </dependency>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/>
@@@ -456,10 -452,11 +456,10 @@@
<dependency groupId="edu.stanford.ppl" artifactId="snaptree"/>
<dependency groupId="org.mindrot" artifactId="jbcrypt"/>
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.0"/>
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.2"/>
- <dependency groupId="log4j" artifactId="log4j"/>
- <!-- cassandra has a hard dependency on log4j, so force slf4j's log4j provider at runtime -->
- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="runtime"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
+ <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift"/>
<dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift"/>
[2/6] git commit: edit for 2.0.1 re-roll
Posted by jb...@apache.org.
edit for 2.0.1 re-roll
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/023b55f3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023b55f3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023b55f3
Branch: refs/heads/cassandra-2.0
Commit: 023b55f3b45722873737258820aefe47672af67e
Parents: 5a7cc11
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:49:35 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:50:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/023b55f3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 979d6b0..a6938f4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,7 @@
-2.0.2
+2.0.1
* Improve memory use defaults (CASSANDRA-5069)
* Make ThriftServer more easlly extensible (CASSANDRA-6058)
* Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
-Merged from 1.2:
- * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
-
-
-2.0.1
* add file_cache_size_in_mb setting (CASSANDRA-5661)
* Improve error message when yaml contains invalid properties (CASSANDRA-5958)
* Improve leveled compaction's ability to find non-overlapping L0 compactions
@@ -36,6 +31,7 @@ Merged from 1.2:
* Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
* Support named bind variables in CQL (CASSANDRA-6033)
Merged from 1.2:
+ * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
[5/6] git commit: use non-pooling readers with openForBatch patch by
jbellis; reviewed by yukim for CASSANDRA-6067
Posted by jb...@apache.org.
use non-pooling readers with openForBatch
patch by jbellis; reviewed by yukim for CASSANDRA-6067
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a7cc11f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a7cc11f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a7cc11f
Branch: refs/heads/trunk
Commit: 5a7cc11f29c69265d6302a54690476b7ef2de61a
Parents: b4bc50e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 19 16:49:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 19 16:50:17 2013 -0500
----------------------------------------------------------------------
.../cassandra/io/sstable/SSTableReader.java | 14 ++++++++++---
.../io/util/BufferedSegmentedFile.java | 21 +++++++++-----------
2 files changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a7cc11f/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e0c096f..4da579c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -160,8 +160,17 @@ public class SSTableReader extends SSTable implements Closeable
partitioner,
System.currentTimeMillis(),
sstableMetadata);
- // don't save index summary to disk if we needed to build one
- sstable.load(false, false);
+
+ // special implementation of load to use non-pooled SegmentedFile builders
+ SegmentedFile.Builder ibuilder = new BufferedSegmentedFile.Builder();
+ SegmentedFile.Builder dbuilder = sstable.compression
+ ? new CompressedSegmentedFile.Builder()
+ : new BufferedSegmentedFile.Builder();
+ if (!loadSummary(sstable, ibuilder, dbuilder, sstable.metadata))
+ sstable.buildSummary(false, ibuilder, dbuilder, false);
+ sstable.ifile = ibuilder.complete(sstable.descriptor.filenameFor(Component.PRIMARY_INDEX));
+ sstable.dfile = dbuilder.complete(sstable.descriptor.filenameFor(Component.DATA));
+
sstable.bf = FilterFactory.AlwaysPresent;
return sstable;
}
@@ -411,7 +420,6 @@ public class SSTableReader extends SSTable implements Closeable
? SegmentedFile.getCompressedBuilder()
: SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode());
-
boolean summaryLoaded = loadSummary(this, ibuilder, dbuilder, metadata);
if (recreateBloomFilter || !summaryLoaded)
buildSummary(recreateBloomFilter, ibuilder, dbuilder, summaryLoaded);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a7cc11f/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
index 49972c8..790b42b 100644
--- a/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/BufferedSegmentedFile.java
@@ -19,7 +19,7 @@ package org.apache.cassandra.io.util;
import java.io.File;
-public class BufferedSegmentedFile extends PoolingSegmentedFile
+public class BufferedSegmentedFile extends SegmentedFile
{
public BufferedSegmentedFile(String path, long length)
{
@@ -28,20 +28,11 @@ public class BufferedSegmentedFile extends PoolingSegmentedFile
public static class Builder extends SegmentedFile.Builder
{
- /**
- * Adds a position that would be a safe place for a segment boundary in the file. For a block/row based file
- * format, safe boundaries are block/row edges.
- * @param boundary The absolute position of the potential boundary in the file.
- */
public void addPotentialBoundary(long boundary)
{
// only one segment in a standard-io file
}
- /**
- * Called after all potential boundaries have been added to apply this Builder to a concrete file on disk.
- * @param path The file on disk.
- */
public SegmentedFile complete(String path)
{
long length = new File(path).length();
@@ -49,8 +40,14 @@ public class BufferedSegmentedFile extends PoolingSegmentedFile
}
}
- protected RandomAccessReader createReader(String path)
+ public FileDataInput getSegment(long position)
+ {
+ RandomAccessReader reader = RandomAccessReader.open(new File(path));
+ reader.seek(position);
+ return reader;
+ }
+
+ public void cleanup()
{
- return RandomAccessReader.open(new File(path), this);
}
}