You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/12/14 10:38:21 UTC
[1/4] cassandra git commit: Make Stress compiles within eclipse
Repository: cassandra
Updated Branches:
refs/heads/trunk a808769fc -> 9bfe61357
Make Stress compiles within eclipse
patch by Benjamin Lerer; reviewed by Jake Luciani for CASSANDRA-10807
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b30d657
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b30d657
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b30d657
Branch: refs/heads/trunk
Commit: 9b30d6572fdb988796788ad4c7b8daabdef4e961
Parents: dff2214
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 14 10:17:50 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 14 10:22:30 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/stress/generate/values/Generator.java | 4 ++--
.../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------
.../apache/cassandra/stress/generate/values/Sets.java | 10 +++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b30d657/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 96f2f4f..091ac52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Make Stress compiles within eclipse (CASSANDRA-10807)
* Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
* Allow cancellation of index summary redistribution (CASSANDRA-8805)
* Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b30d657/tools/stress/src/org/apache/cassandra/stress/generate/values/Generator.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/Generator.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/Generator.java
index 00f866a..6b39d08 100644
--- a/tools/stress/src/org/apache/cassandra/stress/generate/values/Generator.java
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/Generator.java
@@ -31,13 +31,13 @@ public abstract class Generator<T>
public final String name;
public final AbstractType<T> type;
- public final Class<T> clazz;
+ public final Class<?> clazz;
final long salt;
final Distribution identityDistribution;
final Distribution sizeDistribution;
public final Distribution clusteringDistribution;
- public Generator(AbstractType<T> type, GeneratorConfig config, String name, Class<T> clazz)
+ public Generator(AbstractType<T> type, GeneratorConfig config, String name, Class<?> clazz)
{
this.type = type;
this.name = name;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b30d657/tools/stress/src/org/apache/cassandra/stress/generate/values/Lists.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/Lists.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/Lists.java
index bfa58ea..d82e01f 100644
--- a/tools/stress/src/org/apache/cassandra/stress/generate/values/Lists.java
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/Lists.java
@@ -26,16 +26,17 @@ import java.util.List;
import org.apache.cassandra.db.marshal.ListType;
-public class Lists extends Generator<List>
+public class Lists<T> extends Generator<List<T>>
{
- final Generator valueType;
- final Object[] buffer;
+ final Generator<T> valueType;
+ final T[] buffer;
- public Lists(String name, Generator valueType, GeneratorConfig config)
+ @SuppressWarnings("unchecked")
+ public Lists(String name, Generator<T> valueType, GeneratorConfig config)
{
super(ListType.getInstance(valueType.type, true), config, name, List.class);
this.valueType = valueType;
- buffer = new Object[(int) sizeDistribution.maxValue()];
+ buffer = (T[]) new Object[(int) sizeDistribution.maxValue()];
}
public void setSeed(long seed)
@@ -45,7 +46,7 @@ public class Lists extends Generator<List>
}
@Override
- public List generate()
+ public List<T> generate()
{
int size = (int) sizeDistribution.next();
for (int i = 0 ; i < size ; i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b30d657/tools/stress/src/org/apache/cassandra/stress/generate/values/Sets.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/Sets.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/Sets.java
index 5c17b4e..b74d6b2 100644
--- a/tools/stress/src/org/apache/cassandra/stress/generate/values/Sets.java
+++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/Sets.java
@@ -26,11 +26,11 @@ import java.util.Set;
import org.apache.cassandra.db.marshal.SetType;
-public class Sets extends Generator<Set>
+public class Sets<T> extends Generator<Set<T>>
{
- final Generator valueType;
+ final Generator<T> valueType;
- public Sets(String name, Generator valueType, GeneratorConfig config)
+ public Sets(String name, Generator<T> valueType, GeneratorConfig config)
{
super(SetType.getInstance(valueType.type, true), config, name, Set.class);
this.valueType = valueType;
@@ -43,9 +43,9 @@ public class Sets extends Generator<Set>
}
@Override
- public Set generate()
+ public Set<T> generate()
{
- final Set set = new HashSet();
+ final Set<T> set = new HashSet<T>();
int size = (int) sizeDistribution.next();
for (int i = 0 ; i < size ; i++)
set.add(valueType.generate());
[2/4] cassandra git commit: Merge branch cassandra-2.1 into
cassandra-2.2
Posted by bl...@apache.org.
Merge branch cassandra-2.1 into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/263763ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/263763ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/263763ab
Branch: refs/heads/trunk
Commit: 263763ab9bfd9be902951d06f5d44f3a9d3f6f4f
Parents: 6ff7c9c 9b30d65
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 14 10:27:21 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 14 10:28:05 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/stress/generate/values/Generator.java | 4 ++--
.../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------
.../apache/cassandra/stress/generate/values/Sets.java | 10 +++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/263763ab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d44a47b,091ac52..592ba0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,12 +1,35 @@@
-2.1.13
+2.2.5
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Make Stress compiles within eclipse (CASSANDRA-10807)
* Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
* Allow cancellation of index summary redistribution (CASSANDRA-8805)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
-
-2.1.12
+2.2.4
+ * Show CQL help in cqlsh in web browser (CASSANDRA-7225)
+ * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
+ * Reject index queries while the index is building (CASSANDRA-8505)
+ * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747)
+ * Fix JSON update with prepared statements (CASSANDRA-10631)
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+ * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
+Merged from 2.1:
* Fix incremental repair hang when replica is down (CASSANDRA-10288)
* Avoid writing range tombstones after END_OF_ROW marker (CASSANDRA-10791)
* Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768)
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by bl...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bfe6135
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bfe6135
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bfe6135
Branch: refs/heads/trunk
Commit: 9bfe613579d3febda4e0c448a012c0e78a4d277b
Parents: a808769 94e8d62
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 14 10:37:27 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 14 10:37:39 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/stress/generate/values/Generator.java | 4 ++--
.../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------
.../apache/cassandra/stress/generate/values/Sets.java | 10 +++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bfe6135/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 10b6226,c30d35d..0ca5277
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,12 +1,24 @@@
-3.0.2
-Merged from 2.2
+3.2
+ * Group pending compactions based on table (CASSANDRA-10718)
+ * Add compressor name in sstablemetadata output (CASSANDRA-9879)
+ * Fix type casting for counter columns (CASSANDRA-10824)
+ * Prevent running Cassandra as root (CASSANDRA-8142)
+ * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
+ * Normalize all scripts (CASSANDRA-10679)
+ * Make compression ratio much more accurate (CASSANDRA-10225)
+ * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
+ * Make index building pluggable (CASSANDRA-10681)
+ * Add sstable flush observer (CASSANDRA-10678)
+ * Improve NTS endpoints calculation (CASSANDRA-10200)
+ * Improve performance of the folderSize function (CASSANDRA-10677)
+ * Add support for type casting in selection clause (CASSANDRA-10310)
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+Merged from 2.2:
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Make Stress compiles within eclipse (CASSANDRA-10807)
* Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
* Allow cancellation of index summary redistribution (CASSANDRA-8805)
[3/4] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Posted by bl...@apache.org.
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94e8d62c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94e8d62c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94e8d62c
Branch: refs/heads/trunk
Commit: 94e8d62cf8cea8918b01b038746be4b4e03af515
Parents: a8b9e53 263763a
Author: Benjamin Lerer <b....@gmail.com>
Authored: Mon Dec 14 10:29:07 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Dec 14 10:29:17 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/stress/generate/values/Generator.java | 4 ++--
.../apache/cassandra/stress/generate/values/Lists.java | 13 +++++++------
.../apache/cassandra/stress/generate/values/Sets.java | 10 +++++-----
4 files changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e8d62c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e20f5ed,592ba0a..c30d35d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,40 -5,12 +6,41 @@@ Merged from 2.
* Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Make Stress compiles within eclipse (CASSANDRA-10807)
* Cassandra Daemon should print JVM arguments (CASSANDRA-10764)
* Allow cancellation of index summary redistribution (CASSANDRA-8805)
- * Fix Stress profile parsing on Windows (CASSANDRA-10808)
-2.2.4
+3.0.1
+ * Avoid MV race during node decommission (CASSANDRA-10674)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Handle single-column deletions correction in materialized views
+ when the column is part of the view primary key (CASSANDRA-10796)
+ * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
+ * Fix bug with range tombstones on reverse queries and test coverage for
+ AbstractBTreePartition (CASSANDRA-10059)
+ * Remove 64k limit on collection elements (CASSANDRA-10374)
+ * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
+ * Fix NPE on stream read error (CASSANDRA-10771)
+ * Normalize cqlsh DESC output (CASSANDRA-10431)
+ * Rejects partition range deletions when columns are specified (CASSANDRA-10739)
+ * Fix error when saving cached key for old format sstable (CASSANDRA-10778)
+ * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
+ * Fix SELECT statement with IN restrictions on partition key,
+ ORDER BY and LIMIT (CASSANDRA-10729)
+ * Improve stress performance over 1k threads (CASSANDRA-7217)
+ * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731)
+ * Unable to create a function with argument of type Inet (CASSANDRA-10741)
+ * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
+ * Correctly preserve deletion info on updated rows when notifying indexers
+ of single-row deletions (CASSANDRA-10694)
+ * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
+ * Keep the file open in trySkipCache (CASSANDRA-10669)
+ * Updated trigger example (CASSANDRA-10257)
+Merged from 2.2:
+ * Fix regression on split size in CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+ * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592)
* Show CQL help in cqlsh in web browser (CASSANDRA-7225)
* Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775)
* Reject index queries while the index is building (CASSANDRA-8505)