You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/04/22 07:50:54 UTC
[1/5] git commit: Nodetool rebuild_index requires named indexes
argument
Repository: cassandra
Updated Branches:
refs/heads/trunk 462c2dcc0 -> 33fa4f648
Nodetool rebuild_index requires named indexes argument
patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d1acd93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d1acd93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d1acd93
Branch: refs/heads/trunk
Commit: 8d1acd93fe86030bdb84bba5251f7999ba70e1b7
Parents: d0b41d0
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Apr 22 01:33:39 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 22 01:33:39 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeCmd.java | 5 +----
src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b4498fa..8cfffad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+ * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
1.2.16
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 6c02877..4901806 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -1370,11 +1370,8 @@ public class NodeCmd
break;
case REBUILD_INDEX:
- if (arguments.length < 2) { badUse("rebuild_index requires ks and cf args"); }
- if (arguments.length >= 3)
+ if (arguments.length <= 2) { badUse("rebuild_index requires ks, cf and idx args"); }
probe.rebuildIndex(arguments[0], arguments[1], arguments[2].split(","));
- else
- probe.rebuildIndex(arguments[0], arguments[1]);
break;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d1acd93/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index 8fe0519..ea2f0d7 100644
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@ -181,7 +181,7 @@ commands:
Load newly placed SSTables to the system without restart.
- name: rebuild_index <keyspace> <cf-name> <idx1,idx1>
help: |
- a full rebuilds of native secondry index for a given column family. IndexNameExample: Standard3.IdxName,Standard3.IdxName1
+ a full rebuild of native secondary indexes for a given column family. IndexNameExample: Standard3.IdxName,Standard3.IdxName1
- name: setcachecapacity <key-cache-capacity> <row-cache-capacity>
help: |
Set global key and row cache capacities (in MB units).
[3/5] git commit: Nodetool rebuild_index requires named indexes
argument
Posted by db...@apache.org.
Nodetool rebuild_index requires named indexes argument
patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/743d921a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/743d921a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/743d921a
Branch: refs/heads/trunk
Commit: 743d921ae8591545ff01022db9a41a84ef1edcd1
Parents: 2b89cf6
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Apr 22 01:46:31 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 22 01:46:31 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 15 ++++-----------
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5d15eac..d94f13b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -46,6 +46,7 @@
* Fix AE when closing SSTable without releasing reference (CASSANDRA-7000)
* Clean up IndexInfo on keyspace/table drops (CASSANDRA-6924)
* Only snapshot relative SSTables when sequential repair (CASSANDRA-7024)
+ * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
Merged from 2.0:
* Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
* Allow compaction of system tables during startup (CASSANDRA-6913)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/743d921a/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index edcfec3..2c8d0c2 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2130,24 +2130,17 @@ public class NodeTool
}
}
- @Command(name = "rebuild_index", description = "A full rebuilds of native secondry index for a given column family")
+ @Command(name = "rebuild_index", description = "A full rebuild of native secondary indexes for a given column family")
public static class RebuildIndex extends NodeToolCmd
{
- @Arguments(usage = "<keyspace> <cfname> [<indexName...>]", description = "The keyspace and column family name followed by an optional list of index names (IndexNameExample: Standard3.IdxName Standard3.IdxName1)")
+ @Arguments(usage = "<keyspace> <cfname> <indexName...>", description = "The keyspace and column family name followed by a list of index names (IndexNameExample: Standard3.IdxName Standard3.IdxName1)")
List<String> args = new ArrayList<>();
@Override
public void execute(NodeProbe probe)
{
- checkArgument(args.size() >= 2, "rebuild_index requires ks and cf args");
-
- List<String> indexNames = new ArrayList<>();
- if (args.size() > 2)
- {
- indexNames.addAll(args.subList(2, args.size()));
- }
-
- probe.rebuildIndex(args.get(0), args.get(1), toArray(indexNames, String.class));
+ checkArgument(args.size() >= 3, "rebuild_index requires ks, cf and idx args");
+ probe.rebuildIndex(args.get(0), args.get(1), toArray(args.subList(2, args.size()), String.class));
}
}
[4/5] git commit: fix bad merge
Posted by db...@apache.org.
fix bad merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30e2bff6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30e2bff6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30e2bff6
Branch: refs/heads/trunk
Commit: 30e2bff696caf07139bbeacfd1a9dd10a9771685
Parents: 743d921 bc6f4d0
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 22 01:49:50 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 22 01:49:50 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc6f4d00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc6f4d00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc6f4d00
Branch: refs/heads/trunk
Commit: bc6f4d0033e5e391137f9db5fe0ac4c41bb05f20
Parents: 1104653 8d1acd9
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 22 01:37:28 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 22 01:37:28 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeCmd.java | 5 +----
src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc6f4d00/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bcbde4a,8cfffad..5d47cfa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,16 +1,64 @@@
-1.2.17
- * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
- (CASSANDRA-6822)
- * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787)
- * Schedule schema pulls on change (CASSANDRA-6971)
- * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
- * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
+2.0.8
+ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+Merged from 1.2:
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+ * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
-1.2.16
+2.0.7
+ * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
+ * Allow compaction of system tables during startup (CASSANDRA-6913)
+ * Restrict Windows to parallel repairs (CASSANDRA-6907)
+ * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436)
+ * Fix NPE in MeteredFlusher (CASSANDRA-6820)
+ * Fix race processing range scan responses (CASSANDRA-6820)
+ * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821)
+ * Add uuid() function (CASSANDRA-6473)
+ * Omit tombstones from schema digests (CASSANDRA-6862)
+ * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884)
+ * Lower chances for losing new SSTables during nodetool refresh and
+ ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514)
+ * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708)
+ * Update hadoop_cql3_word_count example (CASSANDRA-6793)
+ * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
+ * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865)
+ * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
+ * Fix schema concurrency exceptions (CASSANDRA-6841)
+ * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
+ * Fix saving triggers to schema (CASSANDRA-6789)
+ * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
+ * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
+ * Fix static counter columns (CASSANDRA-6827)
+ * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
+ * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
+ * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
+ * Read message id as string from earlier versions (CASSANDRA-6840)
+ * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837)
+ * Add paranoid disk failure option (CASSANDRA-6646)
+ * Improve PerRowSecondaryIndex performance (CASSANDRA-6876)
+ * Extend triggers to support CAS updates (CASSANDRA-6882)
+ * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873)
+ * Fix paging with SELECT DISTINCT (CASSANDRA-6857)
+ * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923)
+ * Improve MeteredFlusher handling of MF-unaffected column families
+ (CASSANDRA-6867)
+ * Add CqlRecordReader using native pagination (CASSANDRA-6311)
+ * Add QueryHandler interface (CASSANDRA-6659)
+ * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945)
+ * Make sure upgradesstables keeps sstable level (CASSANDRA-6958)
+ * Fix LIMIT with static columns (CASSANDRA-6956)
+ * Fix clash with CQL column name in thrift validation (CASSANDRA-6892)
+ * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966)
+ * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825)
+ * Fix unintended update with conditional statement (CASSANDRA-6893)
+ * Fix map element access in IF (CASSANDRA-6914)
+ * Avoid costly range calculations for range queries on system keyspaces
+ (CASSANDRA-6906)
+ * Fix SSTable not released if stream session fails (CASSANDRA-6818)
+ * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+Merged from 1.2:
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
* fix nodetool getsstables for blob PK (CASSANDRA-6803)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc6f4d00/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc6f4d00/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/33fa4f64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33fa4f64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33fa4f64
Branch: refs/heads/trunk
Commit: 33fa4f648019a6ad5a191aed4a42b32805d70cf8
Parents: 462c2dc 30e2bff
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 22 01:50:23 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 22 01:50:23 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 15 ++++-----------
2 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/33fa4f64/CHANGES.txt
----------------------------------------------------------------------