[jira] [Assigned] (CASSANDRA-2710) Get multiple column ranges
[ https://issues.apache.org/jira/browse/CASSANDRA-2710?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay reassigned CASSANDRA-2710: Assignee: Vijay > Get multiple column ranges > -- > > Key: CASSANDRA-2710 > URL: https://issues.apache.org/jira/browse/CASSANDRA-2710 > Project: Cassandra > Issue Type: Sub-task >Reporter: David Boxenhorn >Assignee: Vijay > Labels: compositeColumns, cql > > I have replaced all my super column families with regular column families > using composite columns. I have easily been able to support all previous > functionality (I don't need range delete) except for one thing: getting > multiple super columns with a single access. For this, I would need to get > multiple ranges. (I can get multiple columns, or a single range, but not > multiple ranges.) > For example, I used to have > [,],[,] > and I could get superColumnName1, superColumnName2 > Now I have > [0..0],[0..0] > and I need to get superColumnName1..superColumnName1+, > superColumnName2..superColumnName2+ > to get the same functionality > I would like the clients to support this functionality, e.g. Hector to have > .setRages parallel to .setColumnNames > and for CQL to support a syntax like > SELECT [FIRST N] [REVERSED] name1..nameN1, name2..nameN2... FROM ... -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4324) Implement Lucene FST in for key index
[ https://issues.apache.org/jira/browse/CASSANDRA-4324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416859#comment-13416859 ] Jason Rutherglen commented on CASSANDRA-4324: - Looks like only SSTableReader calls IndexSummary#getKeys()? As you mentioned, we need to abstract out the key and key range access into the IndexSummary class, that should obviate the need to call getKeys, unless I'm missing something? > Implement Lucene FST in for key index > - > > Key: CASSANDRA-4324 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4324 > Project: Cassandra > Issue Type: Improvement >Reporter: Jason Rutherglen >Assignee: Jason Rutherglen >Priority: Minor > Fix For: 1.2 > > Attachments: CASSANDRA-4324.patch, CASSANDRA-4324.patch, > CASSANDRA-4324.patch, lucene-core-4.0-SNAPSHOT.jar > > > The Lucene FST data structure offers a compact and fast system for indexing > Cassandra keys. More keys may be loaded which in turn should seeks faster. > * Update the IndexSummary class to make use of the Lucene FST, overriding the > serialization mechanism. > * Alter SSTableReader to make use of the FST seek mechanism -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[1/4] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Updated Branches: refs/heads/vnodes 073634929 -> 6eac7e650 Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6eac7e65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eac7e65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eac7e65 Branch: refs/heads/vnodes Commit: 6eac7e650d899a4cabf152ce3a52b0e237117db2 Parents: 0736349 d09c369 Author: Eric Evans Authored: Tue Jul 17 22:18:25 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 22:18:25 2012 -0500 -- .../apache/cassandra/service/StorageService.java |4 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 18 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eac7e65/src/java/org/apache/cassandra/service/StorageService.java --
[2/4] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d09c369f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d09c369f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d09c369f Branch: refs/heads/vnodes Commit: d09c369f015aa33529138f160618060e1e6cf5a3 Parents: fc14072 8821e8b Author: Eric Evans Authored: Tue Jul 17 22:18:25 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 22:18:25 2012 -0500 -- .../apache/cassandra/service/StorageService.java |4 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 18 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) --
[3/4] git commit: rename clusterinfo command to simply status
rename clusterinfo command to simply status Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8821e8b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8821e8b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8821e8b5 Branch: refs/heads/vnodes Commit: 8821e8b5ed729e136dd921720d819fc2cdd0c52d Parents: 0e7d40e Author: Eric Evans Authored: Tue Jul 17 22:18:05 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 22:18:05 2012 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 18 1 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8821e8b5/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 41fe3f8..0da3381 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -91,7 +91,6 @@ public class NodeCmd CFSTATS, CLEANUP, CLEARSNAPSHOT, -CLUSTERINFO, COMPACT, COMPACTIONSTATS, DECOMMISSION, @@ -124,6 +123,7 @@ public class NodeCmd SETCOMPACTIONTHROUGHPUT, SETSTREAMTHROUGHPUT, SNAPSHOT, +STATUS, STATUSTHRIFT, STOP, TPSTATS, @@ -148,7 +148,7 @@ public class NodeCmd addCmdHelp(header, "ring", "Print information about the token ring"); addCmdHelp(header, "join", "Join the ring"); addCmdHelp(header, "info [-T/--tokens]", "Print node information (uptime, load, ...)"); -addCmdHelp(header, "clusterinfo", "Print cluster informations (status, load, IDs, ...)"); +addCmdHelp(header, "status", "Print cluster information (state, load, IDs, ...)"); addCmdHelp(header, "cfstats", "Print statistics on column families"); addCmdHelp(header, "version", "Print cassandra version"); addCmdHelp(header, "tpstats", "Print usage statistics of thread pools"); @@ -340,7 +340,7 @@ public class NodeCmd outs.println(); } -private class ClusterInfo +private class ClusterStatus { String kSpace = null, format = null; Collection joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes; @@ -348,7 +348,7 @@ public class NodeCmd EndpointSnitchInfoMBean epSnitchInfo; PrintStream outs; -ClusterInfo(PrintStream outs, String kSpace) +ClusterStatus(PrintStream outs, String kSpace) { this.kSpace = kSpace; this.outs = outs; @@ -488,9 +488,9 @@ public class NodeCmd /** Writes a table of cluster-wide node information to a PrintStream * @throws UnknownHostException */ -public void printClusterInfo(PrintStream outs, String keyspace) throws UnknownHostException +public void printClusterStatus(PrintStream outs, String keyspace) throws UnknownHostException { -new ClusterInfo(outs, keyspace).print(); +new ClusterStatus(outs, keyspace).print(); } public void printThreadPoolStats(PrintStream outs) @@ -970,9 +970,9 @@ public class NodeCmd case STATUSTHRIFT: nodeCmd.printIsThriftServerRunning(System.out); break; case RESETLOCALSCHEMA: probe.resetLocalSchema(); break; -case CLUSTERINFO : -if (arguments.length > 0) nodeCmd.printClusterInfo(System.out, arguments[0]); -else nodeCmd.printClusterInfo(System.out, null); +case STATUS : +if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0]); +else nodeCmd.printClusterStatus(System.out, null); break; case DECOMMISSION :
[4/4] git commit: right seems more right than left
right seems more right than left Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e7d40e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e7d40e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e7d40e8 Branch: refs/heads/vnodes Commit: 0e7d40e81fd4859fb9f146530df15a07e621306e Parents: fa7239c Author: Eric Evans Authored: Tue Jul 17 22:10:18 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 22:10:18 2012 -0500 -- .../apache/cassandra/service/StorageService.java |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e7d40e8/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 bcad055..99fbd84 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2913,8 +2913,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe float ownership = 0.0f; for (Range range : getRangesForEndpoint(keyspace, endpoint)) { -if (tokenOwnership.containsKey(range.left)) -ownership += tokenOwnership.get(range.left); +if (tokenOwnership.containsKey(range.right)) +ownership += tokenOwnership.get(range.right); } finalOwnership.put(endpoint, ownership); }
[jira] [Commented] (CASSANDRA-4324) Implement Lucene FST in for key index
[ https://issues.apache.org/jira/browse/CASSANDRA-4324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416801#comment-13416801 ] Yuki Morishita commented on CASSANDRA-4324: --- bq. Interesting, what is the information? Specifically I mean IndexSummary#getKeys() returns list of DecoratedKeys and that is called from many places. FST does not carry DecoratedKeys around so you may need to find the way to work around. > Implement Lucene FST in for key index > - > > Key: CASSANDRA-4324 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4324 > Project: Cassandra > Issue Type: Improvement >Reporter: Jason Rutherglen >Assignee: Jason Rutherglen >Priority: Minor > Fix For: 1.2 > > Attachments: CASSANDRA-4324.patch, CASSANDRA-4324.patch, > CASSANDRA-4324.patch, lucene-core-4.0-SNAPSHOT.jar > > > The Lucene FST data structure offers a compact and fast system for indexing > Cassandra keys. More keys may be loaded which in turn should seeks faster. > * Update the IndexSummary class to make use of the Lucene FST, overriding the > serialization mechanism. > * Alter SSTableReader to make use of the FST seek mechanism -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416797#comment-13416797 ] Yuki Morishita commented on CASSANDRA-4439: --- +1 > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > o
[jira] [Updated] (CASSANDRA-3772) Evaluate Murmur3-based partitioner
[ https://issues.apache.org/jira/browse/CASSANDRA-3772?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Vijay updated CASSANDRA-3772: - Attachment: 0001-CASSANDRA-3772.patch Made minor change format, added comments to yaml and modified Murmur3Partitioner to add {code} public static void writeLong(long src, byte[] dest, int offset) {code} I do see a bigger gain with faster disks. > Evaluate Murmur3-based partitioner > -- > > Key: CASSANDRA-3772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-3772 > Project: Cassandra > Issue Type: New Feature > Components: Core >Reporter: Jonathan Ellis >Assignee: Pavel Yaskevich > Fix For: 1.2 > > Attachments: 0001-CASSANDRA-3772-Test.patch, > 0001-CASSANDRA-3772.patch, MumPartitionerTest.docx, hashed_partitioner.diff, > hashed_partitioner_3.diff, try_murmur3.diff, try_murmur3_2.diff > > > MD5 is a relatively heavyweight hash to use when we don't need cryptographic > qualities, just a good output distribution. Let's see how much overhead we > can save by using Murmur3 instead. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4275) Oracle Java 1.7 u4 does not allow Xss128k
[ https://issues.apache.org/jira/browse/CASSANDRA-4275?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416762#comment-13416762 ] Trevor Robinson commented on CASSANDRA-4275: So regarding ARM, etc., should this be reopened or a new issue created? As for FreeBSD, I have no experience at all with it. Unless someone else volunteers to help with that, I'd like to fix ARM/Linux now and keep the FreeBSD issue separate (as I could envision that languishing indefinitely). > Oracle Java 1.7 u4 does not allow Xss128k > - > > Key: CASSANDRA-4275 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4275 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.9, 1.1.0 >Reporter: Edward Capriolo >Assignee: Sylvain Lebresne > Fix For: 1.1.2 > > Attachments: 4275.txt, trunk-cassandra-4275.1.patch.txt, > v1-0001-CASSANDRA-4275-Use-JVM-s-reported-minimum-stack-size-o.txt > > > Problem: This happens when you try to start it with default Xss setting of > 128k > === > The stack size specified is too small, Specify at least 160k > Error: Could not create the Java Virtual Machine. > Error: A fatal exception has occurred. Program will exit. > Solution > === > Set -Xss to 256k > Problem: This happens when you try to start it with Xss = 160k > > ERROR [Thrift:14] 2012-05-22 14:42:40,479 AbstractCassandraDaemon.java (line > 139) Fatal exception in thread Thread[Thrift:14,5,main] > java.lang.StackOverflowError > Solution > === > Set -Xss to 256k -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4125) Update nodetool for vnodes
[ https://issues.apache.org/jira/browse/CASSANDRA-4125?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416729#comment-13416729 ] Eric Evans commented on CASSANDRA-4125: --- OK, this output is implemented in: https://github.com/acunu/cassandra/commit/30710fb As of yet, I haven't figured out the strange ownership values (other than it being more fallout from CASSANDRA-3047). > Update nodetool for vnodes > -- > > Key: CASSANDRA-4125 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4125 > Project: Cassandra > Issue Type: Sub-task > Components: Core >Reporter: Sam Overton >Assignee: Eric Evans > > The proposed changes are intended to preserve backwards compatibility: > || op || behaviour || deprecated warning? > | join | Join the ring, use with {{-t}} to join at a specific token, or to > add a token to an existing host | > | ring | prints the first token for each node, add {{-a}} to print all tokens > | > | move | if the node only has 1 token then move it. Otherwise die > with an error. | *deprecated* > | removetoken status/force/ | removes the node who owns from > the ring. use {{-t}} option to only remove the token from the node instead of > the whole node. | > | describering [keyspace] | show all ranges and their endpoints | > | getendpoints| Print the endpoints that own the key > and also their list of tokens | > _Edit0: Appended patch information._ > h3. Patches > ||Compare||Raw diff||Description|| > |[01_admin_tools|https://github.com/acunu/cassandra/compare/top-bases/p/4125/01_admin_tools...p/4125/01_admin_tools]|[01_admin_tools.patch|https://github.com/acunu/cassandra/compare/top-bases/p/4125/01_admin_tools...p/4125/01_admin_tools.diff]|Updated > nodetool| > > _Note: These are branches managed with TopGit. If you are applying the patch > output manually, you will either need to filter the TopGit metadata files > (i.e. {{wget -O - | filterdiff -x*.topdeps -x*.topmsg | patch -p1}}), > or remove them afterward ({{rm .topmsg .topdeps}})._ -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4324) Implement Lucene FST in for key index
[ https://issues.apache.org/jira/browse/CASSANDRA-4324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416632#comment-13416632 ] Jason Rutherglen commented on CASSANDRA-4324: - Also it should be mentioned, using the FST will be a big win for garbage collection, it's basically a single byte[]. The IndexSummary currently uses a lot of object pointers, which are more costly than a single byte[]. > Implement Lucene FST in for key index > - > > Key: CASSANDRA-4324 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4324 > Project: Cassandra > Issue Type: Improvement >Reporter: Jason Rutherglen >Assignee: Jason Rutherglen >Priority: Minor > Fix For: 1.2 > > Attachments: CASSANDRA-4324.patch, CASSANDRA-4324.patch, > CASSANDRA-4324.patch, lucene-core-4.0-SNAPSHOT.jar > > > The Lucene FST data structure offers a compact and fast system for indexing > Cassandra keys. More keys may be loaded which in turn should seeks faster. > * Update the IndexSummary class to make use of the Lucene FST, overriding the > serialization mechanism. > * Alter SSTableReader to make use of the FST seek mechanism -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Comment Edited] (CASSANDRA-1123) Allow tracing query details
[ https://issues.apache.org/jira/browse/CASSANDRA-1123?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416363#comment-13416363 ] David Alves edited comment on CASSANDRA-1123 at 7/17/12 9:00 PM: - First patch that implements most of what was suggested, with accompanying test. Still to define/discuss: - aaraon original version "replaced" the logger which meant there were already a lot of things being traced. As is this patch is pretty "bare" in terms of trace events in the sense that stuff that goes through CassandraServer gets a new trace session but not much else is traced (even though sessions get propagated across threads and nodes). Maybe we could add events automatically when a session is propagated across stages and across nodes, therefore getting a per-stage and per-node view of how things are executed (I think this could be done rather unintrusively)? - I haven't added the log to the logger option yet, as I'm not completely sure how useful it is if events are generated per stage/node. was (Author: dr-alves): First patch that implements most of what was suggested, with accompanying test. Still to define/discuss: - aaraons "replaced" the logger with meant there were already a lot of things being logged. As is this patch is pretty "bare" in terms of trace events in the sense that stuff that goes through CassandraServer gets a new trace session but not much else is traced (even though session gets propagated across threads and nodes). Maybe we could add events automatically when a session is propagated across stages and across nodes? - I haven't added the log to the logger option yet, as I'm not completely sure how useful it is if events are generated per stage/node. > Allow tracing query details > --- > > Key: CASSANDRA-1123 > URL: https://issues.apache.org/jira/browse/CASSANDRA-1123 > Project: Cassandra > Issue Type: New Feature > Components: Core >Reporter: Jonathan Ellis >Assignee: David Alves > Fix For: 1.2 > > Attachments: 1123-3.patch.gz, 1123.patch > > > In the spirit of CASSANDRA-511, it would be useful to tracing on queries to > see where latency is coming from: how long did row cache lookup take? key > search in the index? merging the data from the sstables? etc. > The main difference vs setting debug logging is that debug logging is too big > of a hammer; by turning on the flood of logging for everyone, you actually > distort the information you're looking for. This would be something you > could set per-query (or more likely per connection). > We don't need to be as sophisticated as the techniques discussed in the > following papers but they are interesting reading: > http://research.google.com/pubs/pub36356.html > http://www.usenix.org/events/osdi04/tech/full_papers/barham/barham_html/ > http://www.usenix.org/event/nsdi07/tech/fonseca.html -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416544#comment-13416544 ] T Jake Luciani commented on CASSANDRA-4240: --- +1 > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1, > cassandra-1.0.8-CASSANDRA-4240-patch2.txt, > cassandra-1.0.8-CASSANDRA-4240-patch3.txt, cassandra-1.0.8-CASSANDRA-4240.txt > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
git commit: add #4399 to CHANGES
Updated Branches: refs/heads/cassandra-1.1 ae13debd3 -> 7c982717a add #4399 to CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c982717 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c982717 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c982717 Branch: refs/heads/cassandra-1.1 Commit: 7c982717a370f39907ce4ebe46359b1ea2cc9c3b Parents: ae13deb Author: Jonathan Ellis Authored: Tue Jul 17 14:02:55 2012 -0500 Committer: Jonathan Ellis Committed: Tue Jul 17 14:03:42 2012 -0500 -- CHANGES.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c982717/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index a525ad8..67b5410 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 1.1.3 + * flush based on data size, not throughput; overwritten columns no + longer artificially inflate liveRatio (CASSANDRA-4399) * update default commitlog segment size to 32MB and total commitlog size to 32/1024 MB for 32/64 bit JVMs, respectively (CASSANDRA-4422) * avoid using global partitioner to estimate ranges in index sstables
[jira] [Updated] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-4439: -- Reviewer: yukim (was: jbellis) > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.upd
[jira] [Commented] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416439#comment-13416439 ] Pavel Yaskevich commented on CASSANDRA-4439: Thanks, Alex. addDefaultIndexNames() works just fine when cql where we have all of the metadata (index_names/index_type) but for cli, where we need to provide all of the column attributes by hand, it wasn't because index_name should be filled in by user every time even if it was auto generated, so just checking that index_name is not set there (when no explicit name were given) is not good enough for thrift access. > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.
[jira] [Updated] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alex Liu updated CASSANDRA-4240: Attachment: cassandra-1.0.8-CASSANDRA-4240-patch3.txt add unit test > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1, > cassandra-1.0.8-CASSANDRA-4240-patch2.txt, > cassandra-1.0.8-CASSANDRA-4240-patch3.txt, cassandra-1.0.8-CASSANDRA-4240.txt > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4324) Implement Lucene FST in for key index
[ https://issues.apache.org/jira/browse/CASSANDRA-4324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416388#comment-13416388 ] Jason Rutherglen commented on CASSANDRA-4324: - Nice that's a huge win! That's for the MD5 encoded keys? {quote}DecoratedKeys stored inside current IndexSummary are actually accessed from various places, and FST version will lack those information, you may need to figure out the alternative way to preserve current functionality{quote} Interesting, what is the information? Why are there two keys stored in DecoratedKey? FST supports range like scans, however I am not exactly sure how that part works. We probably want to restructure the API to make it abstract for both implementations? > Implement Lucene FST in for key index > - > > Key: CASSANDRA-4324 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4324 > Project: Cassandra > Issue Type: Improvement >Reporter: Jason Rutherglen >Assignee: Jason Rutherglen >Priority: Minor > Fix For: 1.2 > > Attachments: CASSANDRA-4324.patch, CASSANDRA-4324.patch, > CASSANDRA-4324.patch, lucene-core-4.0-SNAPSHOT.jar > > > The Lucene FST data structure offers a compact and fast system for indexing > Cassandra keys. More keys may be loaded which in turn should seeks faster. > * Update the IndexSummary class to make use of the Lucene FST, overriding the > serialization mechanism. > * Alter SSTableReader to make use of the FST seek mechanism -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[38/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/p/4122/01_bootstrap_decommission' into HEAD
Merge remote-tracking branch 'refs/remotes/acunu/p/4122/01_bootstrap_decommission' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f99bf4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f99bf4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f99bf4f Branch: refs/heads/vnodes Commit: 4f99bf4ff6ab8fb8c1b114876e68b74585de0c83 Parents: 457dcd2 c612a2e Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- .topdeps |2 +- .topmsg|6 +- NEWS.txt |3 + conf/cassandra.yaml| 17 +- src/java/org/apache/cassandra/config/Config.java |1 + .../cassandra/config/DatabaseDescriptor.java | 25 +- src/java/org/apache/cassandra/db/SystemTable.java | 102 +-- .../org/apache/cassandra/dht/BootStrapper.java | 60 +++- src/java/org/apache/cassandra/gms/Gossiper.java| 10 +- .../org/apache/cassandra/gms/VersionedValue.java | 38 ++- .../locator/AbstractReplicationStrategy.java |7 +- .../apache/cassandra/locator/TokenMetadata.java| 24 ++- .../apache/cassandra/service/StorageService.java | 276 +-- test/unit/org/apache/cassandra/Util.java |5 +- .../org/apache/cassandra/db/SystemTableTest.java | 32 ++- .../org/apache/cassandra/dht/BootStrapperTest.java |7 +- .../apache/cassandra/gms/SerializationsTest.java |5 +- .../service/AntiEntropyServiceTestAbstract.java|2 +- .../cassandra/service/LeaveAndBootstrapTest.java | 70 +++-- .../org/apache/cassandra/service/MoveTest.java | 20 +- 20 files changed, 496 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f99bf4f/NEWS.txt -- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features +- Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2 http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f99bf4f/src/java/org/apache/cassandra/config/Config.java --
[48/50] git commit: Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7526814 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7526814 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7526814 Branch: refs/heads/vnodes Commit: c7526814d700f7e6bc89fb2bb757f13b2470ad84 Parents: 831a1a8 764fa54 Author: Eric Evans Authored: Sat Jul 14 12:35:52 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:35:52 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[47/50] git commit: Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de500cbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de500cbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de500cbd Branch: refs/heads/vnodes Commit: de500cbd5582170565a070a1208ccb35772a82b7 Parents: 154045d 99bbcf2 Author: Eric Evans Authored: Sat Jul 14 12:36:02 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:02 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[50/50] git commit: Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/457dcd24 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/457dcd24 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/457dcd24 Branch: refs/heads/vnodes Commit: 457dcd2453e95be1b1102a6509d7a13be3cbf923 Parents: 1d9d3e9 1cb0ad5 Author: Eric Evans Authored: Sat Jul 14 12:35:42 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:35:42 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[46/50] git commit: Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99bbcf27 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99bbcf27 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99bbcf27 Branch: refs/heads/vnodes Commit: 99bbcf277f29da21b08d0e82be2c9521de080ebf Parents: 9733851 a83bf4f Author: Eric Evans Authored: Sat Jul 14 12:36:02 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:02 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[43/50] git commit: Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d23c00c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d23c00c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d23c00c8 Branch: refs/heads/vnodes Commit: d23c00c8a6b0b3e1d986cc2f5f598ea2c6ca420a Parents: d1e5397 de500cb Author: Eric Evans Authored: Sat Jul 14 12:36:17 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:17 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[42/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdbbc69c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdbbc69c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdbbc69c Branch: refs/heads/vnodes Commit: cdbbc69c4951329d1a99eb03e028a0c2a5b9bd24 Parents: 4a9b40e 0d646f1 Author: Eric Evans Authored: Sat Jul 14 12:36:17 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:17 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[44/50] git commit: Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d646f1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d646f1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d646f1e Branch: refs/heads/vnodes Commit: 0d646f1e4c3758b3b791920b3bd55105fba11693 Parents: 10be782 d23c00c Author: Eric Evans Authored: Sat Jul 14 12:36:17 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:17 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[35/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/p/4122/02_remove_tokens' into HEAD
Merge remote-tracking branch 'refs/remotes/acunu/p/4122/02_remove_tokens' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a37bc9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a37bc9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a37bc9c Branch: refs/heads/vnodes Commit: 6a37bc9c2a8710695d2db5f033cfd8cc51dfd8d3 Parents: d5ad60e c0f3008 Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- .topdeps |2 +- .topmsg|9 - .../apache/cassandra/service/StorageService.java | 15 ++- 3 files changed, 11 insertions(+), 15 deletions(-) --
[41/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4127/01_migration_path' into refs/top-bases/p/4127/01_migration_path
Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4127/01_migration_path' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5c8d5dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5c8d5dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5c8d5dd Branch: refs/heads/vnodes Commit: e5c8d5dd4892ae6a0cec1be7b1ed1278ba3b18b4 Parents: cdbbc69 78a9659 Author: Eric Evans Authored: Sat Jul 14 12:37:20 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:20 2012 -0600 -- NEWS.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5c8d5dd/NEWS.txt -- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features +- Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2
[37/50] git commit: Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5ad60eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5ad60eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5ad60eb Branch: refs/heads/vnodes Commit: d5ad60eb7ac13ca7dde45027ff41f3fa93c72a2b Parents: 02f4bc4 905ca4c Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- --
[45/50] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bba0e45c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bba0e45c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bba0e45c Branch: refs/heads/vnodes Commit: bba0e45ce9169eb711d3e7912d8fe4dd9149cd49 Parents: 020dfdf cdbbc69 Author: Eric Evans Authored: Sat Jul 14 12:36:17 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:36:17 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[36/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4125/01_admin_tools' into refs/top-bases/p/4125/01_admin_tools
Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4125/01_admin_tools' into refs/top-bases/p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3dd9b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3dd9b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf3dd9b0 Branch: refs/heads/vnodes Commit: cf3dd9b04d6dcab5a0e00edfb8f2305f7c8ea1fa Parents: d23c00c de6e798 Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- NEWS.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3dd9b0/NEWS.txt -- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features +- Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2
[31/50] git commit: Merge commit 'dbbcc981b41d551e0d8898371e863a6067a1ae2a' into p/4122/03_group_stream_out_ranges
Merge commit 'dbbcc981b41d551e0d8898371e863a6067a1ae2a' into p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1a17550 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1a17550 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1a17550 Branch: refs/heads/vnodes Commit: c1a175501192313af0ef08af0009d7ed8d39156e Parents: de500cb dbbcc98 Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- NEWS.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) --
[40/50] git commit: Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89c9865e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89c9865e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89c9865e Branch: refs/heads/vnodes Commit: 89c9865ed8c9793fb05da2bc162e7909bf40abba Parents: c9866b0 5f5b43d Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- --
[33/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9866b05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9866b05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9866b05 Branch: refs/heads/vnodes Commit: c9866b0588ab385fc507e40fcd0d0ece1b93992b Parents: 99bbcf2 bfc0777 Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- NEWS.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9866b05/NEWS.txt -- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features +- Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2
[22/50] git commit: Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00011661 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00011661 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00011661 Branch: refs/heads/vnodes Commit: 00011661375baca0cbdaeea0440e0d01de2b2c57 Parents: 457dcd2 b3ca94b Author: Eric Evans Authored: Mon Jul 16 13:27:53 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:27:53 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[21/50] git commit: Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f194a2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f194a2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f194a2e Branch: refs/heads/vnodes Commit: 9f194a2ee5c9197ec3316619af4f0b8358ef33de Parents: d5ad60e ce212ba Author: Eric Evans Authored: Mon Jul 16 13:28:03 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:03 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[29/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/p/4122/03_group_stream_out_ranges' into HEAD
Merge remote-tracking branch 'refs/remotes/acunu/p/4122/03_group_stream_out_ranges' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbbcc981 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbbcc981 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dbbcc981 Branch: refs/heads/vnodes Commit: dbbcc981b41d551e0d8898371e863a6067a1ae2a Parents: 89c9865 7dd841b Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- .topdeps |2 +- .topmsg|4 +- .../apache/cassandra/service/StorageService.java | 51 ++ 3 files changed, 39 insertions(+), 18 deletions(-) --
[49/50] git commit: Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a83bf4f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a83bf4f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a83bf4f4 Branch: refs/heads/vnodes Commit: a83bf4f49908995d1fb6672d2fc78cc12bc8620b Parents: 609bf2f c752681 Author: Eric Evans Authored: Sat Jul 14 12:35:52 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:35:52 2012 -0600 -- CHANGES.txt|7 +- NEWS.txt |2 + README.txt | 86 ++--- bin/cqlsh | 13 +- conf/cassandra-env.sh |6 + examples/pig/test/populate-cli.txt | 20 + examples/pig/test/test_storage.pig | 17 +- interface/cassandra.thrift |8 +- .../org/apache/cassandra/thrift/Cassandra.java |4 + .../org/apache/cassandra/thrift/Constants.java |2 +- .../apache/cassandra/thrift/TimedOutException.java | 118 ++- pylib/cqlshlib/cql3handling.py | 15 +- .../org/apache/cassandra/config/CFMetaData.java|1 - src/java/org/apache/cassandra/config/Config.java |2 +- .../org/apache/cassandra/config/KSMetaData.java|3 +- .../org/apache/cassandra/cql/QueryProcessor.java | 17 +- .../cql3/statements/ModificationStatement.java |9 +- .../org/apache/cassandra/db/CounterColumn.java |3 +- .../cassandra/db/CounterMutationVerbHandler.java |7 +- .../apache/cassandra/db/HintedHandOffManager.java |4 +- .../db/compaction/AbstractCompactionStrategy.java | 44 ++ .../db/compaction/LeveledCompactionStrategy.java | 45 ++- .../cassandra/db/compaction/LeveledManifest.java |6 + .../cassandra/db/compaction/OperationType.java |2 + .../compaction/SizeTieredCompactionStrategy.java | 35 +-- .../cassandra/hadoop/pig/CassandraStorage.java | 44 ++- .../service/AbstractWriteResponseHandler.java |7 +- .../DatacenterSyncWriteResponseHandler.java| 14 +- .../cassandra/service/IWriteResponseHandler.java |3 +- .../org/apache/cassandra/service/StorageProxy.java | 34 +- .../cassandra/service/WriteResponseHandler.java| 10 +- .../apache/cassandra/thrift/CassandraServer.java | 28 +- .../org/apache/cassandra/tools/SSTableExport.java | 120 +- .../org/apache/cassandra/tools/SSTableImport.java | 245 +++- test/resources/CounterCF.json |6 +- test/resources/SimpleCF.json |8 +- test/resources/SimpleCF.oldformat.json |8 +- test/resources/SimpleCFWithDeletionInfo.json |4 + test/resources/SuperCF.json|8 +- test/resources/UnsortedCF.json |4 + test/resources/UnsortedSuperCF.json| 10 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 20 +- .../cassandra/db/compaction/CompactionsTest.java | 53 +++- .../apache/cassandra/tools/SSTableExportTest.java | 172 ++-- .../apache/cassandra/tools/SSTableImportTest.java | 85 +++- tools/bin/token-generator | 317 +++ 46 files changed, 1284 insertions(+), 392 deletions(-) --
[19/50] git commit: Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1257e751 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1257e751 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1257e751 Branch: refs/heads/vnodes Commit: 1257e75118d96cc5842957fe9ed660e79a8aa21b Parents: 89c9865 60cccdd Author: Eric Evans Authored: Mon Jul 16 13:28:03 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:03 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[17/50] git commit: Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1659c083 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1659c083 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1659c083 Branch: refs/heads/vnodes Commit: 1659c083e068a1aaeb8f114aec9492dbdc71b968 Parents: fb52b33 ddb1b21 Author: Eric Evans Authored: Mon Jul 16 13:28:36 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:36 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[23/50] git commit: Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce212ba9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce212ba9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce212ba9 Branch: refs/heads/vnodes Commit: ce212ba999e7db50c25273d2c72478372582e5ac Parents: 905ca4c 0001166 Author: Eric Evans Authored: Mon Jul 16 13:27:53 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:27:53 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[28/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/p/4127/01_migration_path' into HEAD
Merge remote-tracking branch 'refs/remotes/acunu/p/4127/01_migration_path' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61eeb952 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61eeb952 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61eeb952 Branch: refs/heads/vnodes Commit: 61eeb952a66436eb9f3be6e32c31b702ef2eeb23 Parents: 9379ea8 d9424c6 Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- .topdeps |2 +- .topmsg|4 +- .../apache/cassandra/service/StorageService.java | 53 ++- 3 files changed, 55 insertions(+), 4 deletions(-) --
[34/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/02_remove_tokens' into refs/top-bases/p/4122/02_remove_tokens
Merge remote-tracking branch 'refs/remotes/acunu/top-bases/p/4122/02_remove_tokens' into refs/top-bases/p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02f4bc47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02f4bc47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02f4bc47 Branch: refs/heads/vnodes Commit: 02f4bc47f7c165621604cf4d0123a53fb0f1628b Parents: c752681 021748c Author: Eric Evans Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:21 2012 -0600 -- NEWS.txt |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f4bc47/NEWS.txt -- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features +- Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2
[25/50] git commit: Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e905fff9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e905fff9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e905fff9 Branch: refs/heads/vnodes Commit: e905fff908cc5233a499cfc99aba58be874d7fcd Parents: cf3dd9b c1a1755 Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- --
[14/50] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92ef65fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92ef65fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92ef65fe Branch: refs/heads/vnodes Commit: 92ef65fec777fd4a512e9d71661d6660b8be1435 Parents: c87b7bb 89924db Author: Eric Evans Authored: Mon Jul 16 13:28:37 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:37 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[30/50] git commit: Merge remote-tracking branch 'refs/remotes/acunu/p/4125/01_admin_tools' into HEAD
Merge remote-tracking branch 'refs/remotes/acunu/p/4125/01_admin_tools' into HEAD Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cffa379 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cffa379 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cffa379 Branch: refs/heads/vnodes Commit: 5cffa379466678e7d6e381124677decd9756729d Parents: e905fff a1e1ab4 Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- .topdeps |2 +- .topmsg|4 +- .../apache/cassandra/service/StorageService.java | 25 ++- .../cassandra/service/StorageServiceMBean.java | 14 +- src/java/org/apache/cassandra/tools/NodeCmd.java | 172 +++ src/java/org/apache/cassandra/tools/NodeProbe.java | 18 ++- 6 files changed, 176 insertions(+), 59 deletions(-) --
[20/50] git commit: Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60cccdde Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60cccdde Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60cccdde Branch: refs/heads/vnodes Commit: 60cccdde71d839d1c43ad4a03225df79a413ddea Parents: 5f5b43d 9f194a2 Author: Eric Evans Authored: Mon Jul 16 13:28:03 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:03 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[18/50] git commit: Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/550d11a8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/550d11a8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/550d11a8 Branch: refs/heads/vnodes Commit: 550d11a83942c991824a674b51e74de684fde13d Parents: c1a1755 1257e75 Author: Eric Evans Authored: Mon Jul 16 13:28:04 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:04 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[16/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89924dbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89924dbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89924dbf Branch: refs/heads/vnodes Commit: 89924dbf506b1c7288814b72b0daf2adb8ac3eae Parents: 9379ea8 1659c08 Author: Eric Evans Authored: Mon Jul 16 13:28:36 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:36 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[11/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad0da57c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad0da57c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad0da57c Branch: refs/heads/vnodes Commit: ad0da57c45606ee328414c4e37111d312e7a5bd4 Parents: 89924db 30710fb Author: Eric Evans Authored: Tue Jul 17 12:33:50 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:33:50 2012 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 174 + 1 files changed, 140 insertions(+), 34 deletions(-) --
[12/50] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f68621ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f68621ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f68621ca Branch: refs/heads/vnodes Commit: f68621ca456f76be6546db4ca7f58ff550351d49 Parents: 92ef65f ad0da57 Author: Eric Evans Authored: Tue Jul 17 12:33:50 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:33:50 2012 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 174 + 1 files changed, 140 insertions(+), 34 deletions(-) --
[6/50] git commit: Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfa1e5be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfa1e5be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfa1e5be Branch: refs/heads/vnodes Commit: bfa1e5be7e6e8fe16c7b924f23436a2244b85dfd Parents: 9f194a2 e4ff7dd Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[13/50] git commit: stubbed out proposed clusterinfo changes
stubbed out proposed clusterinfo changes Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30710fbd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30710fbd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30710fbd Branch: refs/heads/vnodes Commit: 30710fbd17007a6c0dce5db29ca757be5fcb9366 Parents: 1659c08 Author: Eric Evans Authored: Tue Jul 17 12:33:20 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:33:20 2012 -0500 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 174 + 1 files changed, 140 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30710fbd/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 3ad6428..41fe3f8 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -38,12 +38,15 @@ import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.db.compaction.CompactionManagerMBean; import org.apache.cassandra.db.compaction.OperationType; +import org.apache.cassandra.locator.EndpointSnitchInfo; +import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.net.MessagingServiceMBean; import org.apache.cassandra.service.CacheServiceMBean; import org.apache.cassandra.service.StorageProxyMBean; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.utils.EstimatedHistogram; import org.apache.cassandra.utils.Pair; +import org.apache.rat.document.UnreadableArchiveException; public class NodeCmd { @@ -337,54 +340,157 @@ public class NodeCmd outs.println(); } -/** Writes a table of cluster-wide node information to a PrintStream - * @throws UnknownHostException */ -public void printClusterInfo(PrintStream outs, String keyspace) throws UnknownHostException +private class ClusterInfo { -Collection joiningNodes = probe.getJoiningNodes(); -Collection leavingNodes = probe.getLeavingNodes(); -Collection movingNodes = probe.getMovingNodes(); -Map loadMap = probe.getLoadMap(); +String kSpace = null, format = null; +Collection joiningNodes, leavingNodes, movingNodes, liveNodes, unreachableNodes; +Map loadMap, hostIDMap, tokensToEndpoints; +EndpointSnitchInfoMBean epSnitchInfo; +PrintStream outs; -String fmt; +ClusterInfo(PrintStream outs, String kSpace) +{ +this.kSpace = kSpace; +this.outs = outs; +joiningNodes = probe.getJoiningNodes(); +leavingNodes = probe.getLeavingNodes(); +movingNodes = probe.getMovingNodes(); +loadMap = probe.getLoadMap(); +tokensToEndpoints = probe.getTokenToEndpointMap(); +liveNodes = probe.getLiveNodes(); +unreachableNodes = probe.getUnreachableNodes(); +hostIDMap = probe.getHostIdMap(); +epSnitchInfo = probe.getEndpointSnitchInfoProxy(); +} -// Calculate per-token ownership of the ring -Map ownerships; -try +private void printStatusLegend() { -ownerships = probe.effectiveOwnership(keyspace); -fmt = "%-16s %-7s %-8s %-10s %-7s %-16s %s%n"; -outs.print(String.format(fmt, "Address", "Status", "State", "Load", "Tokens", "Owns (effective)", "Host ID")); +outs.println("Status=Up/Down"); +outs.println("|/ State=Normal/Leaving/Joining/Moving"); } -catch (ConfigurationException ex) + +private Map> getOwnershipByDc(Map ownerships) +throws UnknownHostException { -ownerships = probe.getOwnership(); -fmt = "%-16s %-7s %-8s %-10s %-7s %-7s %s%n"; -outs.printf("Warn: Ownership information does not include topology, please specify a keyspace. \n"); -outs.print(String.format(fmt, "Address", "Status", "State", "Load", "Tokens", "Owns", "Host ID")); +Map> ownershipByDc = Maps.newLinkedHashMap(); +EndpointSnitchInfoMBean epSnitchInfo = probe.getEndpointSnitchInfoProxy(); + +for (Map.Entry ownership : ownerships.entrySet()) +{ +String dc = epSnitchInfo.getDatacenter(ownership.getKey().getHostAddress()); +if (!ownershipByDc.containsKey(dc)) +ownershipByDc.put(dc, new LinkedHashMap()); +ownershipByDc.get(dc).put(ownership.get
[27/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9379ea83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9379ea83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9379ea83 Branch: refs/heads/vnodes Commit: 9379ea837225fa99a2524892b739a1938648aff8 Parents: e5c8d5d fb52b33 Author: Eric Evans Authored: Sat Jul 14 12:37:22 2012 -0600 Committer: Eric Evans Committed: Sat Jul 14 12:37:22 2012 -0600 -- --
[9/50] git commit: Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4fef83f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4fef83f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4fef83f Branch: refs/heads/vnodes Commit: d4fef83f583a4b1753a1d0cdf37c1dd7991d Parents: 1257e75 b4b6a57 Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[10/50] git commit: Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge branch 'trunk' into refs/top-bases/p/4122/01_bootstrap_decommission Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/533b9c9c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/533b9c9c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/533b9c9c Branch: refs/heads/vnodes Commit: 533b9c9c597fc8b2be49c0981568bb78052abf3b Parents: 0001166 72aa824 Author: Eric Evans Authored: Tue Jul 17 12:34:29 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:29 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[8/50] git commit: Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa7239c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa7239c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa7239c3 Branch: refs/heads/vnodes Commit: fa7239c3cfe7d6e3b78b6380d6c2883960e7f38f Parents: 30710fb 0ed12b7 Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[15/50] git commit: Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddb1b21b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddb1b21b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddb1b21b Branch: refs/heads/vnodes Commit: ddb1b21b45c4bc7bf48c08595fe7303a2b3d3d76 Parents: e905fff 550d11a Author: Eric Evans Authored: Mon Jul 16 13:28:36 2012 -0500 Committer: Eric Evans Committed: Mon Jul 16 13:28:36 2012 -0500 -- CHANGES.txt|3 +- pylib/cqlshlib/cql3handling.py | 28 ++- pylib/cqlshlib/cqlhandling.py |6 +- .../org/apache/cassandra/cql3/CFDefinition.java| 28 ++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 40 --- .../apache/cassandra/cql3/ColumnIdentifier.java| 12 +- src/java/org/apache/cassandra/cql3/Cql.g | 167 --- src/java/org/apache/cassandra/cql3/Operation.java | 91 +-- src/java/org/apache/cassandra/cql3/ParsedType.java | 129 .../org/apache/cassandra/cql3/QueryProcessor.java |6 +- src/java/org/apache/cassandra/cql3/Term.java | 73 +++-- .../apache/cassandra/cql3/UpdateParameters.java| 64 src/java/org/apache/cassandra/cql3/Value.java | 121 .../cql3/statements/AlterTableStatement.java | 35 ++- .../cassandra/cql3/statements/BatchStatement.java |4 +- .../cassandra/cql3/statements/ColumnGroupMap.java | 175 +++ .../statements/CreateColumnFamilyStatement.java| 55 +++- .../cassandra/cql3/statements/DeleteStatement.java | 147 ++--- .../cql3/statements/ModificationStatement.java | 61 - .../cassandra/cql3/statements/SelectStatement.java | 164 --- .../apache/cassandra/cql3/statements/Selector.java | 78 +- .../cassandra/cql3/statements/UpdateStatement.java | 225 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/db/SliceFromReadCommand.java |3 +- .../apache/cassandra/db/filter/ColumnCounter.java | 108 +++ .../apache/cassandra/db/filter/ExtendedFilter.java |8 + .../cassandra/db/filter/SliceQueryFilter.java | 62 +++- .../db/marshal/AbstractCompositeType.java | 11 +- .../apache/cassandra/db/marshal/AbstractType.java | 23 ++ .../cassandra/db/marshal/CollectionType.java | 135 + .../db/marshal/ColumnToCollectionType.java | 135 + .../apache/cassandra/db/marshal/CompositeType.java | 44 ++- .../org/apache/cassandra/db/marshal/EmptyType.java | 67 .../org/apache/cassandra/db/marshal/ListType.java | 235 +++ .../org/apache/cassandra/db/marshal/MapType.java | 130 .../org/apache/cassandra/db/marshal/SetType.java | 134 .../apache/cassandra/db/marshal/TypeParser.java| 91 ++- src/java/org/apache/cassandra/utils/UUIDGen.java | 26 ++- .../Keyspace1-Standard3-hd-1-Data.db | Bin 498 -> 0 bytes .../Keyspace1-Standard3-hd-1-Filter.db | Bin 256 -> 0 bytes .../Keyspace1-Standard3-hd-1-Index.db | Bin 66 -> 0 bytes .../Keyspace1-Standard3-hd-1-Statistics.db | Bin 4354 -> 0 bytes .../Keyspace1-Standard3-ia-1-Data.db | Bin 0 -> 354 bytes .../Keyspace1-Standard3-ia-1-Filter.db | Bin 0 -> 256 bytes .../Keyspace1-Standard3-ia-1-Index.db | Bin 0 -> 90 bytes .../Keyspace1-Standard3-ia-1-Statistics.db | Bin 0 -> 4349 bytes .../serialization/1.2/db.RangeSliceCommand.bin | Bin 717 -> 733 bytes test/data/serialization/1.2/db.Row.bin | Bin 527 -> 527 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3410 -> 3410 bytes .../serialization/1.2/db.SliceFromReadCommand.bin | Bin 385 -> 409 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 110 -> 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 -> 930 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 -> 2500016 bytes test/unit/org/apache/cassandra/db/ScrubTest.java | 24 +- 54 files changed, 2486 insertions(+), 464 deletions(-) --
[3/50] git commit: Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4b6a571 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b6a571 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4b6a571 Branch: refs/heads/vnodes Commit: b4b6a57131e28b38ef7eeb7e15e6851f10e677ba Parents: 60cccdd bfa1e5b Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[7/50] git commit: Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path
Merge branch 'p/4125/01_admin_tools' into refs/top-bases/p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc140727 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc140727 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc140727 Branch: refs/heads/vnodes Commit: fc14072705cb36d4f07649cd3ef9a5354a64b070 Parents: ad0da57 fa7239c Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[5/50] git commit: Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4ff7dd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4ff7dd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4ff7dd6 Branch: refs/heads/vnodes Commit: e4ff7dd696ca1fcba8eb589e36e477f1c4ffc00e Parents: ce212ba 533b9c9 Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[4/50] git commit: Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c6ec7dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c6ec7dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c6ec7dc Branch: refs/heads/vnodes Commit: 0c6ec7dc1c32f25f30288ca6de31689765e30e6c Parents: 550d11a d4fef83 Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[1/50] git commit: Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path
Updated Branches: refs/heads/vnodes [created] 073634929 Merge commit 'refs/top-bases/p/4127/01_migration_path' into p/4127/01_migration_path Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07363492 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07363492 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07363492 Branch: refs/heads/vnodes Commit: 073634929c1c14e08ad3f786997c56f57c30516d Parents: f68621c fc14072 Author: Eric Evans Authored: Tue Jul 17 12:34:31 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:31 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[2/50] git commit: Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ed12b70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ed12b70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ed12b70 Branch: refs/heads/vnodes Commit: 0ed12b70b69448543bf21cd45d7f654994d6c1fe Parents: ddb1b21 0c6ec7d Author: Eric Evans Authored: Tue Jul 17 12:34:30 2012 -0500 Committer: Eric Evans Committed: Tue Jul 17 12:34:30 2012 -0500 -- CHANGES.txt|1 + lib/commons-lang-2.4.jar | Bin 261809 -> 0 bytes lib/commons-lang-2.6.jar | Bin 0 -> 284220 bytes .../org/apache/cassandra/db/marshal/DateType.java |2 +- 4 files changed, 2 insertions(+), 1 deletions(-) --
[jira] [Commented] (CASSANDRA-4324) Implement Lucene FST in for key index
[ https://issues.apache.org/jira/browse/CASSANDRA-4324?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416372#comment-13416372 ] Yuki Morishita commented on CASSANDRA-4324: --- Jason, I used YourKit and profiled memory usage for your test (little bit modified to call IndexSummary#complete) and it shows IndexSummary: 21,597,040 (~20MB) FST: 3,576,248 (~3.4MB) for storing 10,000 keys to each, so it's pretty impressive. If we can deliver this, it will be huge win. (Note that on disk, IndexSummary only writes key portion of DecoratedKey so it may be smaller than FST.) My concerns left are as follows: * Planned 1.2 release saves IndexSummary to disk(CASSANDRA-2392), so I think it is better to leave current implementation and add FST version of IndexSummary so you can rw from both. * DecoratedKeys stored inside current IndexSummary are actually accessed from various places, and FST version will lack those information, you may need to figure out the alternative way to preserve current functionality. * If you want to use Lucene 4.0, we should release this feature after 4.0 release. bq. Also the last results are for 100,000 keys rather than 1 mil. IndexSummary holds keys for every index_interval(default 128), so I think you don't need to test with 1 mil. > Implement Lucene FST in for key index > - > > Key: CASSANDRA-4324 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4324 > Project: Cassandra > Issue Type: Improvement >Reporter: Jason Rutherglen >Assignee: Jason Rutherglen >Priority: Minor > Fix For: 1.2 > > Attachments: CASSANDRA-4324.patch, CASSANDRA-4324.patch, > CASSANDRA-4324.patch, lucene-core-4.0-SNAPSHOT.jar > > > The Lucene FST data structure offers a compact and fast system for indexing > Cassandra keys. More keys may be loaded which in turn should seeks faster. > * Update the IndexSummary class to make use of the Lucene FST, overriding the > serialization mechanism. > * Alter SSTableReader to make use of the FST seek mechanism -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-1123) Allow tracing query details
[ https://issues.apache.org/jira/browse/CASSANDRA-1123?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] David Alves updated CASSANDRA-1123: --- Attachment: 1123.patch First patch that implements most of what was suggested, with accompanying test. Still to define/discuss: - aaraons "replaced" the logger with meant there were already a lot of things being logged. As is this patch is pretty "bare" in terms of trace events in the sense that stuff that goes through CassandraServer gets a new trace session but not much else is traced (even though session gets propagated across threads and nodes). Maybe we could add events automatically when a session is propagated across stages and across nodes? - I haven't added the log to the logger option yet, as I'm not completely sure how useful it is if events are generated per stage/node. > Allow tracing query details > --- > > Key: CASSANDRA-1123 > URL: https://issues.apache.org/jira/browse/CASSANDRA-1123 > Project: Cassandra > Issue Type: New Feature > Components: Core >Reporter: Jonathan Ellis >Assignee: David Alves > Fix For: 1.2 > > Attachments: 1123-3.patch.gz, 1123.patch > > > In the spirit of CASSANDRA-511, it would be useful to tracing on queries to > see where latency is coming from: how long did row cache lookup take? key > search in the index? merging the data from the sstables? etc. > The main difference vs setting debug logging is that debug logging is too big > of a hammer; by turning on the flood of logging for everyone, you actually > distort the information you're looking for. This would be something you > could set per-query (or more likely per connection). > We don't need to be as sophisticated as the techniques discussed in the > following papers but they are interesting reading: > http://research.google.com/pubs/pub36356.html > http://www.usenix.org/events/osdi04/tech/full_papers/barham/barham_html/ > http://www.usenix.org/event/nsdi07/tech/fonseca.html -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alex Liu updated CASSANDRA-4240: Attachment: cassandra-1.0.8-CASSANDRA-4240-patch2.txt small update > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1, > cassandra-1.0.8-CASSANDRA-4240-patch2.txt, cassandra-1.0.8-CASSANDRA-4240.txt > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416348#comment-13416348 ] T Jake Luciani commented on CASSANDRA-4240: --- Sorry one more thing. You should add validate to SecondaryIndex class as abstract. > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1, > cassandra-1.0.8-CASSANDRA-4240.txt > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Alex Liu updated CASSANDRA-4240: Attachment: cassandra-1.0.8-CASSANDRA-4240.txt latest patch > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1, > cassandra-1.0.8-CASSANDRA-4240.txt > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4436) Counters in columns don't preserve correct values after cluster restart
[ https://issues.apache.org/jira/browse/CASSANDRA-4436?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Peter Velas updated CASSANDRA-4436: --- Attachment: (was: increments.cql.gz) > Counters in columns don't preserve correct values after cluster restart > --- > > Key: CASSANDRA-4436 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4436 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.10 >Reporter: Peter Velas > Attachments: increments.cql.gz > > > Similar to #3821. but affecting normal columns. > Set up a 2-node cluster with rf=2. > 1. Create a counter column family and increment a 100 keys in loop 5000 > times. > 2. Then make a rolling restart to cluster. > 3. Again increment another 5000 times. > 4. Make a rolling restart to cluster. > 5. Again increment another 5000 times. > 6. Make a rolling restart to cluster. > After step 6 we were able to reproduce bug with bad counter values. > Expected values were 15 000. Values returned from cluster are higher then > 15000 + some random number. > Rolling restarts are done with nodetool drain. Always waiting until second > node discover its down then kill java process. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4436) Counters in columns don't preserve correct values after cluster restart
[ https://issues.apache.org/jira/browse/CASSANDRA-4436?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Peter Velas updated CASSANDRA-4436: --- Attachment: increments.cql.gz Increment for batch loading through cassandra-cli. > Counters in columns don't preserve correct values after cluster restart > --- > > Key: CASSANDRA-4436 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4436 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.10 >Reporter: Peter Velas > Attachments: increments.cql.gz > > > Similar to #3821. but affecting normal columns. > Set up a 2-node cluster with rf=2. > 1. Create a counter column family and increment a 100 keys in loop 5000 > times. > 2. Then make a rolling restart to cluster. > 3. Again increment another 5000 times. > 4. Make a rolling restart to cluster. > 5. Again increment another 5000 times. > 6. Make a rolling restart to cluster. > After step 6 we were able to reproduce bug with bad counter values. > Expected values were 15 000. Values returned from cluster are higher then > 15000 + some random number. > Rolling restarts are done with nodetool drain. Always waiting until second > node discover its down then kill java process. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4436) Counters in columns don't preserve correct values after cluster restart
[ https://issues.apache.org/jira/browse/CASSANDRA-4436?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416298#comment-13416298 ] Peter Velas commented on CASSANDRA-4436: You are right its not affected by compression. I was just curious if its problem with our python code using pycassa ... So I created increments.cql containing 100k lines with 1000 increments for each of 100 key values. {code} cassandra-cli -h $HOSTNAME -p 9160 -f increments.cql -B >/dev/null {code} after 3 rolling restarts each value was correct with value 3000 after 4 rolling restart values are incorrect see bellow {code} col15479 col10 5507 col100 5531 col11 5480 col12 5501 col13 5499 col14 5516 {code} Its 2 node cluster with replication=2. {code} [root@cass-bug1 ~]# /opt/apache-cassandra-1.0.10/bin/cassandra-cli -h $HOSTNAME -p 9160 -f increments.cql -B >/dev/null [root@cass-bug1 ~]# /opt/apache-cassandra-1.0.10/bin/nodetool -h $HOSTNAME drain [root@cass-bug2 ~]# /opt/apache-cassandra-1.0.10/bin/nodetool -h $HOSTNAME ring Address DC RackStatus State LoadOwns Token 85070591730234615865843651857942052864 10.20.30.160datacenter1 rack1 Down Normal 97.67 KB50.00% 0 10.20.30.161datacenter1 rack1 Up Normal 113.45 KB 50.00% 85070591730234615865843651857942052864 [root@cass-bug1 ~]# killall java [root@cass-bug1 ~]# /opt/apache-cassandra-1.0.10/bin/cassandra [root@cass-bug2 ~]# /opt/apache-cassandra-1.0.10/bin/nodetool -h $HOSTNAME drain [root@cass-bug1 ~]# /opt/apache-cassandra-1.0.10/bin/nodetool -h $HOSTNAME ring Address DC RackStatus State LoadOwns Token 85070591730234615865843651857942052864 10.20.30.160datacenter1 rack1 Up Normal 97.67 KB50.00% 0 10.20.30.161datacenter1 rack1 Down Normal 86.13 KB50.00% 85070591730234615865843651857942052864 [root@cass-bug2 ~]# killall java [root@cass-bug2 ~]# /opt/apache-cassandra-1.0.10/bin/cassandra {code} Here is dump of keyspace and CF {code} create keyspace inc_test with placement_strategy = 'SimpleStrategy' and strategy_options = {replication_factor : 2} and durable_writes = true; use inc_test; create column family cf1_increment with column_type = 'Standard' and comparator = 'BytesType' and default_validation_class = 'CounterColumnType' and key_validation_class = 'BytesType' and rows_cached = 0.0 and row_cache_save_period = 0 and row_cache_keys_to_save = 2147483647 and keys_cached = 20.0 and key_cache_save_period = 14400 and read_repair_chance = 1.0 and gc_grace = 864000 and min_compaction_threshold = 4 and max_compaction_threshold = 32 and replicate_on_write = true and row_cache_provider = 'SerializingCacheProvider' and compaction_strategy = 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'; {code} Hope that helps you reproduce .. > Counters in columns don't preserve correct values after cluster restart > --- > > Key: CASSANDRA-4436 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4436 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.10 >Reporter: Peter Velas > Attachments: increments.cql.gz > > > Similar to #3821. but affecting normal columns. > Set up a 2-node cluster with rf=2. > 1. Create a counter column family and increment a 100 keys in loop 5000 > times. > 2. Then make a rolling restart to cluster. > 3. Again increment another 5000 times. > 4. Make a rolling restart to cluster. > 5. Again increment another 5000 times. > 6. Make a rolling restart to cluster. > After step 6 we were able to reproduce bug with bad counter values. > Expected values were 15 000. Values returned from cluster are higher then > 15000 + some random number. > Rolling restarts are done with nodetool drain. Always waiting until second > node discover its down then kill java process. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4435) hints compaction loop over same sstable
[ https://issues.apache.org/jira/browse/CASSANDRA-4435?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Yuki Morishita updated CASSANDRA-4435: -- Attachment: 4435.txt Patch to not submit background compaction after flush. HHOM uses this to only perform user defined compaction after delivering hints. > hints compaction loop over same sstable > --- > > Key: CASSANDRA-4435 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4435 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.2 >Reporter: Brandon Williams >Assignee: Yuki Morishita > Labels: compaction, hintedhandoff > Attachments: 4435.txt > > > Noticed the following while testing something else: > {noformat} > INFO 22:14:48,496 Completed flushing > /var/lib/cassandra/data/system/hints/system-hints-ia-1-Data.db (109645 bytes) > for commitlog position ReplayPosition(segmentId=9372773011543415, > position=30358488) > INFO 22:14:48,498 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-1-Data.db')] > INFO 22:14:48,500 SSTables for user defined compaction are already being > compacted. > INFO 22:14:48,500 Finished hinted handoff of 16893 rows to endpoint > /10.179.64.227 > INFO 22:14:48,658 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-2-Data.db,]. 109,645 > to 899 (~0% of original) bytes for 1 keys at 0.005392MB/s. Time: 159ms. > INFO 22:14:48,660 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-2-Data.db')] > INFO 22:14:48,668 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-3-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.107169MB/s. Time: 8ms. > INFO 22:14:48,669 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-3-Data.db')] > INFO 22:14:48,679 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-4-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.095261MB/s. Time: 9ms. > INFO 22:14:48,680 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-4-Data.db')] > INFO 22:14:48,697 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-5-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.050433MB/s. Time: 17ms. > INFO 22:14:48,698 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-5-Data.db')] > INFO 22:14:48,714 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-6-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.053585MB/s. Time: 16ms. > INFO 22:14:48,715 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-6-Data.db')] > INFO 22:14:48,722 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-7-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.122479MB/s. Time: 7ms. > INFO 22:14:48,723 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-7-Data.db')] > INFO 22:14:48,736 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-8-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.065950MB/s. Time: 13ms. > INFO 22:14:48,737 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-8-Data.db')] > INFO 22:14:48,744 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-9-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.122479MB/s. Time: 7ms. > INFO 22:14:48,745 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-9-Data.db')] > INFO 22:14:48,753 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-10-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.122479MB/s. Time: 7ms. > INFO 22:14:48,754 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-10-Data.db')] > INFO 22:14:48,761 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-11-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.122479MB/s. Time: 7ms. > INFO 22:14:48,762 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-11-Data.db')] > INFO 22:14:48,775 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-12-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.065950MB/s. Time: 13ms. > INFO 22:14:48,776 Compacting > [SSTableReader(path='/var/lib/cassandra/data/system/hints/system-hints-ia-12-Data.db')] > INFO 22:14:48,783 Compacted to > [/var/lib/cassandra/data/system/hints/system-hints-ia-13-Data.db,]. 899 to > 899 (~100% of original) bytes for 1 keys at 0.
[jira] [Commented] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416280#comment-13416280 ] Alex Schultz commented on CASSANDRA-4439: - I have verified this patch fixes my issue. thanks. > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.config.CFMetaData.
[jira] [Updated] (CASSANDRA-4436) Counters in columns don't preserve correct values after cluster restart
[ https://issues.apache.org/jira/browse/CASSANDRA-4436?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Peter Velas updated CASSANDRA-4436: --- Attachment: increments.cql.gz > Counters in columns don't preserve correct values after cluster restart > --- > > Key: CASSANDRA-4436 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4436 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.10 >Reporter: Peter Velas > Attachments: increments.cql.gz > > > Similar to #3821. but affecting normal columns. > Set up a 2-node cluster with rf=2. > 1. Create a counter column family and increment a 100 keys in loop 5000 > times. > 2. Then make a rolling restart to cluster. > 3. Again increment another 5000 times. > 4. Make a rolling restart to cluster. > 5. Again increment another 5000 times. > 6. Make a rolling restart to cluster. > After step 6 we were able to reproduce bug with bad counter values. > Expected values were 15 000. Values returned from cluster are higher then > 15000 + some random number. > Rolling restarts are done with nodetool drain. Always waiting until second > node discover its down then kill java process. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416274#comment-13416274 ] Pavel Yaskevich commented on CASSANDRA-4439: No, it doesn't do that. > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java
[jira] [Commented] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416265#comment-13416265 ] Jonathan Ellis commented on CASSANDRA-4439: --- Isn't existingIndexNames supposed to take care of this case? > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.confi
[jira] [Updated] (CASSANDRA-4179) Add more general support for composites (to row key, column value)
[ https://issues.apache.org/jira/browse/CASSANDRA-4179?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-4179: Attachment: 4179-2.txt Attaching v2 that handle the token syntax. As said previous, I think that the OR support is way out of scope for this issue so I'd say this is good for review. > Add more general support for composites (to row key, column value) > -- > > Key: CASSANDRA-4179 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4179 > Project: Cassandra > Issue Type: Sub-task > Components: API >Reporter: Sylvain Lebresne >Assignee: Sylvain Lebresne >Priority: Minor > Labels: cql3 > Fix For: 1.2 > > Attachments: 4179-2.txt, 4179.txt > > > Currently CQL3 have a nice syntax for using composites in the column name > (it's more than that in fact, it creates a whole new abstraction but let's > say I'm talking implementation here). There is however 2 other place where > composites could be used (again implementation wise): the row key and the > column value. This ticket proposes to explore which of those make sense for > CQL3 and how. > For the row key, I really think that CQL support makes sense. It's very > common (and useful) to want to stuff composite information in a row key. > Sharding a time serie (CASSANDRA-4176) is probably the best example but there > is other. > For the column value it is less clear. CQL3 makes it very transparent and > convenient to store multiple related values into multiple columns so maybe > composites in a column value is much less needed. I do still see two cases > for which it could be handy: > # to save some disk/memory space, if you do know it makes no sense to > insert/read two value separatly. > # if you want to enforce that two values should not be inserted separatly. > I.e. to enforce a form of "constraint" to avoid programatic error. > Those are not widely useful things, but my reasoning is that if whatever > syntax we come up for "grouping" row key in a composite trivially extends to > column values, why not support it. > As for syntax I have 3 suggestions (that are just that, suggestions): > # If we only care about allowing grouping for row keys: > {noformat} > CREATE TABLE timeline ( > name text, > month int, > ts timestamp, > value text, > PRIMARY KEY ((name, month), ts) > ) > {noformat} > # A syntax that could work for both grouping in row key and colum value: > {noformat} > CREATE TABLE timeline ( > name text, > month int, > ts timestamp, > value1 text, > value2 text, > GROUP (name, month) as key, > GROUP (value1, value2), > PRIMARY KEY (key, ts) > ) > {noformat} > # An alternative to the preceding one: > {noformat} > CREATE TABLE timeline ( > name text, > month int, > ts timestamp, > value1 text, > value2 text, > GROUP (name, month) as key, > GROUP (value1, value2), > PRIMARY KEY (key, ts) > ) WITH GROUP (name, month) AS key >AND GROUP (value1, value2) > {noformat} -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4240) Only check the size of indexed column values when they are of type KEYS
[ https://issues.apache.org/jira/browse/CASSANDRA-4240?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416239#comment-13416239 ] T Jake Luciani commented on CASSANDRA-4240: --- I think you just need a null check incase the column isn't indexed that you are checking (in the IndexManager) > Only check the size of indexed column values when they are of type KEYS > --- > > Key: CASSANDRA-4240 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4240 > Project: Cassandra > Issue Type: Improvement >Affects Versions: 1.0.0 >Reporter: Joaquin Casares >Priority: Minor > Labels: datastax_qa > Attachments: CASSANDRA-4240.patch, CASSANDRA-4240.patch1 > > > https://github.com/apache/cassandra/blob/cassandra-1.0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java#L431 > That line states that: Indexed column values cannot be larger than 64K. But > in some cases we would want the column values to be able to be larger than > 64k, specifically if the index_type is not of type KEYS. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Updated] (CASSANDRA-4439) Updating column family using cassandra-cli results in "Cannot modify index name"
[ https://issues.apache.org/jira/browse/CASSANDRA-4439?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Pavel Yaskevich updated CASSANDRA-4439: --- Attachment: CASSANDRA-4439.patch > Updating column family using cassandra-cli results in "Cannot modify index > name" > > > Key: CASSANDRA-4439 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4439 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Affects Versions: 1.1.2 > Environment: cassandra 1.1.2, RHEL6.3, running under java-1.6.0-sun >Reporter: Alex Schultz >Assignee: Pavel Yaskevich >Priority: Minor > Labels: cli, schema > Fix For: 1.1.3 > > Attachments: CASSANDRA-4439.patch > > > Using cassandra-cli the following update to a column family worked in 1.1.0: > {code} > create keyspace testing; > use testing; > create column family Album > with comparator = UTF8Type > and default_validation_class = UTF8Type > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS} > ]; > update column family Album > and column_metadata = > [ > {column_name: profileId, validation_class: UTF8Type, index_type: KEYS}, > {column_name: postedDate, validation_class: LongType} > ]; > {code} > After upgrading to 1.1.2, the update statement fails with the following > exception in system.log: > {quote} > ERROR [Thrift:16] 2012-07-13 14:51:54,558 CustomTThreadPoolServer.java (line > 204) Error occurred during processing of message. > java.lang.RuntimeException: java.util.concurrent.ExecutionException: > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:373) > at > org.apache.cassandra.service.MigrationManager.announce(MigrationManager.java:188) > at > org.apache.cassandra.service.MigrationManager.announceColumnFamilyUpdate(MigrationManager.java:161) > at > org.apache.cassandra.thrift.CassandraServer.system_update_column_family(CassandraServer.java:1063) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3520) > at > org.apache.cassandra.thrift.Cassandra$Processor$system_update_column_family.getResult(Cassandra.java:3508) > at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:32) > at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:34) > at > org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:186) > at > java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) > at java.lang.Thread.run(Thread.java:662) > Caused by: java.util.concurrent.ExecutionException: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at java.util.concurrent.FutureTask$Sync.innerGet(FutureTask.java:222) > at java.util.concurrent.FutureTask.get(FutureTask.java:83) > at > org.apache.cassandra.utils.FBUtilities.waitOnFuture(FBUtilities.java:369) > ... 11 more > Caused by: java.io.IOException: > org.apache.cassandra.config.ConfigurationException: Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.updateColumnFamily(DefsTable.java:463) > at > org.apache.cassandra.db.DefsTable.mergeColumnFamilies(DefsTable.java:407) > at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:271) > at > org.apache.cassandra.service.MigrationManager$1.call(MigrationManager.java:211) > at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) > at java.util.concurrent.FutureTask.run(FutureTask.java:138) > ... 3 more > Caused by: org.apache.cassandra.config.ConfigurationException: Cannot modify > index name > at > org.apache.cassandra.config.ColumnDefinition.apply(ColumnDefinition.java:214) > at org.apache.cassandra.config.CFMetaData.apply(CFMetaData.java:758) > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:672) > ... 9 more > ERROR [MigrationStage:1] 2012-07-13 14:51:54,561 AbstractCassandraDaemon.java > (line 134) Exception in thread Thread[MigrationStage:1,5,main] > java.io.IOException: org.apache.cassandra.config.ConfigurationException: > Cannot modify index name > at org.apache.cassandra.config.CFMetaData.reload(CFMetaData.java:676) > at > org.apache.cassandra.db.DefsTable.
[jira] [Commented] (CASSANDRA-4436) Counters in columns don't preserve correct values after cluster restart
[ https://issues.apache.org/jira/browse/CASSANDRA-4436?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416080#comment-13416080 ] Sylvain Lebresne commented on CASSANDRA-4436: - The only difference I could see with the test I ran previously was the use of compression. So while I strongly doubt compression can have anything to do with that in any way, I rerun the test against 1.0 a bunch of time but I was still not able to reproduce any error. Since you seem to be able to reproduce easily, would you mind sharing the scripts you use to reproduce? I.e. mainly the code you use for insertion, preferably in plain thrift or CQL2 as this would eliminate the possibility of a client library bug. > Counters in columns don't preserve correct values after cluster restart > --- > > Key: CASSANDRA-4436 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4436 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.10 >Reporter: Peter Velas > > Similar to #3821. but affecting normal columns. > Set up a 2-node cluster with rf=2. > 1. Create a counter column family and increment a 100 keys in loop 5000 > times. > 2. Then make a rolling restart to cluster. > 3. Again increment another 5000 times. > 4. Make a rolling restart to cluster. > 5. Again increment another 5000 times. > 6. Make a rolling restart to cluster. > After step 6 we were able to reproduce bug with bad counter values. > Expected values were 15 000. Values returned from cluster are higher then > 15000 + some random number. > Rolling restarts are done with nodetool drain. Always waiting until second > node discover its down then kill java process. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Commented] (CASSANDRA-4427) Restarting a failed bootstrap instajoins the ring
[ https://issues.apache.org/jira/browse/CASSANDRA-4427?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13416041#comment-13416041 ] Sylvain Lebresne commented on CASSANDRA-4427: - I believe this simpler fix doesn't handle the case of boostrapping multiple nodes into an existing cluster. Namely, in that case, that will have a schema and so the node will have a system table by the time it checks for it and we'll end up picking the same token for multiple nodes. Also, I think checking system tables existence is fairly fragile and I would prefer moving away from it. It is way too easy to screw that up by having something (anything) written to those system tables. Typically, I don't know if that fix works for multiple nodes started in a brand new cluster (with not all being seeds), because without careful checking I don't know if we can end up writing some info in the system tables before checking for getBootstrapToken. Overall I do like the idea of registering that the bootstrap is in process, because on top of (I think) fixing the problem in a non-fragile way, it also allows us better reporting. Even outside of the problem of generating tokens, I think it is reassuring for a user that restart a node that failed to boostrap to have the software acknowledge that it understand and handle correctly the situation. > Restarting a failed bootstrap instajoins the ring > - > > Key: CASSANDRA-4427 > URL: https://issues.apache.org/jira/browse/CASSANDRA-4427 > Project: Cassandra > Issue Type: Bug > Components: Core >Affects Versions: 1.0.0 >Reporter: Brandon Williams >Assignee: Jonathan Ellis > Fix For: 1.0.11, 1.1.3 > > Attachments: 4427-v2.txt, 4427-v3.txt, 4427.txt > > > I think when we made auto_bootstrap = true the default, we broke the check > for the bootstrap flag, creating a dangerous situation. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira
git commit: Fix changelog
Updated Branches: refs/heads/trunk 6399c94e4 -> 72aa82401 Fix changelog Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72aa8240 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72aa8240 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72aa8240 Branch: refs/heads/trunk Commit: 72aa8240117dab6f6e7eaeaab112538b3bc557ca Parents: 6399c94 Author: Sylvain Lebresne Authored: Tue Jul 17 10:40:03 2012 +0200 Committer: Sylvain Lebresne Committed: Tue Jul 17 10:40:03 2012 +0200 -- CHANGES.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/72aa8240/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 5578aae..e9fdbf4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,7 @@ * Add column metadata to system column families (CASSANDRA-4018) * (cql3) Always use composite types by default (CASSANDRA-4329) * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) 1.1.3