You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/16 23:52:38 UTC
[1/8] git commit: getValidColumnFamilies adds 2I if requested and no
ks/cf specified Patch by brandonwilliams,
reviewed by jbellis for CASSANDRA-6598
Updated Branches:
refs/heads/cassandra-1.2 b168f3e29 -> 18789da7c
refs/heads/cassandra-2.0 120437e15 -> ee7938391
refs/heads/trunk 8a078054e -> dd49497e9
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b168f3e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b168f3e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b168f3e2
Branch: refs/heads/cassandra-2.0
Commit: b168f3e294e7db6abfbfda777a567acd76bfa863
Parents: 5f63578
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 15:04:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 15:04:26 2014 -0600
----------------------------------------------------------------------
.../apache/cassandra/service/StorageService.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b168f3e2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 7c8a257..90089ab 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2276,13 +2276,28 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public Iterable<ColumnFamilyStore> getValidColumnFamilies(boolean allowIndexes, boolean autoAddIndexes, String tableName, String... cfNames) throws IOException
{
Table table = getValidTable(tableName);
+ Set<ColumnFamilyStore> valid = new HashSet<ColumnFamilyStore>();
if (cfNames.length == 0)
+ {
// all stores are interesting
- return table.getColumnFamilyStores();
+ for (ColumnFamilyStore cfStore : table.getColumnFamilyStores())
+ {
+ valid.add(cfStore);
+ if (autoAddIndexes)
+ {
+ for (SecondaryIndex si : cfStore.indexManager.getIndexes())
+ {
+ logger.info("adding secondary index {} to operation", si.getIndexName());
+ valid.add(si.getIndexCfs());
+ }
+
+ }
+ }
+ return valid;
+ }
// filter out interesting stores
- Set<ColumnFamilyStore> valid = new HashSet<ColumnFamilyStore>();
for (String cfName : cfNames)
{
//if the CF name is an index, just flush the CF that owns the index
[6/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee793839
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee793839
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee793839
Branch: refs/heads/trunk
Commit: ee7938391542d5de75dd984afb7d4aeca197e1fe
Parents: 120437e 18789da
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:50:14 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:50:14 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee793839/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 76c020a,a5827d3..2095be7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,29 -10,10 +14,30 @@@ Merged from 1.2
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
[4/8] git commit: update CHANGES
Posted by br...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18789da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18789da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18789da7
Branch: refs/heads/trunk
Commit: 18789da7c8eb34493c2f9683a732fb3bb823708f
Parents: b168f3e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:48:48 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:48:48 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18789da7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25c105c..a5827d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
1.2.13
[7/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee793839
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee793839
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee793839
Branch: refs/heads/cassandra-2.0
Commit: ee7938391542d5de75dd984afb7d4aeca197e1fe
Parents: 120437e 18789da
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:50:14 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:50:14 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee793839/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 76c020a,a5827d3..2095be7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -14,29 -10,10 +14,30 @@@ Merged from 1.2
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
-1.2.13
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
[3/8] git commit: update CHANGES
Posted by br...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18789da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18789da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18789da7
Branch: refs/heads/cassandra-2.0
Commit: 18789da7c8eb34493c2f9683a732fb3bb823708f
Parents: b168f3e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:48:48 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:48:48 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18789da7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25c105c..a5827d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
1.2.13
[8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd49497e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd49497e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd49497e
Branch: refs/heads/trunk
Commit: dd49497e9d81e6ba882cde851354cac3b91412a3
Parents: 8a07805 ee79383
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:50:21 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:50:21 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd49497e/CHANGES.txt
----------------------------------------------------------------------
[5/8] git commit: update CHANGES
Posted by br...@apache.org.
update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18789da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18789da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18789da7
Branch: refs/heads/cassandra-1.2
Commit: 18789da7c8eb34493c2f9683a732fb3bb823708f
Parents: b168f3e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 16:48:48 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 16:48:48 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/18789da7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25c105c..a5827d3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
1.2.13
[2/8] git commit: getValidColumnFamilies adds 2I if requested and no
ks/cf specified Patch by brandonwilliams,
reviewed by jbellis for CASSANDRA-6598
Posted by br...@apache.org.
getValidColumnFamilies adds 2I if requested and no ks/cf specified
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6598
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b168f3e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b168f3e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b168f3e2
Branch: refs/heads/trunk
Commit: b168f3e294e7db6abfbfda777a567acd76bfa863
Parents: 5f63578
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 15:04:26 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 15:04:26 2014 -0600
----------------------------------------------------------------------
.../apache/cassandra/service/StorageService.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b168f3e2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 7c8a257..90089ab 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2276,13 +2276,28 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public Iterable<ColumnFamilyStore> getValidColumnFamilies(boolean allowIndexes, boolean autoAddIndexes, String tableName, String... cfNames) throws IOException
{
Table table = getValidTable(tableName);
+ Set<ColumnFamilyStore> valid = new HashSet<ColumnFamilyStore>();
if (cfNames.length == 0)
+ {
// all stores are interesting
- return table.getColumnFamilyStores();
+ for (ColumnFamilyStore cfStore : table.getColumnFamilyStores())
+ {
+ valid.add(cfStore);
+ if (autoAddIndexes)
+ {
+ for (SecondaryIndex si : cfStore.indexManager.getIndexes())
+ {
+ logger.info("adding secondary index {} to operation", si.getIndexName());
+ valid.add(si.getIndexCfs());
+ }
+
+ }
+ }
+ return valid;
+ }
// filter out interesting stores
- Set<ColumnFamilyStore> valid = new HashSet<ColumnFamilyStore>();
for (String cfName : cfNames)
{
//if the CF name is an index, just flush the CF that owns the index