You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/28 21:45:39 UTC
[1/7] git commit: fix changes for b2
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 5b80b97de -> 89da2c970
refs/heads/cassandra-2.1 3d2585906 -> 336a665a1
refs/heads/trunk aaf890c11 -> ff5134ad0
fix changes for b2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d258590
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d258590
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d258590
Branch: refs/heads/trunk
Commit: 3d25859065ce446daaa0b3614079e588cf93798a
Parents: a6f5f36
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 28 11:03:45 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 28 11:04:13 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 69 +++++++++++++++++++++-----------------------------------
1 file changed, 26 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d258590/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3b3b951..53e1e6f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,32 @@ Merged from 2.0:
* Pool CqlRecordWriter clients by inetaddress rather than Range
(CASSANDRA-6665)
* Fix compaction_history timestamps (CASSANDRA-6784)
+ * Compare scores of full replica ordering in DES (CASSANDRA-6883)
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
+ * Allow repairing between specific replicas (CASSANDRA-6440)
+ * Allow per-dc enabling of hints (CASSANDRA-6157)
+ * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
+ * Fix EstimatedHistogram races (CASSANDRA-6682)
+ * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
+ * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Expose bulk loading progress over JMX (CASSANDRA-4757)
+ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
+ * Account for range/row tombstones in tombstone drop
+ time histogram (CASSANDRA-6522)
+ * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
+ * Make commitlog failure handling configurable (CASSANDRA-6364)
+ * Avoid overlaps in LCS (CASSANDRA-6688)
+ * Improve support for paginating over composites (CASSANDRA-4851)
+ * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
+ * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
+ * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
+ * Add static columns to CQL3 (CASSANDRA-6561)
+ * Optimize single partition batch statements (CASSANDRA-6737)
+ * Disallow post-query re-ordering when paging (CASSANDRA-6722)
+ * Fix potential paging bug with deleted columns (CASSANDRA-6748)
+ * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
+ * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
2.1.0-beta1
@@ -51,49 +77,6 @@ Merged from 2.0:
* Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
-2.0.6
- * Compare scores of full replica ordering in DES (CASSANDRA-6883)
- * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
- * Allow repairing between specific replicas (CASSANDRA-6440)
- * Allow per-dc enabling of hints (CASSANDRA-6157)
- * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
- * Fix EstimatedHistogram races (CASSANDRA-6682)
- * Failure detector correctly converts initial value to nanos (CASSANDRA-6658)
- * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445)
- * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
- * Expose bulk loading progress over JMX (CASSANDRA-4757)
- * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
- * Account for range/row tombstones in tombstone drop
- time histogram (CASSANDRA-6522)
- * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652)
- * Make commitlog failure handling configurable (CASSANDRA-6364)
- * Avoid overlaps in LCS (CASSANDRA-6688)
- * Improve support for paginating over composites (CASSANDRA-4851)
- * Fix count(*) queries in a mixed cluster (CASSANDRA-6707)
- * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566)
- * Fix replaying pre-2.0 commit logs (CASSANDRA-6714)
- * Add static columns to CQL3 (CASSANDRA-6561)
- * Optimize single partition batch statements (CASSANDRA-6737)
- * Disallow post-query re-ordering when paging (CASSANDRA-6722)
- * Fix potential paging bug with deleted columns (CASSANDRA-6748)
-Merged from 1.2:
- * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Fix broken streams when replacing with same IP (CASSANDRA-6622)
- * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
- * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
- * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
- * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
- * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
- * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
- * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
- * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
- * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
- * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
- * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
- * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
- * Fix bootstrapping when there is no schema (CASSANDRA-6685)
-
-
2.0.5
* Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
* Add ks.cf names to tombstone logging (CASSANDRA-6597)
[6/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/336a665a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/336a665a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/336a665a
Branch: refs/heads/cassandra-2.1
Commit: 336a665a14d8305a195cdf13a7c86f227a59317e
Parents: 3d25859 89da2c9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:13 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:13 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/336a665a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index cbf3094,210ae17..8d064dd
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -437,10 -401,10 +437,10 @@@ public class ColumnFamilyStore implemen
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
- Directories directories = Directories.create(keyspace.getName(), columnFamily);
+ Directories directories = new Directories(metadata);
Directories.SSTableLister lister = directories.sstableLister().includeBackups(true);
List<Integer> generations = new ArrayList<Integer>();
for (Map.Entry<Descriptor, Set<Component>> entry : lister.list().entrySet())
[5/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/336a665a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/336a665a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/336a665a
Branch: refs/heads/trunk
Commit: 336a665a14d8305a195cdf13a7c86f227a59317e
Parents: 3d25859 89da2c9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:13 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:13 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/336a665a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index cbf3094,210ae17..8d064dd
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -437,10 -401,10 +437,10 @@@ public class ColumnFamilyStore implemen
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
- Directories directories = Directories.create(keyspace.getName(), columnFamily);
+ Directories directories = new Directories(metadata);
Directories.SSTableLister lister = directories.sstableLister().includeBackups(true);
List<Integer> generations = new ArrayList<Integer>();
for (Map.Entry<Descriptor, Set<Component>> entry : lister.list().entrySet())
[2/7] git commit: fix build
Posted by jb...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89da2c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89da2c97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89da2c97
Branch: refs/heads/cassandra-2.0
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:04 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return data.getMeanColumns();
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables)
{
return createColumnFamilyStore(keyspace, columnFamily, StorageService.getPartitioner(), Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata)
{
return createColumnFamilyStore(keyspace, columnFamily, partitioner, metadata, true);
}
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
Directories directories = Directories.create(keyspace.getName(), columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new ConfigurationException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
- Descriptor.Version.CURRENT, desc));
+ throw new RuntimeException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
+ Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff5134ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff5134ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff5134ad
Branch: refs/heads/trunk
Commit: ff5134ad035d05e4172ea72876599132730066a0
Parents: aaf890c 336a665
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:30 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:30 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[3/7] git commit: fix build
Posted by jb...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89da2c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89da2c97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89da2c97
Branch: refs/heads/trunk
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:04 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return data.getMeanColumns();
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables)
{
return createColumnFamilyStore(keyspace, columnFamily, StorageService.getPartitioner(), Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata)
{
return createColumnFamilyStore(keyspace, columnFamily, partitioner, metadata, true);
}
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
Directories directories = Directories.create(keyspace.getName(), columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new ConfigurationException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
- Descriptor.Version.CURRENT, desc));
+ throw new RuntimeException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
+ Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;
[4/7] git commit: fix build
Posted by jb...@apache.org.
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89da2c97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89da2c97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89da2c97
Branch: refs/heads/cassandra-2.1
Commit: 89da2c9704b5d2a4148a97a274170c3f634a1f0f
Parents: 5b80b97
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 28 14:45:04 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 28 14:45:04 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89da2c97/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4acae0b..210ae17 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -387,12 +387,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return data.getMeanColumns();
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, boolean loadSSTables)
{
return createColumnFamilyStore(keyspace, columnFamily, StorageService.getPartitioner(), Schema.instance.getCFMetaData(keyspace.getName(), columnFamily), loadSSTables);
}
- public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata) throws ConfigurationException
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace, String columnFamily, IPartitioner partitioner, CFMetaData metadata)
{
return createColumnFamilyStore(keyspace, columnFamily, partitioner, metadata, true);
}
@@ -401,7 +401,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
String columnFamily,
IPartitioner partitioner,
CFMetaData metadata,
- boolean loadSSTables) throws ConfigurationException
+ boolean loadSSTables)
{
// get the max generation number, to prevent generation conflicts
Directories directories = Directories.create(keyspace.getName(), columnFamily);
@@ -412,8 +412,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new ConfigurationException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
- Descriptor.Version.CURRENT, desc));
+ throw new RuntimeException(String.format("Incompatible SSTable found. Current version %s is unable to read file: %s. Please run upgradesstables.",
+ Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;