[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/thrift/CassandraServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5b2fa20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5b2fa20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5b2fa20
Branch: refs/heads/trunk
Commit: d5b2fa206fbbf308f65e153e865e2a36bccfda89
Parents: aa6233a 85ea373
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Nov 6 16:41:20 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Nov 6 16:41:20 2014 +0100
--
CHANGES.txt | 2 +
.../cql3/statements/BatchStatement.java | 7 +-
.../cql3/statements/ModificationStatement.java | 3 +-
.../cql3/statements/SelectStatement.java| 8 +-
.../apache/cassandra/service/ClientState.java | 36 +
.../apache/cassandra/service/QueryState.java| 5 +-
.../apache/cassandra/service/StorageProxy.java | 139 ++-
.../service/pager/MultiPartitionPager.java | 13 +-
.../service/pager/NamesQueryPager.java | 7 +-
.../cassandra/service/pager/QueryPagers.java| 30 ++--
.../service/pager/SliceQueryPager.java | 11 +-
.../cassandra/thrift/CassandraServer.java | 37 ++---
12 files changed, 206 insertions(+), 92 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5b2fa20/CHANGES.txt
--
diff --cc CHANGES.txt
index b23f756,5348f2f..79318fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,37 @@@
+3.0
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740,
7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+ 2.1.3
+ * Have paxos reuse the timestamp generation of normal queries
(CASSANDRA-7801)
2.1.2
* (cqlsh) parse_for_table_meta errors out on queries with undefined
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5b2fa20/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5b2fa20/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5b2fa20/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 686f50f,84cbdc0..b6cbd30
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -214,25 -212,27 +214,25 @@@ public class SelectStatement implement
if (pageSize = 0 || command == null ||
!QueryPagers.mayNeedPaging(command, pageSize))
{
- return
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/b4cbb28f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4cbb28f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4cbb28f Branch: refs/heads/trunk Commit: b4cbb28f3759fc92ab2a43432fcbce33bac60d7a Parents: d5b2fa2 9685622 Author: Joshua McKenzie jmcken...@apache.org Authored: Thu Nov 6 10:19:03 2014 -0600 Committer: Joshua McKenzie jmcken...@apache.org Committed: Thu Nov 6 10:19:03 2014 -0600 -- CHANGES.txt | 1 + .../cassandra/metrics/ColumnFamilyMetrics.java | 67 .../org/apache/cassandra/tools/NodeTool.java| 32 -- 3 files changed, 80 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4cbb28f/CHANGES.txt -- diff --cc CHANGES.txt index 79318fc,89db48e..92b2b2c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + 2.1.3 + * Fix overflow on histogram computation (CASSANDRA-8028) * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801) 2.1.2 http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4cbb28f/src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4cbb28f/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5edaa158 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5edaa158 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5edaa158 Branch: refs/heads/trunk Commit: 5edaa1589baec0d7b568497f0e238bc43df22dd5 Parents: 47099c2 40ba9fe Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Nov 5 17:06:37 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Nov 5 17:06:37 2014 +0300 -- .../org/apache/cassandra/config/CFMetaData.java | 66 +++- 1 file changed, 9 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5edaa158/src/java/org/apache/cassandra/config/CFMetaData.java -- diff --cc src/java/org/apache/cassandra/config/CFMetaData.java index 7c5db0a,5b97649..12808f1 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@@ -58,46 -40,15 +40,16 @@@ import org.apache.cassandra.cql3.QueryP import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.statements.CFStatement; import org.apache.cassandra.cql3.statements.CreateTableStatement; - import org.apache.cassandra.db.AbstractCell; - import org.apache.cassandra.db.AtomDeserializer; - import org.apache.cassandra.db.CFRowAdder; - import org.apache.cassandra.db.ColumnFamily; - import org.apache.cassandra.db.ColumnFamilyStore; - import org.apache.cassandra.db.ColumnFamilyType; - import org.apache.cassandra.db.ColumnSerializer; - import org.apache.cassandra.db.Directories; - import org.apache.cassandra.db.Keyspace; - import org.apache.cassandra.db.Mutation; - import org.apache.cassandra.db.OnDiskAtom; - import org.apache.cassandra.db.RangeTombstone; - import org.apache.cassandra.db.Row; - import org.apache.cassandra.db.SystemKeyspace; - import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; - import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; - import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy; - import org.apache.cassandra.db.compaction.WrappingCompactionStrategy; - import org.apache.cassandra.db.composites.CType; - import org.apache.cassandra.db.composites.CellName; - import org.apache.cassandra.db.composites.CellNameType; - import org.apache.cassandra.db.composites.CellNames; - import org.apache.cassandra.db.composites.Composite; - import org.apache.cassandra.db.composites.CompoundCType; - import org.apache.cassandra.db.composites.SimpleCType; + import org.apache.cassandra.db.*; + import org.apache.cassandra.db.compaction.*; + import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.index.SecondaryIndex; - import org.apache.cassandra.db.marshal.AbstractType; - import org.apache.cassandra.db.marshal.BytesType; - import org.apache.cassandra.db.marshal.CompositeType; - import org.apache.cassandra.db.marshal.CounterColumnType; - import org.apache.cassandra.db.marshal.LongType; - import org.apache.cassandra.db.marshal.TypeParser; - import org.apache.cassandra.db.marshal.UTF8Type; - import org.apache.cassandra.exceptions.ConfigurationException; - import org.apache.cassandra.exceptions.InvalidRequestException; - import org.apache.cassandra.exceptions.RequestValidationException; - import org.apache.cassandra.exceptions.SyntaxException; + import org.apache.cassandra.db.marshal.*; + import org.apache.cassandra.exceptions.*; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.io.compress.LZ4Compressor; --import org.apache.cassandra.io.sstable.Descriptor; ++import org.apache.cassandra.io.sstable.format.Version; ++import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.thrift.CfDef; import org.apache.cassandra.thrift.CqlResult;
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/70f1ac68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70f1ac68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70f1ac68 Branch: refs/heads/trunk Commit: 70f1ac680f43ca755cbb39672ae424b83de97f48 Parents: 51bbec7 6eef6f7 Author: Joshua McKenzie jmcken...@apache.org Authored: Wed Nov 5 12:18:09 2014 -0600 Committer: Joshua McKenzie jmcken...@apache.org Committed: Wed Nov 5 12:18:09 2014 -0600 -- CHANGES.txt | 1 + .../dht/AbstractByteOrderedPartitioner.java | 45 - .../org/apache/cassandra/dht/AbstractToken.java | 53 --- .../apache/cassandra/dht/BigIntegerToken.java | 7 +- .../org/apache/cassandra/dht/BytesToken.java| 12 +++- .../cassandra/dht/ComparableObjectToken.java| 69 .../org/apache/cassandra/dht/LocalToken.java| 21 +- .../org/apache/cassandra/dht/LongToken.java | 37 +-- .../cassandra/dht/Murmur3Partitioner.java | 3 +- .../org/apache/cassandra/dht/StringToken.java | 7 +- src/java/org/apache/cassandra/dht/Token.java| 2 + 11 files changed, 132 insertions(+), 125 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70f1ac68/CHANGES.txt -- diff --cc CHANGES.txt index 6ba76f9,a2bd3aa..ee05da9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ +3.0 + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Optimize partitioner tokens (CASSANDRA-8230) * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004) * Make cache serializers pluggable (CASSANDRA-8096) * Fix issues with CONTAINS (KEY) queries on secondary indexes http://git-wip-us.apache.org/repos/asf/cassandra/blob/70f1ac68/src/java/org/apache/cassandra/dht/BytesToken.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fd3349e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fd3349e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fd3349e Branch: refs/heads/trunk Commit: 4fd3349e2e63005b2d5422b7ef9c1637da0cb9bb Parents: 70f1ac6 4f863be Author: Jake Luciani j...@apache.org Authored: Wed Nov 5 15:44:03 2014 -0500 Committer: Jake Luciani j...@apache.org Committed: Wed Nov 5 15:44:03 2014 -0500 -- CHANGES.txt | 1 + bin/cassandra.bat | 2 +- bin/cassandra.in.sh | 2 +- build.xml | 14 +- conf/cassandra-env.ps1 | 2 +- conf/cassandra-env.sh | 2 +- debian/cassandra.in.sh | 2 +- lib/jamm-0.2.6.jar | Bin 13290 - 0 bytes lib/jamm-0.2.8.jar | Bin 0 - 13684 bytes lib/licenses/jamm-0.2.6.txt | 202 --- lib/licenses/jamm-0.2.8.txt | 202 +++ .../apache/cassandra/cql3/QueryProcessor.java | 2 +- .../org/apache/cassandra/utils/ObjectSizes.java | 3 +- 13 files changed, 218 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/CHANGES.txt -- diff --cc CHANGES.txt index ee05da9,2b9e10c..736c659 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ +3.0 + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209) * Optimize partitioner tokens (CASSANDRA-8230) * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004) * Make cache serializers pluggable (CASSANDRA-8096) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/bin/cassandra.bat -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/bin/cassandra.in.sh -- diff --cc bin/cassandra.in.sh index ed124bc,5b4ee0f..b4ed9b6 --- a/bin/cassandra.in.sh +++ b/bin/cassandra.in.sh @@@ -48,8 -48,5 +48,8 @@@ don if [ $JVM_VENDOR != OpenJDK -o $JVM_VERSION \ 1.6.0 ] \ || [ $JVM_VERSION = 1.6.0 -a $JVM_PATCH_VERSION -ge 23 ] then - JAVA_AGENT=$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar + JAVA_AGENT=$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.8.jar fi + +# Added sigar-bin to the java.library.path CASSANDRA-7838 +JAVA_OPTS=$JAVA_OPTS:-Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/build.xml -- diff --cc build.xml index
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/72d187c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72d187c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72d187c0
Branch: refs/heads/trunk
Commit: 72d187c0f32f820c86f18330aca916139d5c5c44
Parents: ee85a31 684b4f9
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Nov 4 09:42:59 2014 -0600
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Nov 4 09:42:59 2014 -0600
--
CHANGES.txt | 1 +
.../cassandra/db/CollationController.java | 1 +
.../cassandra/io/sstable/SSTableReaderTest.java | 28
3 files changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72d187c0/CHANGES.txt
--
diff --cc CHANGES.txt
index 08f5cd0,37b3f83..61d6226
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
+3.0
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740,
7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.2
+ * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239)
* Fix default timestamp in QueryOptions (CASSANDRA-8246)
* Set socket timeout when reading remote version (CASSANDRA-8188)
* Refactor how we track live size (CASSANDRA-7852)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72d187c0/src/java/org/apache/cassandra/db/CollationController.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72d187c0/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 5e15f80,ef6b14a..4421494
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@@ -211,9 -188,37 +211,37 @@@ public class SSTableReaderTes
}
@Test
+ public void testReadRateTracking()
+ {
+ // try to make sure CASSANDRA-8239 never happens again
+ Keyspace keyspace = Keyspace.open(Keyspace1);
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore(Standard1);
+
+ for (int j = 0; j 10; j++)
+ {
+ ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
+ Mutation rm = new Mutation(Keyspace1, key);
+ rm.add(Standard1, cellname(0),
ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+ rm.apply();
+ }
+ store.forceBlockingFlush();
+
+ SSTableReader sstable = store.getSSTables().iterator().next();
+ assertEquals(0, sstable.readMeter.count());
+
+ DecoratedKey key =
sstable.partitioner.decorateKey(ByteBufferUtil.bytes(4));
+ store.getColumnFamily(key, Composites.EMPTY, Composites.EMPTY, false,
100, 100);
+ assertEquals(1, sstable.readMeter.count());
+
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/87def12c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87def12c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87def12c Branch: refs/heads/trunk Commit: 87def12cb1802d6bdb562019249065d3fa93a913 Parents: 9bf17e1 0a0ba84 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Nov 5 03:19:27 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Nov 5 03:19:27 2014 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 68 +++- 2 files changed, 52 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87def12c/CHANGES.txt -- diff --cc CHANGES.txt index 7901aff,42cef8c..817cbcf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,5 +1,38 @@@ +3.0 + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Make cache serializers pluggable (CASSANDRA-8096) * Fix issues with CONTAINS (KEY) queries on secondary indexes (CASSANDRA-8147) * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239) http://git-wip-us.apache.org/repos/asf/cassandra/blob/87def12c/src/java/org/apache/cassandra/cache/AutoSavingCache.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/374d0cba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/374d0cba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/374d0cba Branch: refs/heads/trunk Commit: 374d0cbaed208b61ec7b80b00377b23587744899 Parents: 8174dab e3f4c6d Author: Joshua McKenzie jmcken...@apache.org Authored: Fri Oct 31 11:49:18 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Fri Oct 31 11:49:18 2014 -0500 -- bin/cassandra.ps1 | 94 + conf/cassandra-env.ps1 | 5 +++ 2 files changed, 99 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/374d0cba/conf/cassandra-env.ps1 --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/ba581f40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba581f40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba581f40 Branch: refs/heads/trunk Commit: ba581f40f9f6339008dbf0cfdd6dcc46081a2a9d Parents: 374d0cb a29ee07 Author: Joshua McKenzie jmcken...@apache.org Authored: Fri Oct 31 11:53:28 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Fri Oct 31 11:53:28 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 9 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba581f40/CHANGES.txt -- diff --cc CHANGES.txt index 9a81f73,494fb93..db3b091 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix shutdown when run as Windows service (CASSANDRA-8136) * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031) * Fix race in RecoveryManagerTest (CASSANDRA-8176) * Avoid IllegalArgumentException while sorting sstables in http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba581f40/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7c595cb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c595cb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c595cb8 Branch: refs/heads/trunk Commit: 7c595cb8097c27ab8aab7d4ca20e7cea4a390b91 Parents: 12fffc5 391f1d3 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Oct 29 18:45:14 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Oct 29 18:45:14 2014 -0500 -- CHANGES.txt | 1 + lib/cassandra-driver-internal-only-2.1.1.post.zip | Bin 130016 - 0 bytes lib/cassandra-driver-internal-only-2.1.2.zip | Bin 0 - 131353 bytes 3 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c595cb8/CHANGES.txt -- diff --cc CHANGES.txt index 19f37e8,f3201a1..9a81f73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031) * Fix race in RecoveryManagerTest (CASSANDRA-8176) * Avoid IllegalArgumentException while sorting sstables in IndexSummaryManager (CASSANDRA-8182)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/030aa57c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/030aa57c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/030aa57c Branch: refs/heads/trunk Commit: 030aa57cd254550f2c6e4eb36a050ea5bf3b4b16 Parents: 3329cd7 bb8cc62 Author: T Jake Luciani j...@apache.org Authored: Wed Oct 29 21:23:38 2014 -0400 Committer: T Jake Luciani j...@apache.org Committed: Wed Oct 29 21:23:38 2014 -0400 -- .../src/org/apache/cassandra/stress/settings/SettingsPort.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/708c6baf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/708c6baf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/708c6baf Branch: refs/heads/trunk Commit: 708c6bafabec84929fcd365a97eaf62918149c86 Parents: 95f9666 c937657 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Oct 28 11:35:14 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Oct 28 11:35:14 2014 -0500 -- CHANGES.txt | 2 + .../io/sstable/IndexSummaryManager.java | 46 +--- 2 files changed, 33 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/708c6baf/CHANGES.txt -- diff --cc CHANGES.txt index 2c75cbc,cdfd248..b186edc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,6 +1,38 @@@ +3.0 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Avoid IllegalArgumentException while sorting sstables in +IndexSummaryManager (CASSANDRA-8182) * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579) * Add 'die' policy for commit log and disk failure (CASSANDRA-7927) * Fix installing as service on Windows (CASSANDRA-8115) http://git-wip-us.apache.org/repos/asf/cassandra/blob/708c6baf/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/90890080 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90890080 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90890080 Branch: refs/heads/trunk Commit: 9089008007b72ccd25ada2e33c253646b3920ea8 Parents: 452dd10 7cf3f19 Author: Joshua McKenzie jmcken...@apache.org Authored: Fri Oct 24 11:05:13 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Fri Oct 24 11:05:13 2014 -0500 -- bin/cassandra.ps1 | 12 1 file changed, 8 insertions(+), 4 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/2976e693 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2976e693 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2976e693 Branch: refs/heads/trunk Commit: 2976e69372d261db8275e3cdba28669fab7f3c89 Parents: 9089008 658a65b Author: Vijay vijay2...@gmail.com Authored: Fri Oct 24 09:24:05 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Fri Oct 24 09:24:05 2014 -0700 -- src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2976e693/src/java/org/apache/cassandra/triggers/TriggerExecutor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: test/unit/org/apache/cassandra/db/CommitLogTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e39dc56e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e39dc56e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e39dc56e Branch: refs/heads/trunk Commit: e39dc56eda3e325d537da44def54d85749def9d2 Parents: 209ea6e d4df271 Author: Joshua McKenzie jmcken...@apache.org Authored: Fri Oct 24 12:31:51 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Fri Oct 24 12:31:51 2014 -0500 -- CHANGES.txt | 1 + conf/cassandra.yaml | 5 +- .../org/apache/cassandra/config/Config.java | 2 + .../cassandra/db/commitlog/CommitLog.java | 12 - .../org/apache/cassandra/io/util/FileUtils.java | 10 +++- .../cassandra/utils/JVMStabilityInspector.java | 50 ++- .../org/apache/cassandra/db/CommitLogTest.java | 45 +++-- .../utils/JVMStabilityInspectorTest.java| 51 .../apache/cassandra/utils/KillerForTests.java | 43 + 9 files changed, 197 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/CHANGES.txt -- diff --cc CHANGES.txt index 3f16e2e,4ed07a9..8821110 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927) * Fix installing as service on Windows (CASSANDRA-8115) * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/src/java/org/apache/cassandra/db/commitlog/CommitLog.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/src/java/org/apache/cassandra/io/util/FileUtils.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e39dc56e/test/unit/org/apache/cassandra/db/CommitLogTest.java -- diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java index 1383d78,8a1bb0c..987d744 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@@ -26,10 -26,7 +26,8 @@@ import java.util.concurrent.ExecutionEx import java.util.zip.CRC32; import java.util.zip.Checksum; - import
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/70bf377b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70bf377b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70bf377b Branch: refs/heads/trunk Commit: 70bf377b0efe17b7bd431b1504371f27b33834b1 Parents: 35648e8 1d5d303 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Thu Oct 23 22:55:21 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Thu Oct 23 22:55:21 2014 -0400 -- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70bf377b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/452dd108 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/452dd108 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452dd108 Branch: refs/heads/trunk Commit: 452dd10809b2eb1dd757e648c537f5117d04a0eb Parents: 70bf377 abbf634 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Thu Oct 23 23:24:30 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Thu Oct 23 23:24:30 2014 -0400 -- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/452dd108/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java -- diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index f6b3869,9c1118b..b536246 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@@ -41,18 -30,12 +40,21 @@@ import com.google.common.base.Splitter import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + import org.apache.commons.lang3.StringUtils; + + import org.apache.cassandra.hadoop.HadoopCompat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ColumnDefinitions; +import com.datastax.driver.core.ColumnMetadata; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.TupleValue; +import com.datastax.driver.core.UDTValue; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.hadoop.ColumnFamilySplit;
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e6eb0e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e6eb0e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e6eb0e7 Branch: refs/heads/trunk Commit: 5e6eb0e723e2b95c90d54a79336f77b46053cf6b Parents: f267308 94fea8d Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Oct 22 17:54:56 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Oct 22 17:54:56 2014 +0300 -- CHANGES.txt | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e6eb0e7/CHANGES.txt -- diff --cc CHANGES.txt index bc0269f,5882080..0c302bb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,7 +1,39 @@@ +3.0 + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + + 2.1.2 + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) + + 2.1.1 * Dont notify when replacing tmplink files (CASSANDRA-8157) * Fix validation with multiple CONTAINS clause (CASSANDRA-8131)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/ColumnStats.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6c9d282 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6c9d282 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6c9d282 Branch: refs/heads/trunk Commit: f6c9d282bd54894438a19a98b7b8716f052d5a63 Parents: 5e6eb0e c774ea3 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Oct 22 11:28:58 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Oct 22 11:28:58 2014 -0500 -- CHANGES.txt | 2 +- src/java/org/apache/cassandra/io/sstable/ColumnStats.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6c9d282/CHANGES.txt -- diff --cc CHANGES.txt index 0c302bb,4dfb81d..4ed5860 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,6 +1,37 @@@ +3.0 - * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) 2.1.1 http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6c9d282/src/java/org/apache/cassandra/io/sstable/ColumnStats.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7dda131a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dda131a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dda131a Branch: refs/heads/trunk Commit: 7dda131a5f109799ead6c5766fb7fad56138ba76 Parents: f6c9d28 51b27f2 Author: Joshua McKenzie jmcken...@apache.org Authored: Wed Oct 22 12:13:39 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Wed Oct 22 12:13:39 2014 -0500 -- CHANGES.txt| 1 + bin/cassandra.bat | 51 ++ bin/cassandra.ps1 | 103 +++- conf/cassandra-env.ps1 | 5 +++ 4 files changed, 103 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/CHANGES.txt -- diff --cc CHANGES.txt index 4ed5860,24e0d36..0dae098 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +1,36 @@@ +3.0 + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix installing as service on Windows (CASSANDRA-8115) * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/bin/cassandra.bat -- diff --cc bin/cassandra.bat index cba69c6,31a0235..7a41e90 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@@ -67,11 -68,9 +68,10 @@@ set JAVA_OPTS=-ea -Dcom.sun.management.jmxremote.port=7199^ -Dcom.sun.management.jmxremote.ssl=false^ -Dcom.sun.management.jmxremote.authenticate=false^ - -Dlogback.configurationFile=logback.xml + -Dlogback.configurationFile=logback.xml^ + -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin REM * CLASSPATH library setting * - REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH=%CASSANDRA_HOME%\conf http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/conf/cassandra-env.ps1 --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/a1f7ccfb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f7ccfb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f7ccfb Branch: refs/heads/trunk Commit: a1f7ccfb2446b332a42f95cb57bfa53fdf625df5 Parents: 7dda131 b21bb3f Author: Joshua McKenzie jmcken...@apache.org Authored: Wed Oct 22 13:42:48 2014 -0500 Committer: Joshua McKenzie jmcken...@apache.org Committed: Wed Oct 22 13:42:48 2014 -0500 -- bin/cassandra.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/0be66837 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0be66837 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0be66837 Branch: refs/heads/trunk Commit: 0be66837e154e781677f84801bfdc4d2f54a1cdb Parents: 49833b9 be3b380 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Oct 21 02:11:18 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Oct 21 02:11:18 2014 +0300 -- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0be66837/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/fd63d2ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd63d2ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd63d2ae Branch: refs/heads/trunk Commit: fd63d2ae2b621be2820a10aa23048c72e4c4baf8 Parents: 0be6683 ec866fa Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Oct 21 02:30:22 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Oct 21 02:30:22 2014 +0300 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd63d2ae/CHANGES.txt -- diff --cc CHANGES.txt index bce4ddd,815bce1..c1d262d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Fix validation of collections in TriggerExecutor (CASSANDRA-8146) * Fix IllegalArgumentException when a list of IN values containing tuples is passed as a single arg to a prepared statement with the v1 or v2 protocol (CASSANDRA-8062)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/08a868f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08a868f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08a868f2 Branch: refs/heads/trunk Commit: 08a868f2cb8b85e9a886081029cb72d22b9ba6b7 Parents: 96f40e6 1ef7d05 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Oct 16 11:24:46 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Oct 16 11:24:46 2014 -0500 -- CHANGES.txt| 3 +++ src/java/org/apache/cassandra/cql3/Tuples.java | 8 2 files changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08a868f2/CHANGES.txt -- diff --cc CHANGES.txt index 84bbbfb,9d10d84..c0b7a86 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,7 +1,37 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Fix IllegalArgumentException when a list of IN values containing tuples +is passed as a single arg to a prepared statement with the v1 or v2 +protocol (CASSANDRA-8062) * Fix ClassCastException in DISTINCT query on static columns with query paging (CASSANDRA-8108) * Fix NPE on null nested UDT inside a set (CASSANDRA-8105) http://git-wip-us.apache.org/repos/asf/cassandra/blob/08a868f2/src/java/org/apache/cassandra/cql3/Tuples.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/dfda97cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfda97cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfda97cb Branch: refs/heads/trunk Commit: dfda97cbfa3330a18fda76a5d96dc70be7c52c0c Parents: 18886e1 f16507d Author: Tyler Hobbs tylerho...@apache.org Authored: Wed Oct 15 11:38:13 2014 -0500 Committer: Tyler Hobbs tylerho...@apache.org Committed: Wed Oct 15 11:38:13 2014 -0500 -- CHANGES.txt | 2 ++ .../cassandra/transport/messages/ErrorMessage.java | 15 ++- 2 files changed, 16 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfda97cb/CHANGES.txt -- diff --cc CHANGES.txt index be84b11,0ae7af9..4a669c2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,6 +1,36 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Send proper error response when there is an error during native +protocol message decode (CASSANDRA-8118) * Gossip should ignore generation numbers too far in the future (CASSANDRA-8113) * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104) * Fix high memory use due to tracking reads on incrementally opened sstable
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/filter/ExtendedFilter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2df76e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2df76e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2df76e0 Branch: refs/heads/trunk Commit: e2df76e02454ff0b947b5ebc791f8f81c0696922 Parents: dfda97c f54cd98 Author: Tyler Hobbs tylerho...@apache.org Authored: Wed Oct 15 12:13:23 2014 -0500 Committer: Tyler Hobbs tylerho...@apache.org Committed: Wed Oct 15 12:13:23 2014 -0500 -- CHANGES.txt | 2 ++ .../cassandra/db/filter/ExtendedFilter.java | 23 +- .../CompositesIndexOnCollectionKey.java | 2 +- .../cassandra/cql3/ContainsRelationTest.java| 25 4 files changed, 50 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2df76e0/CHANGES.txt -- diff --cc CHANGES.txt index 4a669c2,4da1e56..8248d76 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,6 +1,36 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Fix exception when querying secondary index on set items or map keys +when some clustering columns are specified (CASSANDRA-8073) * Send proper error response when there is an error during native protocol message decode (CASSANDRA-8118) * Gossip should ignore generation numbers too far in the future (CASSANDRA-8113) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2df76e0/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/2623982e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2623982e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2623982e Branch: refs/heads/trunk Commit: 2623982e8b6f03b703eddaf830b69cc2dcafff5d Parents: e2df76e ba79107 Author: Tyler Hobbs tylerho...@apache.org Authored: Wed Oct 15 12:15:41 2014 -0500 Committer: Tyler Hobbs tylerho...@apache.org Committed: Wed Oct 15 12:15:41 2014 -0500 -- src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 2 ++ 1 file changed, 2 insertions(+) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/e1c5ebde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1c5ebde Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1c5ebde Branch: refs/heads/trunk Commit: e1c5ebde324b5eb7b22901020444de9761513840 Parents: 2623982 f6ea46e Author: Tyler Hobbs tylerho...@apache.org Authored: Wed Oct 15 13:49:07 2014 -0500 Committer: Tyler Hobbs tylerho...@apache.org Committed: Wed Oct 15 13:49:07 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/db/marshal/TupleType.java | 5 + .../org/apache/cassandra/cql3/UserTypesTest.java | 19 +++ 3 files changed, 21 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1c5ebde/CHANGES.txt -- diff --cc CHANGES.txt index 8248d76,0d39416..4237862 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Fix NPE on null nested UDT inside a set (CASSANDRA-8105) * Fix exception when querying secondary index on set items or map keys when some clustering columns are specified (CASSANDRA-8073) * Send proper error response when there is an error during native http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1c5ebde/src/java/org/apache/cassandra/db/marshal/TupleType.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/3a822ca2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a822ca2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a822ca2 Branch: refs/heads/trunk Commit: 3a822ca230e8bb37d9a0bd5b82b546af2ed68b1b Parents: 3ef8920 932b5eb Author: Tyler Hobbs tylerho...@apache.org Authored: Tue Oct 14 15:29:49 2014 -0500 Committer: Tyler Hobbs tylerho...@apache.org Committed: Tue Oct 14 15:29:49 2014 -0500 -- CHANGES.txt | 4 +++- src/java/org/apache/cassandra/cql3/CQL3Type.java | 8 +--- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a822ca2/CHANGES.txt -- diff --cc CHANGES.txt index 435562b,1c7ee38..5dac7f4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,7 +1,37 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 - * Fix high memory use due to tracking reads on incrementally opened sstable readers (CASSANDRA-8066) + * Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104) + * Fix high memory use due to tracking reads on incrementally opened sstable +readers (CASSANDRA-8066) * Fix EXECUTE request with skipMetadata=false returning no metadata (CASSANDRA-8054) * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/18549038
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18549038
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18549038
Branch: refs/heads/trunk
Commit: 18549038a1ea76a48b2bb4a3eede642978ef966d
Parents: 6630b87 8be8a08
Author: Jason Brown jasedbr...@gmail.com
Authored: Tue Oct 14 14:56:33 2014 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Tue Oct 14 14:56:33 2014 -0700
--
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 11 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18549038/CHANGES.txt
--
diff --cc CHANGES.txt
index 5dac7f4,6d9d221..be84b11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
+3.0
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740,
7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.1
+ * Gossip should ignore generation numbers too far in the future
(CASSANDRA-8113)
* Fix NPE when creating a table with frozen sets, lists (CASSANDRA-8104)
* Fix high memory use due to tracking reads on incrementally opened sstable
readers (CASSANDRA-8066)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18549038/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c488b09,ae8bf32..364837d
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -990,12 -985,18 +993,18 @@@ public class Gossiper implements IFailu
int localGeneration =
localEpStatePtr.getHeartBeatState().getGeneration();
int remoteGeneration =
remoteState.getHeartBeatState().getGeneration();
if (logger.isTraceEnabled())
-logger.trace(ep + local generation + localGeneration +
, remote generation + remoteGeneration);
+logger.trace({} local generation {}, remote generation
{}, ep, localGeneration, remoteGeneration);
- if (remoteGeneration localGeneration)
+ if (remoteGeneration localGeneration +
MAX_GENERATION_DIFFERENCE)
+ {
+ // assume some peer has corrupted memory and is
broadcasting an unbelievable generation about another peer (or itself)
+ logger.warn(received an invalid gossip generation for
peer {}; local generation = {}, received generation = {}, ep, localGeneration,
remoteGeneration);
+ continue;
+ }
+ else if (remoteGeneration localGeneration)
{
if (logger.isTraceEnabled())
-logger.trace(Updating heartbeat state generation to
+ remoteGeneration + from + localGeneration + for + ep);
+logger.trace(Updating heartbeat state generation to
{} from {} for {}, remoteGeneration, localGeneration, ep);
// major state change will handle the update by inserting
the remote
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/18886e12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18886e12 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18886e12 Branch: refs/heads/trunk Commit: 18886e128bfb1e85456dee61f64378fe5a9ff3d1 Parents: 1854903 311 Author: Jason Brown jasedbr...@gmail.com Authored: Tue Oct 14 14:59:52 2014 -0700 Committer: Jason Brown jasedbr...@gmail.com Committed: Tue Oct 14 14:59:52 2014 -0700 -- src/java/org/apache/cassandra/gms/Gossiper.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18886e12/src/java/org/apache/cassandra/gms/Gossiper.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/a19c9128 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a19c9128 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a19c9128 Branch: refs/heads/trunk Commit: a19c9128010a2925b9654976b5123df87f4b35a7 Parents: 27fdf42 63cb95e Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Oct 14 00:25:56 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Oct 14 00:25:56 2014 +0300 -- .../org/apache/cassandra/cql3/ResultSet.java| 2 +- .../cql3/PreparedStatementCleanupTest.java | 86 - .../cassandra/cql3/PreparedStatementsTest.java | 122 +++ 3 files changed, 123 insertions(+), 87 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a19c9128/src/java/org/apache/cassandra/cql3/ResultSet.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50734f20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50734f20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50734f20 Branch: refs/heads/trunk Commit: 50734f2073e3155e3b82de64ff078fad03251809 Parents: a9bad89 1452134 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Thu Oct 9 10:44:35 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Thu Oct 9 10:44:35 2014 -0500 -- CHANGES.txt | 1 + .../cassandra/auth/CassandraAuthorizer.java | 6 +-- .../AbstractTracingAwareExecutorService.java| 2 + .../DebuggableScheduledThreadPoolExecutor.java | 7 ++- .../apache/cassandra/concurrent/SEPWorker.java | 3 ++ .../db/commitlog/CommitLogReplayer.java | 1 + .../db/commitlog/CommitLogSegmentManager.java | 2 + .../db/compaction/CompactionManager.java| 6 +-- .../cassandra/db/compaction/Scrubber.java | 2 + src/java/org/apache/cassandra/gms/Gossiper.java | 2 + .../io/sstable/SSTableSimpleUnsortedWriter.java | 2 + .../org/apache/cassandra/io/util/FileUtils.java | 5 ++- .../cassandra/service/CassandraDaemon.java | 20 ++--- .../cassandra/service/StorageService.java | 18 ++-- .../cassandra/streaming/ConnectionHandler.java | 6 ++- .../streaming/messages/IncomingFileMessage.java | 6 ++- .../org/apache/cassandra/tools/NodeProbe.java | 6 ++- .../cassandra/tools/SSTableLevelResetter.java | 6 ++- .../org/apache/cassandra/transport/Message.java | 6 ++- .../org/apache/cassandra/utils/CLibrary.java| 1 + .../cassandra/utils/FastByteOperations.java | 4 +- .../cassandra/utils/JVMStabilityInspector.java | 45 .../apache/cassandra/utils/ResourceWatcher.java | 1 + 23 files changed, 117 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50734f20/CHANGES.txt -- diff --cc CHANGES.txt index 49f6006,8d64d34..16b450a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Support for scripting languages in user-defined functions (CASSANDRA-7526) + * Support for aggregation functions (CASSANDRA-4914) + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Shutdown JVM on OOM (CASSANDRA-7507) * Upgrade netty version and enable epoll event loop (CASSANDRA-7761) * Don't duplicate sstables smaller than split size when using the sstablesplitter tool (CASSANDRA-7616) http://git-wip-us.apache.org/repos/asf/cassandra/blob/50734f20/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 0f8acba,51f45b8..b08668e --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -1040,74 -986,64 +1037,75 @@@ public class
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/ResultSet.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/985c510c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/985c510c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/985c510c
Branch: refs/heads/trunk
Commit: 985c510c4bb05e83dd9e6edd8a749e1a84ff69f3
Parents: 861c4cf 0249363
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Oct 9 20:56:47 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Oct 9 20:56:47 2014 +0200
--
CHANGES.txt | 2 ++
.../org/apache/cassandra/cql3/ResultSet.java| 30
.../cql3/statements/SelectStatement.java| 5 +++-
.../cassandra/cql3/statements/Selection.java| 2 +-
.../transport/messages/ResultMessage.java | 5
5 files changed, 19 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/985c510c/CHANGES.txt
--
diff --cc CHANGES.txt
index be80ee3,688dc32..432299a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,6 +1,39 @@@
+3.0
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for scripting languages in user-defined functions (CASSANDRA-7526)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Improve query to read paxos table on propose (CASSANDRA-7929)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Optimize java source-based UDF invocation (CASSANDRA-7924)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+
+
2.1.1
+ * Fix EXECUTE request with skipMetadata=false returning no metadata
+(CASSANDRA-8054)
* Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
* Shutdown JVM on OOM (CASSANDRA-7507)
* Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/985c510c/src/java/org/apache/cassandra/cql3/ResultSet.java
--
diff --cc src/java/org/apache/cassandra/cql3/ResultSet.java
index a8a5081,3928060..fd45570
--- a/src/java/org/apache/cassandra/cql3/ResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/ResultSet.java
@@@ -92,16 -92,27 +92,6 @@@ public class ResultSe
}
}
- public ResultSet withPagingState(PagingState state)
- {
- if (state == null)
- return this;
-
- // The metadata is shared by all execution of a given statement. So
if there is a paging state
- // we need to copy the metadata
- return new ResultSet(metadata.withPagingState(state), rows);
- }
-
-public ResultSet makeCountResult(ColumnIdentifier alias)
-{
-assert metadata.names != null;
-String ksName = metadata.names.get(0).ksName;
-String cfName = metadata.names.get(0).cfName;
-long count = rows.size();
-return makeCountResult(ksName, cfName, count, alias);
-}
-
-public static ResultSet.Metadata makeCountMetadata(String ksName, String
cfName, ColumnIdentifier alias)
-{
-ColumnSpecification spec = new ColumnSpecification(ksName, cfName,
alias == null ?
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/5c35f920 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c35f920 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c35f920 Branch: refs/heads/trunk Commit: 5c35f9203f1af8fccd7ea9b65a00b4967a55d2e5 Parents: 985c510 1bae25a Author: Jake Luciani j...@apache.org Authored: Thu Oct 9 17:16:56 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Thu Oct 9 17:16:56 2014 -0400 -- src/java/org/apache/cassandra/transport/Server.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c35f920/src/java/org/apache/cassandra/transport/Server.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/194a72f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/194a72f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/194a72f6 Branch: refs/heads/trunk Commit: 194a72f64d7640dc8774e1cd9cab2cd422c76470 Parents: 2d33cbf 186e994 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Oct 8 10:58:03 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Oct 8 10:58:03 2014 -0500 -- CHANGES.txt | 2 ++ .../apache/cassandra/tools/StandaloneSplitter.java | 16 2 files changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/194a72f6/CHANGES.txt -- diff --cc CHANGES.txt index 707fab7,c6735bc..d3f2046 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,6 +1,37 @@@ +3.0 + * Support for aggregation functions (CASSANDRA-4914) + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Don't duplicate sstables smaller than split size when using +the sstablesplitter tool (CASSANDRA-7616) * Avoid re-parsing already prepared statements (CASSANDRA-7923) * Fix some Thrift slice deletions and updates of COMPACT STORAGE tables with some clustering columns omitted (CASSANDRA-7990) http://git-wip-us.apache.org/repos/asf/cassandra/blob/194a72f6/src/java/org/apache/cassandra/tools/StandaloneSplitter.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: NEWS.txt src/java/org/apache/cassandra/transport/Server.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a848b08c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a848b08c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a848b08c Branch: refs/heads/trunk Commit: a848b08ceb4873cc773919a0065346bba5e9cafb Parents: 816c905 dacddd2 Author: Jake Luciani j...@apache.org Authored: Wed Oct 8 16:34:35 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Oct 8 16:34:35 2014 -0400 -- CHANGES.txt | 1 + NEWS.txt| 9 + build.xml | 4 +- lib/licenses/netty-all-4.0.20.Final.txt | 202 --- lib/licenses/netty-all-4.0.23.Final.txt | 202 +++ lib/netty-all-4.0.20.Final.jar | Bin 1721619 - 0 bytes lib/netty-all-4.0.23.Final.jar | Bin 0 - 1779991 bytes .../org/apache/cassandra/transport/Server.java | 22 +- 8 files changed, 234 insertions(+), 206 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/CHANGES.txt -- diff --cc CHANGES.txt index 9d522b7,159979f..79cc6f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,37 @@@ +3.0 + * Support for scripting languages in user-defined functions (CASSANDRA-7526) + * Support for aggregation functions (CASSANDRA-4914) + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Upgrade netty version and enable epoll event loop (CASSANDRA-7761) * Don't duplicate sstables smaller than split size when using the sstablesplitter tool (CASSANDRA-7616) * Avoid re-parsing already prepared statements (CASSANDRA-7923) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a848b08c/NEWS.txt -- diff --cc NEWS.txt index 74ebb41,74fe652..99144ca --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,27 -13,15 +13,36 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +3.0 +=== + +New features + + - SSTable file name is changed. Now you don't have Keyspace/CF name + in file name. Also, secondary index has its own directory under parent's + directory. + + +Upgrading +- + - cassandra-cli has been removed. Please use cqlsh instead. + - YamlFileNetworkTopologySnitch has been removed; switch to + GossipingPropertyFileSnitch instead. + - CQL2 has been removed entirely in this release (previously deprecated + in 2.0.0). Please switch to CQL3 if you haven't already done so. + - Very large batches will now be rejected (defaults to 50kb). This + can be customized by modifying batch_size_fail_threshold_in_kb. + + + 2.1.1 + = + + New features + +- Netty support for epoll on linux is now enabled. If for some + reason you want to disable it pass, the following system property +
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/8a8d35e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a8d35e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a8d35e6 Branch: refs/heads/trunk Commit: 8a8d35e6d8e48cbedd6ca0bf8f0b50fa286a978e Parents: 0cad81a 8d20b48 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Oct 7 10:23:05 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Oct 7 10:23:05 2014 -0500 -- CHANGES.txt | 1 + .../cassandra/db/filter/ExtendedFilter.java | 15 +--- .../cassandra/cql3/ContainsRelationTest.java| 24 3 files changed, 37 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/CHANGES.txt -- diff --cc CHANGES.txt index 132396e,6949209..47c3e74 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +1,36 @@@ +3.0 + * Support for aggregation functions (CASSANDRA-4914) + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Fix filtering for CONTAINS on sets (CASSANDRA-8033) * Properly track added size (CASSANDRA-7239) * Allow compilation in java 8 (CASSANDRA-7208) * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a8d35e6/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7f26410a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f26410a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f26410a Branch: refs/heads/trunk Commit: 7f26410a751443ac96895d4078e2d746de4101e1 Parents: 8a8d35e 071b5f8 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Oct 7 10:34:47 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Oct 7 10:34:47 2014 -0500 -- CHANGES.txt | 2 ++ .../apache/cassandra/db/composites/AbstractCellNameType.java | 1 + .../cassandra/db/composites/CompoundDenseCellNameType.java| 7 +++ src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f26410a/CHANGES.txt -- diff --cc CHANGES.txt index 47c3e74,6a87f64..6245d72 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,6 +1,37 @@@ +3.0 + * Support for aggregation functions (CASSANDRA-4914) + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Fix some Thrift slice deletions and updates of COMPACT STORAGE +tables with some clustering columns omitted (CASSANDRA-7990) * Fix filtering for CONTAINS on sets (CASSANDRA-8033) * Properly track added size (CASSANDRA-7239) * Allow compilation in java 8 (CASSANDRA-7208) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f26410a/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/54e42478 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54e42478 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54e42478 Branch: refs/heads/trunk Commit: 54e42478122e38c69ddf76b8f38b3dbe95e6c9f8 Parents: 17a4fbd 67d476d Author: Jake Luciani j...@apache.org Authored: Tue Oct 7 12:22:14 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Tue Oct 7 12:22:14 2014 -0400 -- tools/stress/src/org/apache/cassandra/stress/Stress.java | 2 ++ 1 file changed, 2 insertions(+) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/RowDataResolver.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36edbda6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36edbda6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36edbda6
Branch: refs/heads/trunk
Commit: 36edbda64185fc7ecffc93e7de3a4a67e1cec064
Parents: 54e4247 ba50db4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Oct 8 00:04:20 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Oct 8 00:04:20 2014 +0300
--
src/java/org/apache/cassandra/service/RowDataResolver.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36edbda6/src/java/org/apache/cassandra/service/RowDataResolver.java
--
diff --cc src/java/org/apache/cassandra/service/RowDataResolver.java
index 6c222d5,e92dad7..44b341b
--- a/src/java/org/apache/cassandra/service/RowDataResolver.java
+++ b/src/java/org/apache/cassandra/service/RowDataResolver.java
@@@ -159,7 -159,8 +159,8 @@@ public class RowDataResolver extends Ab
public Row getData()
{
+ assert !replies.isEmpty();
-return replies.peek().payload.row();
+return replies.get(0).payload.row();
}
public boolean isDataPresent()
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/CassandraServer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a249f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a249f26
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a249f26
Branch: refs/heads/trunk
Commit: 5a249f26cc2a2792b0a0aae3cc3775bc9266
Parents: 2e8ba03 24c181f
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Oct 7 18:07:36 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Oct 7 18:07:36 2014 -0500
--
CHANGES.txt | 1 +
.../org/apache/cassandra/cql3/QueryHandler.java | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 70 ++--
.../cassandra/thrift/CassandraServer.java | 9 +--
4 files changed, 57 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a249f26/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ded509,b6299c7..707fab7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
+3.0
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Improve query to read paxos table on propose (CASSANDRA-7929)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Optimize java source-based UDF invocation (CASSANDRA-7924)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+
+
2.1.1
+ * Avoid re-parsing already prepared statements (CASSANDRA-7923)
* Fix some Thrift slice deletions and updates of COMPACT STORAGE
tables with some clustering columns omitted (CASSANDRA-7990)
* Fix filtering for CONTAINS on sets (CASSANDRA-8033)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a249f26/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a249f26/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index 713fd8f,2e76ee4..795dabf
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -44,7 -45,10 +44,8 @@@ import org.apache.cassandra.config.CFMe
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.config.Schema;
-import org.apache.cassandra.cql.CQLStatement;
-import org.apache.cassandra.cql.QueryProcessor;
import org.apache.cassandra.cql3.QueryOptions;
+ import org.apache.cassandra.cql3.statements.ParsedStatement;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.composites.*;
import org.apache.cassandra.db.context.CounterContext;
@@@ -1969,23 -2024,8 +1970,23 @@@ public class CassandraServer implement
try
{
-cState.validateLogin();
-return cState.getCQLQueryHandler().prepare(queryString,
cState.getQueryState()).toThriftPreparedResult();
+ThriftClientState cState = state();
- org.apache.cassandra.cql3.CQLStatement statement =
cState.getCQLQueryHandler().getPreparedForThrift(itemId);
++ParsedStatement.Prepared prepared =
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/2d33cbff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d33cbff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d33cbff Branch: refs/heads/trunk Commit: 2d33cbff3cec3feb76104443b6faf36a3dacfe62 Parents: 5a249f2 38fe0ca Author: Dave Brosius dbros...@mebigfatguy.com Authored: Tue Oct 7 22:00:10 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Tue Oct 7 22:00:10 2014 -0400 -- src/java/org/apache/cassandra/streaming/StreamException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/68371c65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68371c65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68371c65 Branch: refs/heads/trunk Commit: 68371c655c4a6f4590c3fd9200a0042009ca7e5a Parents: 50c5da9 6c3a3e1 Author: Marcus Eriksson marc...@apache.org Authored: Mon Oct 6 12:44:48 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Oct 6 12:44:48 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/68371c65/CHANGES.txt -- diff --cc CHANGES.txt index dc9a32f,7cce86e..8ecafd5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,5 +1,35 @@@ +3.0 + * Improve query to read paxos table on propose (CASSANDRA-7929) + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Properly track added size (CASSANDRA-7239) * Allow compilation in java 8 (CASSANDRA-7208) * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) * Release references to overlapping sstables during compaction (CASSANDRA-7819)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/bc246e13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc246e13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc246e13 Branch: refs/heads/trunk Commit: bc246e13261dff243e4d1d0dd4e954200b1a9330 Parents: 68371c6 a8052d7 Author: Jake Luciani j...@apache.org Authored: Mon Oct 6 10:38:03 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Mon Oct 6 10:38:03 2014 -0400 -- .../org/apache/cassandra/stress/generate/Partition.java | 7 +-- .../stress/operations/userdefined/SchemaInsert.java | 11 +-- 2 files changed, 14 insertions(+), 4 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/3afd0a86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3afd0a86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3afd0a86 Branch: refs/heads/trunk Commit: 3afd0a86d368bf86a727b61fb764bbf59a5bf7aa Parents: 6249189 b760990 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Mon Oct 6 15:14:24 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Mon Oct 6 15:14:24 2014 -0500 -- conf/cassandra-env.ps1 | 73 + 1 file changed, 73 insertions(+) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/50c5da99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50c5da99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50c5da99 Branch: refs/heads/trunk Commit: 50c5da991c4d1f8729469e8aab535b8e18879f2e Parents: ba6bc8d aca80da Author: Jake Luciani j...@apache.org Authored: Fri Oct 3 16:59:30 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Oct 3 16:59:30 2014 -0400 -- .../apache/cassandra/stress/StressProfile.java | 19 ++- .../stress/settings/SettingsCommandUser.java | 11 ++- 2 files changed, 20 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50c5da99/tools/stress/src/org/apache/cassandra/stress/StressProfile.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/be199a07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be199a07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be199a07 Branch: refs/heads/trunk Commit: be199a07cc6108187bfc7f72bc2efaa6cc34ebf7 Parents: e93bcdf b701dd5 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Oct 2 10:21:45 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Oct 2 10:21:45 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/Server.java | 8 ++-- test/unit/org/apache/cassandra/cql3/DeleteTest.java | 5 - 3 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be199a07/CHANGES.txt -- diff --cc CHANGES.txt index 04446fe,d83b86f..12ebfb5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Make native server start block until properly bound (CASSANDRA-7885) * (cqlsh) Fix IPv6 support (CASSANDRA-7988) * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939) * Make sstablerepairedset take a list of files (CASSANDRA-7995) http://git-wip-us.apache.org/repos/asf/cassandra/blob/be199a07/src/java/org/apache/cassandra/transport/Server.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/d92932ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d92932ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d92932ac Branch: refs/heads/trunk Commit: d92932ac4798b6d3037b36907690a67d4bb9d3eb Parents: 906fd4d 31235bc Author: Marcus Eriksson marc...@apache.org Authored: Thu Oct 2 10:54:56 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Oct 2 10:54:56 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d92932ac/CHANGES.txt -- diff --cc CHANGES.txt index 8c75d6c,306fdca..6d66647 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Send notification when opening compaction results early (CASSANDRA-8034) * Make native server start block until properly bound (CASSANDRA-7885) * (cqlsh) Fix IPv6 support (CASSANDRA-7988) * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/0db50745 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0db50745 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0db50745 Branch: refs/heads/trunk Commit: 0db5074549987c5b534f5b5ddf9402aea7a3d837 Parents: b912505 0793e56 Author: Marcus Eriksson marc...@apache.org Authored: Thu Oct 2 11:35:12 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Thu Oct 2 11:35:12 2014 +0200 -- CHANGES.txt | 1 + .../db/compaction/CompactionController.java | 24 ++-- .../cassandra/db/compaction/CompactionTask.java | 7 ++ 3 files changed, 30 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db50745/CHANGES.txt -- diff --cc CHANGES.txt index 1b032e4,95218cb..5aec2e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Release references to overlapping sstables during compaction (CASSANDRA-7819) * Send notification when opening compaction results early (CASSANDRA-8034) * Make native server start block until properly bound (CASSANDRA-7885) * (cqlsh) Fix IPv6 support (CASSANDRA-7988) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db50745/src/java/org/apache/cassandra/db/compaction/CompactionTask.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/4bb8f14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb8f14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb8f14a
Branch: refs/heads/trunk
Commit: 4bb8f14a5b2e528bc3cb14810ee29e83072d507a
Parents: 0db5074 1c39320
Author: Marcus Eriksson marc...@apache.org
Authored: Thu Oct 2 11:49:10 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Thu Oct 2 13:12:58 2014 +0200
--
.../cassandra/db/marshal/DynamicCompositeTypeTest.java| 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb8f14a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
--
diff --cc
test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index eaedb4b,e248eae..d36150a
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@@ -214,8 -197,8 +214,8 @@@ public class DynamicCompositeTypeTes
@Test
public void testFullRoundReversed() throws Exception
{
--Keyspace keyspace = Keyspace.open(Keyspace1);
--ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
++Keyspace keyspace = Keyspace.open(KEYSPACE1);
++ColumnFamilyStore cfs =
keyspace.getColumnFamilyStore(CF_STANDARDDYNCOMPOSITE);
ByteBuffer cname1 = createDynamicCompositeKey(test1, null, -1,
false, true);
ByteBuffer cname2 = createDynamicCompositeKey(test1, uuids[0], 24,
false, true);
@@@ -224,7 -207,7 +224,7 @@@
ByteBuffer cname5 = createDynamicCompositeKey(test2, uuids[1], 42,
false, true);
ByteBuffer key = ByteBufferUtil.bytes(kr);
- RowMutation rm = new RowMutation(Keyspace1, key);
-Mutation rm = new Mutation(Keyspace1, key);
++Mutation rm = new Mutation(KEYSPACE1, key);
addColumn(rm, cname5);
addColumn(rm, cname1);
addColumn(rm, cname4);
@@@ -232,9 -215,9 +232,9 @@@
addColumn(rm, cname3);
rm.apply();
--ColumnFamily cf =
cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(kr), cfName,
System.currentTimeMillis()));
++ColumnFamily cf =
cfs.getColumnFamily(QueryFilter.getIdentityFilter(Util.dk(kr),
CF_STANDARDDYNCOMPOSITE, System.currentTimeMillis()));
- IteratorColumn iter = cf.getSortedColumns().iterator();
+ IteratorCell iter = cf.getSortedColumns().iterator();
assert iter.next().name().equals(cname5);
assert iter.next().name().equals(cname4);
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/d4c1e9c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4c1e9c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4c1e9c7 Branch: refs/heads/trunk Commit: d4c1e9c7da20e931089482fca1365da571959fe9 Parents: dd8c129 f0893f5 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Oct 2 11:59:38 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Oct 2 11:59:38 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/db/RangeTombstoneList.java | 34 ++-- .../cassandra/db/RangeTombstoneListTest.java| 171 +++ 3 files changed, 193 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4c1e9c7/CHANGES.txt -- diff --cc CHANGES.txt index 5aec2e7,3c3b838..93d8a06 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) * Release references to overlapping sstables during compaction (CASSANDRA-7819) * Send notification when opening compaction results early (CASSANDRA-8034) * Make native server start block until properly bound (CASSANDRA-7885) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4c1e9c7/src/java/org/apache/cassandra/db/RangeTombstoneList.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: build.xml src/java/org/apache/cassandra/cql/Cql.g test/unit/org/apache/cassandra/cql3/CqlParserTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f4284ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f4284ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f4284ae Branch: refs/heads/trunk Commit: 9f4284aefbd642e10e387f71d221788d42da321b Parents: a479fe0 2279d49 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Thu Oct 2 13:03:40 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Thu Oct 2 13:03:40 2014 -0500 -- CHANGES.txt| 1 + test/unit/org/apache/cassandra/cql3/CqlParserTest.java | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f4284ae/CHANGES.txt -- diff --cc CHANGES.txt index 1a3b285,ac83b12..c5c02ed --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Allow compilation in java 8 (CASSANDRA-7208) * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) * Release references to overlapping sstables during compaction (CASSANDRA-7819) * Send notification when opening compaction results early (CASSANDRA-8034) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f4284ae/test/unit/org/apache/cassandra/cql3/CqlParserTest.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/116d05b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/116d05b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/116d05b3 Branch: refs/heads/trunk Commit: 116d05b3e323a420cb2e65d75259dd240bb1f6f8 Parents: 349669e f1847a7 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Oct 2 13:34:20 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Oct 2 13:34:20 2014 -0500 -- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/9c9279a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9279a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c9279a2 Branch: refs/heads/trunk Commit: 9c9279a29a322db24fc697a295d8808425cfa90e Parents: 75c376d cb8dc4e Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Thu Oct 2 14:28:53 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Thu Oct 2 14:28:53 2014 -0500 -- bin/stop-server.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/56b77379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56b77379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56b77379 Branch: refs/heads/trunk Commit: 56b7737936876ddac4e30eb2764d0453e7980f34 Parents: ada8d8b 5926723 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Oct 1 12:30:09 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Oct 1 12:30:09 2014 -0500 -- CHANGES.txt | 1 + lib/cassandra-driver-internal-only-2.1.0.post.zip | Bin 129435 - 0 bytes lib/cassandra-driver-internal-only-2.1.1.post.zip | Bin 0 - 130016 bytes 3 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56b77379/CHANGES.txt -- diff --cc CHANGES.txt index 682f5d3,b2e791f..22e3a76 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988) * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939) * Make sstablerepairedset take a list of files (CASSANDRA-7995) * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0485a31c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0485a31c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0485a31c Branch: refs/heads/trunk Commit: 0485a31c0f4352cc398d17e657b78f57b129ae4e Parents: 3802738 2a12e05 Author: Marcus Eriksson marc...@apache.org Authored: Fri Sep 26 09:09:34 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Fri Sep 26 09:09:34 2014 +0200 -- CHANGES.txt | 1 + .../tools/SSTableRepairedAtSetter.java | 56 2 files changed, 34 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0485a31c/CHANGES.txt -- diff --cc CHANGES.txt index 30a87a5,0080b25..7bf1288 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,32 -1,5 +1,33 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Make sstablerepairedset take a list of files (CASSANDRA-7995) * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972) * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891) * Fix resource leak in event of corrupt sstable
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/3f181f06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f181f06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f181f06 Branch: refs/heads/trunk Commit: 3f181f06385fa5ffa8219bae5380fc0767eac55d Parents: f1bd50c 192468f Author: Jake Luciani j...@apache.org Authored: Mon Sep 22 15:33:20 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Mon Sep 22 15:33:20 2014 -0400 -- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/4e726566 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e726566 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e726566 Branch: refs/heads/trunk Commit: 4e72656636754485fe43e85e65046e6a929fadbc Parents: 0956a8a 488e775 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Sep 19 12:57:35 2014 -0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Sep 19 12:57:35 2014 -0700 -- .../apache/cassandra/cql3/QueryProcessor.java | 30 +--- 1 file changed, 14 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e726566/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/0ef0394d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ef0394d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ef0394d Branch: refs/heads/trunk Commit: 0ef0394dfda4ccaff8cd8bc063ff758cef960cca Parents: 4e72656 8589d04 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Sep 19 16:03:07 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Sep 19 16:03:07 2014 -0500 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 3 +++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ef0394d/CHANGES.txt -- diff --cc CHANGES.txt index 0af1681,ee313a8..ef42701 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,5 +1,30 @@@ +3.0 + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891) * Fix resource leak in event of corrupt sstable * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131) * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ef0394d/pylib/cqlshlib/cql3handling.py --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/efa8efad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efa8efad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efa8efad Branch: refs/heads/trunk Commit: efa8efad485912087b226272c8de86744ca9a711 Parents: 1a7db7a e1bc6b4 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Sep 18 16:43:20 2014 -0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Sep 18 16:43:20 2014 -0700 -- CHANGES.txt | 2 +- .../apache/cassandra/cql3/QueryProcessor.java | 23 2 files changed, 20 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa8efad/CHANGES.txt -- diff --cc CHANGES.txt index 4e99c0a,527b4e9..33e26a2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,6 +1,31 @@@ +3.0 + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131) - * Provide visibility into prepared statements churn (CASSANDRA-7921) + * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930) * Invalidate prepared statements when their keyspace or table is dropped (CASSANDRA-7566) * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945) http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa8efad/src/java/org/apache/cassandra/cql3/QueryProcessor.java -- diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java index 990e55c,9a09d42..fb98d17 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@@ -27,10 -29,8 +29,8 @@@ import com.google.common.primitives.Int import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.googlecode.concurrentlinkedhashmap.EntryWeigher; import com.googlecode.concurrentlinkedhashmap.EvictionListener; + import org.antlr.runtime.*; - import org.apache.cassandra.service.IMigrationListener; - import org.apache.cassandra.service.MigrationManager; import org.github.jamm.MemoryMeter; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/a8285fea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8285fea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8285fea Branch: refs/heads/trunk Commit: a8285fea60a1bad92fa598c0a2a51eff4575394d Parents: 48682d6 ad89d44 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Sep 17 21:04:00 2014 -0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Sep 17 21:04:00 2014 -0700 -- .../apache/cassandra/cql3/QueryProcessor.java | 48 +++ .../apache/cassandra/metrics/CQLMetrics.java| 60 + .../cassandra/metrics/CqlStatementMetrics.java | 53 .../apache/cassandra/cql3/CqlMetricsTest.java | 114 - .../cassandra/metrics/CQLMetricsTest.java | 124 +++ 5 files changed, 203 insertions(+), 196 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8285fea/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/d57890ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d57890ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d57890ca Branch: refs/heads/trunk Commit: d57890ca6112872524e6f830815549e179d0157d Parents: 6748083 5ba1f80 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Sep 17 22:58:44 2014 -0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Sep 17 22:58:44 2014 -0700 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/cql3/QueryProcessor.java | 2 ++ src/java/org/apache/cassandra/metrics/CQLMetrics.java | 3 +++ test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java | 1 + 4 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d57890ca/CHANGES.txt -- diff --cc CHANGES.txt index 5fd51ba,5125c77..77830f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,5 +1,30 @@@ +3.0 + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Provide visibility into prepared statements churn (CASSANDRA-7921) * Invalidate prepared statements when their keyspace or table is dropped (CASSANDRA-7566) * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d57890ca/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/feb30e21
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feb30e21
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feb30e21
Branch: refs/heads/trunk
Commit: feb30e21c0d3f97cef4b87d66dc28bcbe51d29df
Parents: 5f37e9f e25d94e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Sep 16 00:36:25 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Sep 16 00:38:21 2014 -0700
--
CHANGES.txt | 1 +
.../apache/cassandra/cache/AutoSavingCache.java | 38 +++-
.../org/apache/cassandra/cache/CacheKey.java| 38 ++--
.../apache/cassandra/cache/CounterCacheKey.java | 6 ++--
.../org/apache/cassandra/cache/KeyCacheKey.java | 4 +--
.../org/apache/cassandra/cache/RowCacheKey.java | 7 ++--
.../cassandra/config/DatabaseDescriptor.java| 9 +
.../org/apache/cassandra/config/Schema.java | 9 +
8 files changed, 40 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb30e21/CHANGES.txt
--
diff --cc CHANGES.txt
index ed141ef,f89cc6d..2db88fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
+3.0
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Support Java source code for user-defined functions (CASSANDRA-7562)
+ * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Verify that UDF class methods are static (CASSANDRA-7781)
+ * Support pure user-defined functions (CASSANDRA-7395, 7740)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
+
2.1.1
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
* Add better error checking of new stress profile (CASSANDRA-7716)
* Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom
(CASSANDRA-7934)
* Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/feb30e21/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index affd69b,d8fd5e0..5c39938
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -64,9 -65,16 +65,10 @@@ public class AutoSavingCacheK extends
this.cacheLoader = cacheloader;
}
- public File getCachePath(String ksName, String cfName, UUID cfId, String
version)
-@Deprecated
-public File getCachePath(String ksName, String cfName, UUID cfId, String
version)
-{
-return DatabaseDescriptor.getSerializedCachePath(ksName, cfName,
cfId, cacheType, version);
-}
-
+ public File getCachePath(UUID cfId, String version)
{
- return DatabaseDescriptor.getSerializedCachePath(ksName, cfName,
cfId, cacheType, version);
+ PairString, String names = Schema.instance.getCF(cfId);
+ return DatabaseDescriptor.getSerializedCachePath(names.left,
names.right, cfId, cacheType, version);
}
public Writer getWriter(int keysToSave)
@@@ -103,10 -111,10 +105,7 @@@
long start = System.nanoTime();
// modern format, allows both key and value (so key cache load can be
purely sequential)
- File path = getCachePath(cfs.keyspace.getName(), cfs.name,
cfs.metadata.cfId, CURRENT_VERSION);
- // if path does not exist, try without cfId (assuming saved cache is
created with current CF)
- if (!path.exists())
- path = getCachePath(cfs.keyspace.getName(), cfs.name, null,
CURRENT_VERSION);
+ File path = getCachePath(cfs.metadata.cfId, CURRENT_VERSION);
-// if path does not exist, try without cfId (assuming saved cache is
created
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/6770d0ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6770d0ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6770d0ff Branch: refs/heads/trunk Commit: 6770d0ff8c9baa18c2315a71f06b431152f658e5 Parents: 8215744 90a2114 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Sep 16 17:48:06 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Sep 16 17:48:06 2014 -0500 -- CHANGES.txt | 2 + .../apache/cassandra/cql3/QueryProcessor.java | 67 +++ .../cql3/PreparedStatementCleanupTest.java | 86 3 files changed, 155 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6770d0ff/CHANGES.txt -- diff --cc CHANGES.txt index 593310a,ca578f3..ca192a7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,6 +1,29 @@@ +3.0 + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Invalidate prepared statements when their keyspace or table is +dropped (CASSANDRA-7566) * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945) * Fix saving caches when a table is dropped (CASSANDRA-7784) * Add better error checking of new stress profile (CASSANDRA-7716) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6770d0ff/src/java/org/apache/cassandra/cql3/QueryProcessor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7b5164f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b5164f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b5164f3 Branch: refs/heads/trunk Commit: 7b5164f39845d2329b06f1348157d233adeb7453 Parents: 969967c b3573f3 Author: Jake Luciani j...@apache.org Authored: Mon Sep 15 12:22:09 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Mon Sep 15 12:22:09 2014 -0400 -- CHANGES.txt | 1 + .../apache/cassandra/stress/StressProfile.java | 29 .../settings/OptionRatioDistribution.java | 2 +- 3 files changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b5164f3/CHANGES.txt -- diff --cc CHANGES.txt index b6e9165,8fe4253..9a43511 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,5 +1,27 @@@ +3.0 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add better error checking of new stress profile (CASSANDRA-7716) * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934) * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069) * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/2266fb3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2266fb3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2266fb3e Branch: refs/heads/trunk Commit: 2266fb3e4d847ffbb581c3e3ceb913c3e4152165 Parents: 56674e0 1ba9593 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Mon Sep 15 23:50:09 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Mon Sep 15 23:50:09 2014 -0400 -- src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2266fb3e/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/284480f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/284480f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/284480f0 Branch: refs/heads/trunk Commit: 284480f044cb7f7434de6abbd5fe605fd79920e9 Parents: e4e6e90 cbc36e0 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Sep 14 20:43:26 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Sep 14 20:43:26 2014 -0400 -- src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/284480f0/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/0494cf75 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0494cf75 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0494cf75 Branch: refs/heads/trunk Commit: 0494cf75c3eae0be7d0337674cb65d226575cf50 Parents: 284480f 2c28fde Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Sep 14 20:48:12 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Sep 14 20:48:12 2014 -0400 -- src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0494cf75/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/c3d10abc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3d10abc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3d10abc Branch: refs/heads/trunk Commit: c3d10abc7dc2c4bb9db358c3d510de29d5ae51ca Parents: 0494cf7 db3cc3e Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sun Sep 14 22:01:53 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sun Sep 14 22:01:53 2014 -0400 -- src/java/org/apache/cassandra/tools/NodeTool.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d10abc/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/e5d1528e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5d1528e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5d1528e Branch: refs/heads/trunk Commit: e5d1528e54e122e9759d4b96e3d95db8a88a95de Parents: 796ddbc f168fda Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Sep 12 23:02:54 2014 -0700 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Sep 12 23:03:25 2014 -0700 -- CHANGES.txt | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5d1528e/CHANGES.txt -- diff --cc CHANGES.txt index 5c6bace,7030570..a05b91b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,3 +1,24 @@@ +3.0 + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + ++ 2.1.1 * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/5fc486a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc486a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fc486a1 Branch: refs/heads/trunk Commit: 5fc486a1c6a05ba16953c66a17f01ea5bad978e5 Parents: e5d1528 25eb830 Author: Marcus Eriksson marc...@apache.org Authored: Sat Sep 13 17:27:53 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Sat Sep 13 17:27:53 2014 +0200 -- CHANGES.txt | 1 + .../cassandra/tools/SSTableRepairedAtSetter.java | 15 +++ 2 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/CHANGES.txt -- diff --cc CHANGES.txt index a05b91b,fdf6fbe..ec32ee6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +3.0 + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913) * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) * (cqlsh) tab-completion for triggers (CASSANDRA-7824) * (cqlsh) Support for query paging (CASSANDRA-7514) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/68514026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68514026 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68514026 Branch: refs/heads/trunk Commit: 685140267ed6e88891dee2568ebac8a1f805d6db Parents: 2cba3fc dbcc4ea Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Wed Sep 10 09:12:52 2014 -0700 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Wed Sep 10 09:12:52 2014 -0700 -- bin/cassandra.ps1 | 29 + 1 file changed, 25 insertions(+), 4 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/a22dd291 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a22dd291 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a22dd291 Branch: refs/heads/trunk Commit: a22dd291b35e88867493fd11d83dd0360c051b0a Parents: 6851402 42b91d4 Author: Jake Luciani j...@apache.org Authored: Wed Sep 10 16:22:07 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Sep 10 16:22:07 2014 -0400 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 66 --- .../cassandra/metrics/CqlStatementMetrics.java | 53 + .../apache/cassandra/service/ClientState.java | 2 +- .../apache/cassandra/cql3/CqlMetricsTest.java | 110 +++ 5 files changed, 213 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/CHANGES.txt -- diff --cc CHANGES.txt index 449f688,177ac76..5c6bace --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ +3.0 + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + 2.1.1 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) * (cqlsh) tab-completion for triggers (CASSANDRA-7824) * (cqlsh): Support for query paging (CASSANDRA-7514) * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/src/java/org/apache/cassandra/cql3/QueryProcessor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/src/java/org/apache/cassandra/service/ClientState.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/14372cd4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14372cd4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14372cd4 Branch: refs/heads/trunk Commit: 14372cd4e474face12b9a5c94b5c93cd35a64237 Parents: a22dd29 12ac7ea Author: Jake Luciani j...@apache.org Authored: Wed Sep 10 17:15:20 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed Sep 10 17:15:20 2014 -0400 -- test/unit/org/apache/cassandra/cql3/CqlMetricsTest.java | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/c2008514 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2008514 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2008514 Branch: refs/heads/trunk Commit: c20085143ddd2cef68b0a0c918a7d377b1b3dab4 Parents: 6d22f6d 1fc8899 Author: T Jake Luciani j...@apache.org Authored: Tue Sep 9 15:39:29 2014 -0700 Committer: T Jake Luciani j...@apache.org Committed: Tue Sep 9 15:39:29 2014 -0700 -- src/java/org/apache/cassandra/db/AbstractNativeCell.java| 2 +- .../org/apache/cassandra/db/ArrayBackedSortedColumns.java | 1 - src/java/org/apache/cassandra/db/CollationController.java | 1 - src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 - src/java/org/apache/cassandra/service/StorageProxy.java | 2 -- src/java/org/apache/cassandra/utils/FastByteOperations.java | 9 - src/java/org/apache/cassandra/utils/MurmurHash.java | 1 - 7 files changed, 1 insertion(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/CollationController.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/db/ConsistencyLevel.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2008514/src/java/org/apache/cassandra/service/StorageProxy.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/6cb1f077 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cb1f077 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cb1f077 Branch: refs/heads/trunk Commit: 6cb1f0779a981a9743e461d7626a4049a3d7faad Parents: 9288159 c1c3375 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Mon Sep 8 15:32:36 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Mon Sep 8 15:32:36 2014 -0500 -- bin/stop-server.ps1 | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/719bb392 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/719bb392 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/719bb392 Branch: refs/heads/trunk Commit: 719bb392802ba94999e2ddc0c7c9d44d3843a8c8 Parents: d5cfe2b d304b7c Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Sep 5 10:59:22 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Sep 5 10:59:22 2014 +0200 -- test/unit/org/apache/cassandra/cql3/DeleteTest.java | 1 - 1 file changed, 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/3f1820f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f1820f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f1820f1 Branch: refs/heads/trunk Commit: 3f1820f1d785d262c4bd7ddc9e487307bceb5e86 Parents: 37a9d40 3a41017 Author: Jake Luciani j...@apache.org Authored: Fri Sep 5 08:57:34 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Fri Sep 5 08:57:34 2014 -0400 -- .../apache/cassandra/db/composites/AbstractSimpleCellNameType.java | 1 - 1 file changed, 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/f2f2ee5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2f2ee5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2f2ee5b Branch: refs/heads/trunk Commit: f2f2ee5bcfd0e56abaae1235ed48ee58710179ce Parents: 21827fa ed630e3 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Aug 28 10:59:47 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Aug 28 10:59:47 2014 -0500 -- .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2f2ee5b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/14dbba9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14dbba9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14dbba9d Branch: refs/heads/trunk Commit: 14dbba9d1f21773ecc41263f2cfa5759817dcfb0 Parents: 44fa12e 1be0bbf Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 27 11:00:54 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 27 11:00:54 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/Operation.java| 19 +- .../org/apache/cassandra/cql3/CQLTester.java| 53 - .../apache/cassandra/cql3/CollectionsTest.java | 227 +++ .../cassandra/cql3/MultiColumnRelationTest.java | 4 +- .../apache/cassandra/cql3/TupleTypeTest.java| 2 +- .../apache/cassandra/cql3/UserTypesTest.java| 2 - 7 files changed, 286 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14dbba9d/CHANGES.txt -- diff --cc CHANGES.txt index 90c5d29,0f1adf0..4d94e93 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599) * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) * (cqlsh) Display the current logged-in user (CASSANDRA-7785) http://git-wip-us.apache.org/repos/asf/cassandra/blob/14dbba9d/test/unit/org/apache/cassandra/cql3/CQLTester.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/75a30c5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75a30c5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75a30c5c Branch: refs/heads/trunk Commit: 75a30c5c2740d5cbb4df39b98f659fa79cdc017d Parents: e471dab 3d5f3a6 Author: Tyler Hobbs ty...@datastax.com Authored: Tue Aug 26 12:54:06 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Tue Aug 26 12:54:06 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/cql3/AbstractMarker.java | 3 - .../apache/cassandra/cql3/ColumnCondition.java | 609 +++ src/java/org/apache/cassandra/cql3/Cql.g| 17 +- src/java/org/apache/cassandra/cql3/Lists.java | 7 +- .../org/apache/cassandra/cql3/Relation.java | 4 +- .../cql3/statements/CQL3CasRequest.java | 12 +- .../cql3/statements/SelectStatement.java| 6 + .../cassandra/serializers/ListSerializer.java | 12 +- .../cassandra/cql3/ColumnConditionTest.java | 577 ++ .../cassandra/cql3/MultiColumnRelationTest.java | 7 + 11 files changed, 1120 insertions(+), 135 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/CHANGES.txt -- diff --cc CHANGES.txt index 1564b61,b5c3a32..90c5d29 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) * (cqlsh) Display the current logged-in user (CASSANDRA-7785) * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/src/java/org/apache/cassandra/cql3/Cql.g -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/src/java/org/apache/cassandra/cql3/Lists.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a30c5c/src/java/org/apache/cassandra/serializers/ListSerializer.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/f314c61f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f314c61f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f314c61f Branch: refs/heads/trunk Commit: f314c61f81af7be86c719a9851a49da272bd7963 Parents: 3aa7215 591a277 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Aug 25 10:10:54 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Aug 25 10:10:54 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 12 +- src/java/org/apache/cassandra/cql3/Cql.g| 15 ++- .../cql3/statements/CreateTriggerStatement.java | 22 +++- .../cql3/statements/DropTriggerStatement.java | 22 ++-- .../org/apache/cassandra/cql3/CQLTester.java| 10 ++ .../cql3/CreateTriggerStatementTest.java| 115 +++ .../cassandra/triggers/TriggerExecutorTest.java | 2 +- 8 files changed, 177 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/CHANGES.txt -- diff --cc CHANGES.txt index 711ca08,a5314df..2329333 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606) * (cqlsh) Display the current logged-in user (CASSANDRA-7785) * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815) * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f314c61f/src/java/org/apache/cassandra/cql3/Cql.g --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/9a4f6bdf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a4f6bdf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a4f6bdf Branch: refs/heads/trunk Commit: 9a4f6bdf05e7bba565287671e8927756cd9458a9 Parents: f6ef8ef d586ea8 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Aug 21 11:55:35 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Aug 21 11:55:35 2014 -0500 -- CHANGES.txt| 1 + bin/cqlsh | 34 ++ pylib/cqlshlib/cql3handling.py | 13 +++-- pylib/cqlshlib/pylexotron.py | 4 +++- 4 files changed, 33 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4f6bdf/CHANGES.txt -- diff --cc CHANGES.txt index 2466a01,11ec7ff..e0a414d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) * Support list index operations with conditions (CASSANDRA-7499) * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a4f6bdf/pylib/cqlshlib/cql3handling.py --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/df9cac09 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df9cac09 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df9cac09 Branch: refs/heads/trunk Commit: df9cac094c317afdf495691b034acccb334d2a03 Parents: 9a4f6bd d088f02 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Aug 21 14:00:50 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Aug 21 14:00:50 2014 -0500 -- CHANGES.txt| 2 ++ bin/cqlsh | 57 ++--- pylib/cqlshlib/cql3handling.py | 48 --- 3 files changed, 30 insertions(+), 77 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9cac09/CHANGES.txt -- diff --cc CHANGES.txt index e0a414d,701fd38..d078ea5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,6 +1,25 @@@ +3.0 + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE +output (CASSANDRA-7659) * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671) * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405) * Support list index operations with conditions (CASSANDRA-7499) http://git-wip-us.apache.org/repos/asf/cassandra/blob/df9cac09/pylib/cqlshlib/cql3handling.py --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/642e6c54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/642e6c54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/642e6c54 Branch: refs/heads/trunk Commit: 642e6c541ba239b02d650a14e170982e7e73fe7c Parents: f0635da f26e86c Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 15 23:44:30 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 15 23:44:30 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/642e6c54/CHANGES.txt -- diff --cc CHANGES.txt index 069012b,b68605e..570c409 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) http://git-wip-us.apache.org/repos/asf/cassandra/blob/642e6c54/src/java/org/apache/cassandra/tools/NodeTool.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/4dd1a15c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dd1a15c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dd1a15c Branch: refs/heads/trunk Commit: 4dd1a15ccc59ebe863c233d88b07dc269aee2cff Parents: 9d05efa 04a1fc6 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 15 04:02:07 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 15 04:02:07 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 37 +++- 2 files changed, 14 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/CHANGES.txt -- diff --cc CHANGES.txt index e2e37d6,ea9e8aa..2b38918 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/9b4c4ef6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b4c4ef6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b4c4ef6 Branch: refs/heads/trunk Commit: 9b4c4ef654fd58cc1cda3f7919a0e27cd1723dbc Parents: 5d6d891 e00bb4a Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Wed Aug 13 13:55:53 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Wed Aug 13 13:55:53 2014 -0500 -- conf/cassandra-env.ps1 | 5 + 1 file changed, 5 insertions(+) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/048f72bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/048f72bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/048f72bd Branch: refs/heads/trunk Commit: 048f72bd3e22f69655ec28b03db95c3e48fc5296 Parents: 5aaa4a0 74e7f28 Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Wed Aug 13 17:12:24 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Wed Aug 13 17:12:24 2014 -0500 -- build.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/048f72bd/build.xml --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/0eb9e8cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eb9e8cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eb9e8cf Branch: refs/heads/trunk Commit: 0eb9e8cfbca00ca0ebff08e7b59d7056b9737c5e Parents: 70d9f89 384f873 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 12 02:29:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 12 02:29:11 2014 +0300 -- --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/32358d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32358d64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32358d64 Branch: refs/heads/trunk Commit: 32358d646d7fc214a1bc16d58ca5e5d5b025bda6 Parents: f92ae20 756c85e Author: Joshua McKenzie josh.mcken...@datastax.com Authored: Thu Aug 7 12:06:52 2014 -0500 Committer: Joshua McKenzie josh.mcken...@datastax.com Committed: Thu Aug 7 12:06:52 2014 -0500 -- .../apache/cassandra/config/YamlConfigurationLoader.java| 9 - 1 file changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32358d64/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/00d7e4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00d7e4c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00d7e4c7 Branch: refs/heads/trunk Commit: 00d7e4c7fd8f746f862a21736e80053ba2c779f5 Parents: fe30c2c 2cbc280 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Aug 6 14:48:56 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Aug 6 14:48:56 2014 -0500 -- pylib/cqlshlib/test/test_cqlsh_output.py | 30 +++ 1 file changed, 21 insertions(+), 9 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Conflicts: build.xml Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59123b6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59123b6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59123b6f Branch: refs/heads/trunk Commit: 59123b6f7d8d8d84a61716f9f2bb4a18c620a764 Parents: 00d7e4c 6beb13f Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Aug 7 00:51:07 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Aug 7 00:51:07 2014 +0300 -- build.xml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59123b6f/build.xml --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/efe57f23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efe57f23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efe57f23 Branch: refs/heads/trunk Commit: efe57f2306945daaa09da68c3e7c2247f845b2d3 Parents: 277ca64 6a8d978 Author: Benedict Elliott Smith bened...@apache.org Authored: Tue Aug 5 15:22:21 2014 +0100 Committer: Benedict Elliott Smith bened...@apache.org Committed: Tue Aug 5 15:22:21 2014 +0100 -- build.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efe57f23/build.xml --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7dd320c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd320c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dd320c9 Branch: refs/heads/trunk Commit: 7dd320c9e764a980099e8fe247a4dcb3ada4a925 Parents: f64a113 7e71d01 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 5 14:02:21 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 5 14:02:21 2014 -0500 -- --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/ErrorCollector.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a69811e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a69811e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a69811e
Branch: refs/heads/trunk
Commit: 4a69811ee492ca6dcf98f0e5a6375d20e31ba49d
Parents: 5019182 72241f6
Author: Tyler Hobbs ty...@datastax.com
Authored: Tue Aug 5 17:26:05 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Tue Aug 5 17:26:05 2014 -0500
--
CHANGES.txt| 1 +
.../org/apache/cassandra/cql3/ErrorCollector.java | 17 -
2 files changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a69811e/CHANGES.txt
--
diff --cc CHANGES.txt
index 991331f,9ef6cc3..c8bb11b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
+3.0
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
+
2.1.1
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
* SSTableExport uses correct validator to create string representation of
partition
keys (CASSANDRA-7498)
* Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a69811e/src/java/org/apache/cassandra/cql3/ErrorCollector.java
--
diff --cc src/java/org/apache/cassandra/cql3/ErrorCollector.java
index 40949de,cd628b8..ad0f703
--- a/src/java/org/apache/cassandra/cql3/ErrorCollector.java
+++ b/src/java/org/apache/cassandra/cql3/ErrorCollector.java
@@@ -160,34 -157,21 +160,49 @@@ public final class ErrorCollector imple
}
/**
+ * Checks if the specified tokens are valid.
+ *
+ * @param token the tokens to check
+ * @return codetrue/code if all the specified tokens are valid ones,
+ * codefalse/code otherwise.
+ */
+private static boolean areTokensValid(Token... tokens)
+{
+for (Token token : tokens)
+{
+if (!isTokenValid(token))
+return false;
+}
+return true;
+}
+
+/**
+ * Checks that the specified token is valid.
+ *
+ * @param token the token to check
+ * @return codetrue/code if it is considered as valid,
codefalse/code otherwise.
+ */
+private static boolean isTokenValid(Token token)
+{
+return token.getLine() 0 token.getCharPositionInLine() = 0;
+}
+
+/**
+ * Returns the index of the offending token. pIn the case where the
offending token is an extra
+ * character at the end, the index returned by the
codeTokenStream/code might be after the last token.
+ * To avoid that problem we need to make sure that the index of the
offending token is a valid index
+ * (one for which a token exist)./p
+ *
+ * @param index the token index returned by the codeTokenStream/code
+ * @param size the codeTokenStream/code size
+ * @return the valid index of the offending token
+ */
+ private static int getOffendingTokenIndex(int index, int size)
+ {
+ return Math.min(index, size - 1);
+ }
+
+ /**
* Puts the specified token within square brackets.
*
* @param line the line containing the token
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/656d93e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656d93e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656d93e4 Branch: refs/heads/trunk Commit: 656d93e4be981862ec9943b0370462332dcbce10 Parents: 71142ca 729d0b8 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 4 21:12:11 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 4 21:12:11 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/MigrationManager.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/656d93e4/CHANGES.txt -- diff --cc CHANGES.txt index 368440b,897119b..3618b62 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,7 +1,24 @@@ +3.0 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) * Add support for custom 2i validation (CASSANDRA-7575) * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add duration mode to cassandra-stress (CASSANDRA-7468) * Add listen_interface and rpc_interface options (CASSANDRA-7417) * Improve schema merge performance (CASSANDRA-7444) * Adjust MT depth based on # of partition validating (CASSANDRA-5263) http://git-wip-us.apache.org/repos/asf/cassandra/blob/656d93e4/src/java/org/apache/cassandra/service/MigrationManager.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/7ea7c5d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ea7c5d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ea7c5d9 Branch: refs/heads/trunk Commit: 7ea7c5d9f0fb6d63c1a370583dd091104f773827 Parents: 6bc7f76 fe1ed96 Author: Benedict Elliott Smith bened...@apache.org Authored: Wed Jul 23 15:29:36 2014 +0200 Committer: Benedict Elliott Smith bened...@apache.org Committed: Wed Jul 23 15:29:36 2014 +0200 -- CHANGES.txt | 1 + .../apache/cassandra/stress/StressAction.java | 22 -- .../apache/cassandra/stress/StressMetrics.java | 3 +- .../stress/settings/SettingsCommand.java| 76 +++- .../settings/SettingsCommandPreDefined.java | 6 +- .../SettingsCommandPreDefinedMixed.java | 6 +- .../stress/settings/SettingsCommandUser.java| 3 +- 7 files changed, 102 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ea7c5d9/CHANGES.txt -- diff --cc CHANGES.txt index 0264dc7,962bd4c..01f4fd9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ +3.0 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Add duration mode to cassandra-stress (CASSANDRA-7468) * Add listen_interface and rpc_interface options (CASSANDRA-7417) * Fail to start if commit log replay detects a problem (CASSANDRA-7125) * Improve schema merge performance (CASSANDRA-7444)
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/9c9fa149 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c9fa149 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c9fa149 Branch: refs/heads/trunk Commit: 9c9fa1498096c51db7692a453f4af77f9276adfa Parents: 19b7d56 3d2da79 Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Jul 22 01:30:10 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Jul 22 01:30:10 2014 +0300 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/service/ClientState.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9fa149/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c9fa149/src/java/org/apache/cassandra/service/ClientState.java --
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
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/8d8fed52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d8fed52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d8fed52 Branch: refs/heads/trunk Commit: 8d8fed52242c34b477d0384ba1d1ce3978efbbe8 Parents: 3d9db29 82fa5d5 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Jul 19 00:21:30 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Jul 19 00:21:30 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DefsTables.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d8fed52/CHANGES.txt --
