[jira] [Commented] (CASSANDRA-6689) Partially Off Heap Memtables
[ https://issues.apache.org/jira/browse/CASSANDRA-6689?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924780#comment-13924780 ] Benedict commented on CASSANDRA-6689: - Note we will probably want to either include CASSANDRA-6781 at this point, or introduce another change to copy all records on-heap during memtable flush, else we may see the slower flush performance Marcus indicated. Partially Off Heap Memtables Key: CASSANDRA-6689 URL: https://issues.apache.org/jira/browse/CASSANDRA-6689 Project: Cassandra Issue Type: New Feature Components: Core Reporter: Benedict Assignee: Benedict Fix For: 2.1 beta2 Attachments: CASSANDRA-6689-small-changes.patch Move the contents of ByteBuffers off-heap for records written to a memtable. (See comments for details) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6825) COUNT(*) with WHERE not finding all the matching rows
[ https://issues.apache.org/jira/browse/CASSANDRA-6825?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924860#comment-13924860 ] Bill Mitchell commented on CASSANDRA-6825: -- If it helps in reproducing it, unlike my earlier report in CASSANDRA-6736, this failure and that of CASSANDRA-6826 appear in a small volume test, less than 100,000 rows total. This lower number was being run in a JUnit test as part of a maven build of a complete product, such that the test keyspace and tables were created, but the row insertion did not begin until 9 minutes later. So Cassandra is not noting these as high-volume activity, and the row width is not large enough to provoke incremental compaction, or in fact any compaction whatsoever. COUNT(*) with WHERE not finding all the matching rows - Key: CASSANDRA-6825 URL: https://issues.apache.org/jira/browse/CASSANDRA-6825 Project: Cassandra Issue Type: Bug Components: Core Environment: quad core Windows7 x64, single node cluster Cassandra 2.0.5 Reporter: Bill Mitchell Assignee: Russ Hatch Attachments: cassandra.log, selectpartitions.zip, selectrowcounts.txt Investigating another problem, I needed to do COUNT(*) on the several partitions of a table immediately after a test case ran, and I discovered that count(*) on the full table and on each of the partitions returned different counts. In particular case, SELECT COUNT(*) FROM sr LIMIT 100; returned the expected count from the test 9 rows. The composite primary key splits the logical row into six distinct partitions, and when I issue a query asking for the total across all six partitions, the returned result is only 83999. Drilling down, I find that SELECT * from sr WHERE s = 5 AND l = 11 AND partition = 0; returns 30,000 rows, but a SELECT COUNT(*) with the identical WHERE predicate reports only 14,000. This is failing immediately after running a single small test, such that there are only two SSTables, sr-jb-1 and sr-jb-2. Compaction never needed to run. In selectrowcounts.txt is a copy of the cqlsh output showing the incorrect count(*) results. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-5483) Repair tracing
[
https://issues.apache.org/jira/browse/CASSANDRA-5483?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924874#comment-13924874
]
Ben Chan commented on CASSANDRA-5483:
-
Thanks for the catch. Hopefully the fix is as easy as:
{noformat}
// using OpenJDK's source code for Executors.newCachedThreadPool() as a
reference
new DebuggableThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS,
new SynchronousQueueRunnable(),
new NamedThreadFactory(RepairJobTask));
{noformat}
Also note that {{v02-01}} added {{CompactionExecutor extends
DebuggableThreadPoolExecutor}}, so that is something else to watch out for.
---
Re: {
Oops (I'm normally KR).
Re: github
Move to a github workflow, or some sort of hybrid github/JIRA?
---
I guess the last caveat here is that most (I may have left in a few) of the old
non-{{trace}} function overloads are gone, so the server isn't going to work
with old versions of {{nodetool}}.
And a newer {{nodetool}} still won't work with older server versions. There may
be some tricks you can do with JMX, but I don't have deep knowledge there.
Maybe adding function overloads from the future (I noticed a similar trick in
{{MessagingService.java}}).
And there is a lot of repetitious parallel code with the tracing and logging
together. But that shouldn't affect the external functionality.
Repair tracing
--
Key: CASSANDRA-5483
URL: https://issues.apache.org/jira/browse/CASSANDRA-5483
Project: Cassandra
Issue Type: Improvement
Components: Tools
Reporter: Yuki Morishita
Assignee: Ben Chan
Priority: Minor
Labels: repair
Attachments: 5483-v06-04-Allow-tracing-ttl-to-be-configured.patch,
5483-v06-05-Add-a-command-column-to-system_traces.events.patch,
5483-v06-06-Fix-interruption-in-tracestate-propagation.patch,
ccm-repair-test, test-5483-system_traces-events.txt,
trunk@4620823-5483-v02-0001-Trace-filtering-and-tracestate-propagation.patch,
trunk@4620823-5483-v02-0002-Put-a-few-traces-parallel-to-the-repair-logging.patch,
tr...@8ebeee1-5483-v01-001-trace-filtering-and-tracestate-propagation.txt,
tr...@8ebeee1-5483-v01-002-simple-repair-tracing.txt,
v02p02-5483-v03-0003-Make-repair-tracing-controllable-via-nodetool.patch,
v02p02-5483-v04-0003-This-time-use-an-EnumSet-to-pass-boolean-repair-options.patch,
v02p02-5483-v05-0003-Use-long-instead-of-EnumSet-to-work-with-JMX.patch
I think it would be nice to log repair stats and results like query tracing
stores traces to system keyspace. With it, you don't have to lookup each log
file to see what was the status and how it performed the repair you invoked.
Instead, you can query the repair log with session ID to see the state and
stats of all nodes involved in that repair session.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
[jira] [Commented] (CASSANDRA-5483) Repair tracing
[ https://issues.apache.org/jira/browse/CASSANDRA-5483?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924903#comment-13924903 ] Lyuben Todorov commented on CASSANDRA-5483: --- bq. Move to a github workflow, or some sort of hybrid github/JIRA? [~usrbincc] Whichever you prefer, attaching a patch will be simpler, I can merge it into the existing github branch and post the update, but if you want feel free to create a branch yourself. bq. the server isn't going to work with old versions of nodetool I think that is ok since if someone upgrades it would kind of be expected for them to upgrade to the new nodetool as well. bq. there is a lot of repetitious parallel code with the tracing and logging together Maybe worth refactoring on a separate ticket, but lets not cause regression by trying to minimise code. Repair tracing -- Key: CASSANDRA-5483 URL: https://issues.apache.org/jira/browse/CASSANDRA-5483 Project: Cassandra Issue Type: Improvement Components: Tools Reporter: Yuki Morishita Assignee: Ben Chan Priority: Minor Labels: repair Attachments: 5483-v06-04-Allow-tracing-ttl-to-be-configured.patch, 5483-v06-05-Add-a-command-column-to-system_traces.events.patch, 5483-v06-06-Fix-interruption-in-tracestate-propagation.patch, ccm-repair-test, test-5483-system_traces-events.txt, trunk@4620823-5483-v02-0001-Trace-filtering-and-tracestate-propagation.patch, trunk@4620823-5483-v02-0002-Put-a-few-traces-parallel-to-the-repair-logging.patch, tr...@8ebeee1-5483-v01-001-trace-filtering-and-tracestate-propagation.txt, tr...@8ebeee1-5483-v01-002-simple-repair-tracing.txt, v02p02-5483-v03-0003-Make-repair-tracing-controllable-via-nodetool.patch, v02p02-5483-v04-0003-This-time-use-an-EnumSet-to-pass-boolean-repair-options.patch, v02p02-5483-v05-0003-Use-long-instead-of-EnumSet-to-work-with-JMX.patch I think it would be nice to log repair stats and results like query tracing stores traces to system keyspace. With it, you don't have to lookup each log file to see what was the status and how it performed the repair you invoked. Instead, you can query the repair log with session ID to see the state and stats of all nodes involved in that repair session. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6757) SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-6757?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924958#comment-13924958 ] Edward Capriolo commented on CASSANDRA-6757: Hey I noticed the fix version for 3.0. Is that the earliest version this will appear in. I think it could be back ported fairly far back if desired. SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift -- Key: CASSANDRA-6757 URL: https://issues.apache.org/jira/browse/CASSANDRA-6757 Project: Cassandra Issue Type: New Feature Reporter: Edward Capriolo Assignee: Edward Capriolo Fix For: 3.0 Attachments: Cassandra-6757.1.diff Thrift has getSlice() which takes a key and a predicate. SliceQueryFilter can accept multiple ColumnSlice(s). Users should have access to this capability already found in Cassandra. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-6828) inline thrift documentation is slightly sparse
Edward Capriolo created CASSANDRA-6828: -- Summary: inline thrift documentation is slightly sparse Key: CASSANDRA-6828 URL: https://issues.apache.org/jira/browse/CASSANDRA-6828 Project: Cassandra Issue Type: Improvement Reporter: Edward Capriolo Priority: Minor -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6828) inline thrift documentation is slightly sparse
[ https://issues.apache.org/jira/browse/CASSANDRA-6828?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924991#comment-13924991 ] Edward Capriolo commented on CASSANDRA-6828: Obviously there is a lot of good information found outside the thrift file. Some features like CAS have a good amount of documentation. Other features have little or none. Also found a spot where column path was referring to some html doc that seems to no longer exist. It is hard to say what information should or should not be here, but I thought it neccesary to at least alert people at one place in the file that they should not be using SuperColumns anymore :) https://github.com/edwardcapriolo/cassandra/compare/document-thrift-interface inline thrift documentation is slightly sparse --- Key: CASSANDRA-6828 URL: https://issues.apache.org/jira/browse/CASSANDRA-6828 Project: Cassandra Issue Type: Improvement Reporter: Edward Capriolo Priority: Minor -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6828) inline thrift documentation is slightly sparse
[ https://issues.apache.org/jira/browse/CASSANDRA-6828?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-6828: -- Reviewer: Tyler Hobbs Component/s: Documentation website API Assignee: Edward Capriolo inline thrift documentation is slightly sparse --- Key: CASSANDRA-6828 URL: https://issues.apache.org/jira/browse/CASSANDRA-6828 Project: Cassandra Issue Type: Improvement Components: API, Documentation website Reporter: Edward Capriolo Assignee: Edward Capriolo Priority: Minor -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6757) SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-6757?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924992#comment-13924992 ] Jonathan Ellis commented on CASSANDRA-6757: --- I committed to 3.0 (trunk) because the changes conflicted against the 2.1 branch. I agree that it would be fine in 2.1 in principle, even 2.0. SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift -- Key: CASSANDRA-6757 URL: https://issues.apache.org/jira/browse/CASSANDRA-6757 Project: Cassandra Issue Type: New Feature Reporter: Edward Capriolo Assignee: Edward Capriolo Fix For: 3.0 Attachments: Cassandra-6757.1.diff Thrift has getSlice() which takes a key and a predicate. SliceQueryFilter can accept multiple ColumnSlice(s). Users should have access to this capability already found in Cassandra. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6757) SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift
[ https://issues.apache.org/jira/browse/CASSANDRA-6757?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13924995#comment-13924995 ] Edward Capriolo commented on CASSANDRA-6757: Ah that is my bad. I meant to base of 2.1. If i get some free time I will make a patch for the back port. For now this is fine. SliceQueryFilter can accept multiple ColumnSlice but not exposed to thrift -- Key: CASSANDRA-6757 URL: https://issues.apache.org/jira/browse/CASSANDRA-6757 Project: Cassandra Issue Type: New Feature Reporter: Edward Capriolo Assignee: Edward Capriolo Fix For: 3.0 Attachments: Cassandra-6757.1.diff Thrift has getSlice() which takes a key and a predicate. SliceQueryFilter can accept multiple ColumnSlice(s). Users should have access to this capability already found in Cassandra. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6811) nodetool no longer shows node joining
[ https://issues.apache.org/jira/browse/CASSANDRA-6811?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13925021#comment-13925021 ] Vijay commented on CASSANDRA-6811: -- Just to clarify we have this information as a part of nodetool status, we might want to display the same information with 0% Owns? or potentially what it will own after the transient state. nodetool no longer shows node joining - Key: CASSANDRA-6811 URL: https://issues.apache.org/jira/browse/CASSANDRA-6811 Project: Cassandra Issue Type: Bug Components: Core Reporter: Brandon Williams Assignee: Vijay Priority: Minor Fix For: 1.2.16 When we added effective ownership output to nodetool ring/status, we accidentally began excluding joining nodes because we iterate the ownership maps instead of the the endpoint to token map when printing the output, and the joining nodes don't have any ownership. The simplest thing to do is probably iterate the token map instead, and not output any ownership info for joining nodes. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-6811) nodetool no longer shows node joining
[ https://issues.apache.org/jira/browse/CASSANDRA-6811?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Brandon Williams updated CASSANDRA-6811: Attachment: ringfix.txt Here's a patch that illustrates what I mean and fixes 'ring' output. 'status' is a bit more involved, but considering how long we've done this I'm fine with not getting fancy about inferring ownership on joining nodes. nodetool no longer shows node joining - Key: CASSANDRA-6811 URL: https://issues.apache.org/jira/browse/CASSANDRA-6811 Project: Cassandra Issue Type: Bug Components: Core Reporter: Brandon Williams Assignee: Vijay Priority: Minor Fix For: 1.2.16 Attachments: ringfix.txt When we added effective ownership output to nodetool ring/status, we accidentally began excluding joining nodes because we iterate the ownership maps instead of the the endpoint to token map when printing the output, and the joining nodes don't have any ownership. The simplest thing to do is probably iterate the token map instead, and not output any ownership info for joining nodes. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6811) nodetool no longer shows node joining
[
https://issues.apache.org/jira/browse/CASSANDRA-6811?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13925064#comment-13925064
]
Brandon Williams commented on CASSANDRA-6811:
-
The easiest way to test this is to put a node into write survey mode
{{-Dcassandra.write_survey_mode=true}}
nodetool no longer shows node joining
-
Key: CASSANDRA-6811
URL: https://issues.apache.org/jira/browse/CASSANDRA-6811
Project: Cassandra
Issue Type: Bug
Components: Core
Reporter: Brandon Williams
Assignee: Vijay
Priority: Minor
Fix For: 1.2.16
Attachments: ringfix.txt
When we added effective ownership output to nodetool ring/status, we
accidentally began excluding joining nodes because we iterate the ownership
maps instead of the the endpoint to token map when printing the output, and
the joining nodes don't have any ownership. The simplest thing to do is
probably iterate the token map instead, and not output any ownership info for
joining nodes.
--
This message was sent by Atlassian JIRA
(v6.2#6252)
git commit: avoid reinitiating gossip when nothings changed
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 893c11f54 - 89bccb6f7
avoid reinitiating gossip when nothings changed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89bccb6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89bccb6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89bccb6f
Branch: refs/heads/cassandra-2.1
Commit: 89bccb6f7b34667668db6a41f34fa24c94faf0d2
Parents: 893c11f
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:20:35 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:20:35 2014 -0500
--
.../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89bccb6f/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
--
diff --git
a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index 720e804..2c0980a 100644
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@ -174,7 +174,7 @@ public class GossipingPropertyFileSnitch extends
AbstractNetworkTopologySnitch//
newRack = newRack.trim();
final boolean newPreferLocal =
Boolean.parseBoolean(properties.get(prefer_local, false));
-if (myDC != newDc || myRack != newRack || (preferLocal !=
newPreferLocal))
+if (!newDc.equals(myDC) || !newRack.equals(myRack) || (preferLocal !=
newPreferLocal))
{
myDC = newDc;
myRack = newRack;
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b730e5f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b730e5f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b730e5f2 Branch: refs/heads/trunk Commit: b730e5f26d33a2e72054d3450ad451292fcb21ec Parents: 17adc59 89bccb6 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:21:22 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:21:22 2014 -0500 -- .../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[1/2] git commit: avoid reinitiating gossip when nothings changed
Repository: cassandra
Updated Branches:
refs/heads/trunk 17adc5963 - b730e5f26
avoid reinitiating gossip when nothings changed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89bccb6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89bccb6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89bccb6f
Branch: refs/heads/trunk
Commit: 89bccb6f7b34667668db6a41f34fa24c94faf0d2
Parents: 893c11f
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:20:35 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:20:35 2014 -0500
--
.../org/apache/cassandra/locator/GossipingPropertyFileSnitch.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89bccb6f/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
--
diff --git
a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
index 720e804..2c0980a 100644
--- a/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/GossipingPropertyFileSnitch.java
@@ -174,7 +174,7 @@ public class GossipingPropertyFileSnitch extends
AbstractNetworkTopologySnitch//
newRack = newRack.trim();
final boolean newPreferLocal =
Boolean.parseBoolean(properties.get(prefer_local, false));
-if (myDC != newDc || myRack != newRack || (preferLocal !=
newPreferLocal))
+if (!newDc.equals(myDC) || !newRack.equals(myRack) || (preferLocal !=
newPreferLocal))
{
myDC = newDc;
myRack = newRack;
git commit: simply: no need for iterator to get first item in List
Repository: cassandra
Updated Branches:
refs/heads/trunk b730e5f26 - 572d32876
simply: no need for iterator to get first item in List
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572d3287
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572d3287
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572d3287
Branch: refs/heads/trunk
Commit: 572d328762bee9100549963a6826fdb9f633af2a
Parents: b730e5f
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sat Mar 8 21:38:23 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sat Mar 8 21:38:23 2014 -0500
--
.../org/apache/cassandra/cql3/statements/UpdateStatement.java| 2 +-
test/unit/org/apache/cassandra/db/RowIterationTest.java | 4 ++--
test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572d3287/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index 85ca069..b0c7db8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@ -71,7 +71,7 @@ public class UpdateStatement extends ModificationStatement
if (cfm.comparator.isDense())
{
if (prefix.isEmpty())
-throw new InvalidRequestException(String.format(Missing
PRIMARY KEY part %s, cfm.clusteringColumns().iterator().next()));
+throw new InvalidRequestException(String.format(Missing
PRIMARY KEY part %s, cfm.clusteringColumns().get(0)));
// An empty name for the compact value is what we use to recognize
the case where there is not column
// outside the PK, see CreateStatement.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572d3287/test/unit/org/apache/cassandra/db/RowIterationTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java
b/test/unit/org/apache/cassandra/db/RowIterationTest.java
index bfba858..34fbf82 100644
--- a/test/unit/org/apache/cassandra/db/RowIterationTest.java
+++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java
@@ -82,7 +82,7 @@ public class RowIterationTest extends SchemaLoader
rm.apply();
store.forceBlockingFlush();
-ColumnFamily cf = Util.getRangeSlice(store).iterator().next().cf;
+ColumnFamily cf = Util.getRangeSlice(store).get(0).cf;
assert cf.deletionInfo().equals(delInfo2);
}
@@ -100,7 +100,7 @@ public class RowIterationTest extends SchemaLoader
rm.apply();
store.forceBlockingFlush();
-ColumnFamily cf = Util.getRangeSlice(store).iterator().next().cf;
+ColumnFamily cf = Util.getRangeSlice(store).get(0).cf;
assert cf != null;
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572d3287/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
--
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index bd50538..ecaa276 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -201,7 +201,7 @@ public class SSTableReaderTest extends SchemaLoader
long p6 = sstable.getPosition(k(6),
SSTableReader.Operator.EQ).position;
long p7 = sstable.getPosition(k(7),
SSTableReader.Operator.EQ).position;
-PairLong, Long p = sstable.getPositionsForRanges(makeRanges(t(2),
t(6))).iterator().next();
+PairLong, Long p = sstable.getPositionsForRanges(makeRanges(t(2),
t(6))).get(0);
// range are start exclusive so we should start at 3
assert p.left == p3;
git commit: fix typo in cfmbean comparator
Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 64098f7d6 - 1e1129c61 fix typo in cfmbean comparator Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6 Branch: refs/heads/cassandra-1.2 Commit: 1e1129c61db7e410816854c8f62f1c600d10644f Parents: 64098f7 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:48:57 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:48:57 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 1557a6a..d2393ca 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements IteratorMap.EntryString, Colum // get CF name and split it for index name String e1CF[] = e1.getValue().getColumnFamilyName().split(\\.); -String e2CF[] = e1.getValue().getColumnFamilyName().split(\\.); +String e2CF[] = e2.getValue().getColumnFamilyName().split(\\.); assert e1CF.length = 2 e2CF.length = 2 : unexpected split count for column family name; //if neither are indexes, just compare CF names
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f0952eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f0952eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f0952eb Branch: refs/heads/cassandra-2.0 Commit: 8f0952eb53259a9fc21aba5128168e09c257c603 Parents: 656edc5 1e1129c Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:50:22 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:50:22 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f0952eb/src/java/org/apache/cassandra/tools/NodeProbe.java --
[1/2] git commit: fix typo in cfmbean comparator
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 656edc529 - 8f0952eb5 fix typo in cfmbean comparator Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6 Branch: refs/heads/cassandra-2.0 Commit: 1e1129c61db7e410816854c8f62f1c600d10644f Parents: 64098f7 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:48:57 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:48:57 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 1557a6a..d2393ca 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements IteratorMap.EntryString, Colum // get CF name and split it for index name String e1CF[] = e1.getValue().getColumnFamilyName().split(\\.); -String e2CF[] = e1.getValue().getColumnFamilyName().split(\\.); +String e2CF[] = e2.getValue().getColumnFamilyName().split(\\.); assert e1CF.length = 2 e2CF.length = 2 : unexpected split count for column family name; //if neither are indexes, just compare CF names
[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f0952eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f0952eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f0952eb Branch: refs/heads/cassandra-2.1 Commit: 8f0952eb53259a9fc21aba5128168e09c257c603 Parents: 656edc5 1e1129c Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:50:22 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:50:22 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f0952eb/src/java/org/apache/cassandra/tools/NodeProbe.java --
[4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5310f26d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5310f26d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5310f26d Branch: refs/heads/cassandra-2.1 Commit: 5310f26d442f20d52d6fcef47ebbecc502b703d6 Parents: 89bccb6 8f0952e Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 22:22:31 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 22:22:31 2014 -0500 -- NEWS.txt | 19 +++ debian/changelog | 6 ++ .../org/apache/cassandra/tools/NodeProbe.java| 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/NEWS.txt -- diff --cc NEWS.txt index 865830c,18f89bc..23f6522 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,46 -13,26 +13,65 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +2.1 +=== + +New features + + - SSTable data directory name is slightly changed. Each directory will + have hex string appended after CF name, e.g. + ks/cf-5be396077b811e3a3ab9dc4b9ac088d/ + This hex string part represents unique ColumnFamily ID. + Note that existing directories are used as is, so only newly created + directories after upgrade have new directory name format. + - Saved key cache files also have ColumnFamily ID in their file name. + - It is now possible to do incremental repairs, sstables that have been + repaired are marked with a timestamp and not included in the next + repair session. Use nodetool repair -par -inc to use this feature. + A tool to manually mark/unmark sstables as repaired is available in + tools/bin/sstablerepairedset. + +Upgrading +- + - Rolling upgrades from anything pre-2.0.6 is not supported. + - For leveled compaction users, 2.0 must be atleast started before + upgrading to 2.1 due to the fact that the old JSON leveled + manifest is migrated into the sstable metadata files on startup + in 2.0 and this code is gone from 2.1. + - For size-tiered compaction users, Cassandra now defaults to ignoring + the coldest 5% of sstables. This can be customized with the + cold_reads_to_omit compaction option; 0.0 omits nothing (the old + behavior) and 1.0 omits everything. + - Multithreaded compaction has been removed. + - Counters implementation has been changed, replaced by a safer one with + less caveats, but different performance characteristics. You might have + to change your data model to accomodate the new implementation. + (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev + blog post at http://www.datastax.com/dev/blog/PLACEHOLDER for details). +- (per-table) index_interval parameter has been replaced with + min_index_interval and max_index_interval paratemeters. index_interval + has been deprecated. + + 2.0.6 + = + + New features + + - CQL now support static columns, allows to batch multiple conditional updates + and has a new syntax for slicing over multiple clustering columns + (http://goo.gl/B6qz4j). + - Repair can be restricted to a set of nodes using the -hosts option in nodetool. + - A new 'nodetool taketoken' command relocate tokens with vnodes. + - Hinted handoff can be enabled only for some data-centers (see + hinted_handoff_enabled in cassandra.yaml) + + Upgrading + - + - Nothing specific to this release, but please see 2.0.6 if you are upgrading + from a previous version. + + 2.0.5 = http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/debian/changelog -- diff --cc debian/changelog index a13370f,6cc4391..11f25cb --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,15 @@@ +cassandra (2.1.0~beta1) unstable; urgency=low + + * New beta release + + -- Sylvain Lebresne slebre...@apache.org Mon, 17 Feb 2014 16:50:33 +0100 + + cassandra (2.0.6) unstable; urgency=low + + * New release + + -- Sylvain Lebresne slebre...@apache.org Fri, 07 Mar 2014 13:18:42 +0100 + cassandra (2.0.5) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/src/java/org/apache/cassandra/tools/NodeProbe.java --
[1/4] git commit: Update version, news and license for 2.0.6
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 89bccb6f7 - 5310f26d4
Update version, news and license for 2.0.6
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/656edc52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656edc52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656edc52
Branch: refs/heads/cassandra-2.1
Commit: 656edc529db59f0002a7fb0eed93339071fd3974
Parents: f3be42f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Mar 7 13:20:03 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Mar 7 13:20:03 2014 +0100
--
NEWS.txt | 19 +++
build.xml| 2 +-
debian/changelog | 6 ++
.../apache/cassandra/hadoop/ReporterWrapper.java | 19 ++-
4 files changed, 44 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index b18150f..18f89bc 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,25 @@ restore snapshots created with the previous major version
using the
using the provided 'sstableupgrade' tool.
+2.0.6
+=
+
+New features
+
+- CQL now support static columns, allows to batch multiple conditional
updates
+ and has a new syntax for slicing over multiple clustering columns
+ (http://goo.gl/B6qz4j).
+- Repair can be restricted to a set of nodes using the -hosts option in
nodetool.
+- A new 'nodetool taketoken' command relocate tokens with vnodes.
+- Hinted handoff can be enabled only for some data-centers (see
+ hinted_handoff_enabled in cassandra.yaml)
+
+Upgrading
+-
+- Nothing specific to this release, but please see 2.0.6 if you are
upgrading
+ from a previous version.
+
+
2.0.5
=
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/build.xml
--
diff --git a/build.xml b/build.xml
index 70f514c..3e25e25 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
property name=debuglevel value=source,lines,vars/
!-- default version and SCM information --
-property name=base.version value=2.0.5/
+property name=base.version value=2.0.6/
property name=scm.connection
value=scm:git://git.apache.org/cassandra.git/
property name=scm.developerConnection
value=scm:git://git.apache.org/cassandra.git/
property name=scm.url
value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 0dd17d6..6cc4391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.6) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne slebre...@apache.org Fri, 07 Mar 2014 13:18:42 +0100
+
cassandra (2.0.5) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
index 9940ba4..9c9c61f 100644
--- a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
+++ b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.hadoop;
import org.apache.hadoop.mapred.Counters;
@@ -54,4 +71,4 @@ public class ReporterWrapper extends StatusReporter
implements Reporter {
public void setStatus(String s) {
wrappedReporter.setStatus(s);
}
-}
\ No
[2/4] git commit: fix typo in cfmbean comparator
fix typo in cfmbean comparator Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6 Branch: refs/heads/cassandra-2.1 Commit: 1e1129c61db7e410816854c8f62f1c600d10644f Parents: 64098f7 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:48:57 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:48:57 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 1557a6a..d2393ca 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements IteratorMap.EntryString, Colum // get CF name and split it for index name String e1CF[] = e1.getValue().getColumnFamilyName().split(\\.); -String e2CF[] = e1.getValue().getColumnFamilyName().split(\\.); +String e2CF[] = e2.getValue().getColumnFamilyName().split(\\.); assert e1CF.length = 2 e2CF.length = 2 : unexpected split count for column family name; //if neither are indexes, just compare CF names
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/baa2b692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baa2b692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/baa2b692 Branch: refs/heads/trunk Commit: baa2b692db781c46170b707cdc5cafd033ac42b0 Parents: 572d328 5310f26 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 22:23:41 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 22:23:41 2014 -0500 -- NEWS.txt | 19 +++ debian/changelog | 6 ++ .../org/apache/cassandra/tools/NodeProbe.java| 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/baa2b692/NEWS.txt --
[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5310f26d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5310f26d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5310f26d Branch: refs/heads/trunk Commit: 5310f26d442f20d52d6fcef47ebbecc502b703d6 Parents: 89bccb6 8f0952e Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 22:22:31 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 22:22:31 2014 -0500 -- NEWS.txt | 19 +++ debian/changelog | 6 ++ .../org/apache/cassandra/tools/NodeProbe.java| 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/NEWS.txt -- diff --cc NEWS.txt index 865830c,18f89bc..23f6522 --- a/NEWS.txt +++ b/NEWS.txt @@@ -13,46 -13,26 +13,65 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +2.1 +=== + +New features + + - SSTable data directory name is slightly changed. Each directory will + have hex string appended after CF name, e.g. + ks/cf-5be396077b811e3a3ab9dc4b9ac088d/ + This hex string part represents unique ColumnFamily ID. + Note that existing directories are used as is, so only newly created + directories after upgrade have new directory name format. + - Saved key cache files also have ColumnFamily ID in their file name. + - It is now possible to do incremental repairs, sstables that have been + repaired are marked with a timestamp and not included in the next + repair session. Use nodetool repair -par -inc to use this feature. + A tool to manually mark/unmark sstables as repaired is available in + tools/bin/sstablerepairedset. + +Upgrading +- + - Rolling upgrades from anything pre-2.0.6 is not supported. + - For leveled compaction users, 2.0 must be atleast started before + upgrading to 2.1 due to the fact that the old JSON leveled + manifest is migrated into the sstable metadata files on startup + in 2.0 and this code is gone from 2.1. + - For size-tiered compaction users, Cassandra now defaults to ignoring + the coldest 5% of sstables. This can be customized with the + cold_reads_to_omit compaction option; 0.0 omits nothing (the old + behavior) and 1.0 omits everything. + - Multithreaded compaction has been removed. + - Counters implementation has been changed, replaced by a safer one with + less caveats, but different performance characteristics. You might have + to change your data model to accomodate the new implementation. + (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev + blog post at http://www.datastax.com/dev/blog/PLACEHOLDER for details). +- (per-table) index_interval parameter has been replaced with + min_index_interval and max_index_interval paratemeters. index_interval + has been deprecated. + + 2.0.6 + = + + New features + + - CQL now support static columns, allows to batch multiple conditional updates + and has a new syntax for slicing over multiple clustering columns + (http://goo.gl/B6qz4j). + - Repair can be restricted to a set of nodes using the -hosts option in nodetool. + - A new 'nodetool taketoken' command relocate tokens with vnodes. + - Hinted handoff can be enabled only for some data-centers (see + hinted_handoff_enabled in cassandra.yaml) + + Upgrading + - + - Nothing specific to this release, but please see 2.0.6 if you are upgrading + from a previous version. + + 2.0.5 = http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/debian/changelog -- diff --cc debian/changelog index a13370f,6cc4391..11f25cb --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,15 @@@ +cassandra (2.1.0~beta1) unstable; urgency=low + + * New beta release + + -- Sylvain Lebresne slebre...@apache.org Mon, 17 Feb 2014 16:50:33 +0100 + + cassandra (2.0.6) unstable; urgency=low + + * New release + + -- Sylvain Lebresne slebre...@apache.org Fri, 07 Mar 2014 13:18:42 +0100 + cassandra (2.0.5) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/src/java/org/apache/cassandra/tools/NodeProbe.java --
[2/5] git commit: fix typo in cfmbean comparator
fix typo in cfmbean comparator Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e1129c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e1129c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e1129c6 Branch: refs/heads/trunk Commit: 1e1129c61db7e410816854c8f62f1c600d10644f Parents: 64098f7 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:48:57 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:48:57 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e1129c6/src/java/org/apache/cassandra/tools/NodeProbe.java -- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index 1557a6a..d2393ca 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -895,7 +895,7 @@ class ColumnFamilyStoreMBeanIterator implements IteratorMap.EntryString, Colum // get CF name and split it for index name String e1CF[] = e1.getValue().getColumnFamilyName().split(\\.); -String e2CF[] = e1.getValue().getColumnFamilyName().split(\\.); +String e2CF[] = e2.getValue().getColumnFamilyName().split(\\.); assert e1CF.length = 2 e2CF.length = 2 : unexpected split count for column family name; //if neither are indexes, just compare CF names
[3/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f0952eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f0952eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f0952eb Branch: refs/heads/trunk Commit: 8f0952eb53259a9fc21aba5128168e09c257c603 Parents: 656edc5 1e1129c Author: Dave Brosius dbros...@mebigfatguy.com Authored: Sat Mar 8 21:50:22 2014 -0500 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Sat Mar 8 21:50:22 2014 -0500 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f0952eb/src/java/org/apache/cassandra/tools/NodeProbe.java --
[1/5] git commit: Update version, news and license for 2.0.6
Repository: cassandra
Updated Branches:
refs/heads/trunk 572d32876 - baa2b692d
Update version, news and license for 2.0.6
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/656edc52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/656edc52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/656edc52
Branch: refs/heads/trunk
Commit: 656edc529db59f0002a7fb0eed93339071fd3974
Parents: f3be42f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Mar 7 13:20:03 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Mar 7 13:20:03 2014 +0100
--
NEWS.txt | 19 +++
build.xml| 2 +-
debian/changelog | 6 ++
.../apache/cassandra/hadoop/ReporterWrapper.java | 19 ++-
4 files changed, 44 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/NEWS.txt
--
diff --git a/NEWS.txt b/NEWS.txt
index b18150f..18f89bc 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,25 @@ restore snapshots created with the previous major version
using the
using the provided 'sstableupgrade' tool.
+2.0.6
+=
+
+New features
+
+- CQL now support static columns, allows to batch multiple conditional
updates
+ and has a new syntax for slicing over multiple clustering columns
+ (http://goo.gl/B6qz4j).
+- Repair can be restricted to a set of nodes using the -hosts option in
nodetool.
+- A new 'nodetool taketoken' command relocate tokens with vnodes.
+- Hinted handoff can be enabled only for some data-centers (see
+ hinted_handoff_enabled in cassandra.yaml)
+
+Upgrading
+-
+- Nothing specific to this release, but please see 2.0.6 if you are
upgrading
+ from a previous version.
+
+
2.0.5
=
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/build.xml
--
diff --git a/build.xml b/build.xml
index 70f514c..3e25e25 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
property name=debuglevel value=source,lines,vars/
!-- default version and SCM information --
-property name=base.version value=2.0.5/
+property name=base.version value=2.0.6/
property name=scm.connection
value=scm:git://git.apache.org/cassandra.git/
property name=scm.developerConnection
value=scm:git://git.apache.org/cassandra.git/
property name=scm.url
value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/debian/changelog
--
diff --git a/debian/changelog b/debian/changelog
index 0dd17d6..6cc4391 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.6) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne slebre...@apache.org Fri, 07 Mar 2014 13:18:42 +0100
+
cassandra (2.0.5) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/656edc52/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
--
diff --git a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
index 9940ba4..9c9c61f 100644
--- a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
+++ b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.cassandra.hadoop;
import org.apache.hadoop.mapred.Counters;
@@ -54,4 +71,4 @@ public class ReporterWrapper extends StatusReporter
implements Reporter {
public void setStatus(String s) {
wrappedReporter.setStatus(s);
}
-}
\ No newline at end of
