svn commit: r1126356 - in /cassandra/branches/cassandra-0.8: ./ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/marshal/ src/java/org/apache/cassandra/io/ src/java/org/apache/cassan

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 07:34:59 2011
New Revision: 1126356

URL: http://svn.apache.org/viewvc?rev=1126356view=rev
Log:
Improve forceDeserialize/getCompactedRow encapsulation
patch by jbellis; reviewed by slebresne for CASSANDRA-ticket

Added:

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/AbstractType.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126356r1=1126355r2=1126356view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 07:34:59 2011
@@ -14,6 +14,7 @@
buffers again, especially on CL writes (CASSANDRA-2660)
  * add DROP INDEX support to CLI (CASSANDRA-2616)
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
+ * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
 
 
 0.8.0-final

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1126356r1=1126355r2=1126356view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Mon May 23 07:34:59 2011
@@ -968,9 +968,9 @@ public class ColumnFamilyStore implement
 data.markCompacted(sstables);
 }
 
-boolean isCompleteSSTables(CollectionSSTableReader sstables)
+public boolean isCompleteSSTables(SetSSTableReader sstables)
 {
-return data.getSSTables().equals(new HashSetSSTableReader(sstables));
+return data.getSSTables().equals(sstables);
 }
 
 void replaceCompactedSSTables(CollectionSSTableReader sstables, 
IterableSSTableReader replacements)

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1126356r1=1126355r2=1126356view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
 Mon May 23 07:34:59 2011
@@ -18,13 +18,11 @@
 
 package org.apache.cassandra.db;
 
-import java.io.DataOutput;
 import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.nio.ByteBuffer;
-import java.security.MessageDigest;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.*;
@@ -128,7 +126,7 @@ public class CompactionManager implement
 logger.debug(Checking to see if compaction of  + 
cfs.columnFamily +  would be useful);
 SetListSSTableReader buckets = 
getBuckets(convertSSTablesToPairs(cfs.getSSTables()), 50L * 1024L * 1024L);
 updateEstimateFor(cfs, buckets);
-int gcBefore = cfs.isIndex() ? Integer.MAX_VALUE : 
getDefaultGcBefore(cfs);
+int gcBefore = getDefaultGcBefore(cfs);
 
 for (ListSSTableReader sstables : buckets)
 {
@@ -529,11 +527,15 @@ public class CompactionManager implement
 for (SSTableReader sstable : sstables)
 assert sstable.descriptor.cfname.equals(cfs.columnFamily);
 
+// compaction won't normally compact a single sstable, so if that's 
what we're doing
+// it must have been requested manually by the user, which probably 
means he wants to force
+// tombstone purge, which won't happen unless we force deserializing 
the rows.
+boolean forceDeserialize = sstables.size() == 

svn commit: r1126363 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/marshal/ src/java/org/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 07:53:48 2011
New Revision: 1126363

URL: http://svn.apache.org/viewvc?rev=1126363view=rev
Log:
merge from 0.8

Added:
cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java
  - copied unchanged from r1126356, 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java
Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
cassandra/trunk/src/java/org/apache/cassandra/io/CompactionController.java
cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java
cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java

cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 07:53:48 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 /cassandra/branches/cassandra-0.7:1026516-1125002
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1125101
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1125101,1126356
 /cassandra/branches/cassandra-0.8.0:1125021-1125100
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1126363r1=1126362r2=1126363view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon May 23 07:53:48 2011
@@ -14,6 +14,7 @@
buffers again, especially on CL writes (CASSANDRA-2660)
  * add DROP INDEX support to CLI (CASSANDRA-2616)
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
+ * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
 
 
 0.8.0-final

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 07:53:48 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1125002
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1125101
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1125101,1126356
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1125100
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 07:53:48 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1125002
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1125101
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1125101,1126356
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1125100
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
 

svn commit: r1126389 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/dht/AbstractBounds.java test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 08:51:54 2011
New Revision: 1126389

URL: http://svn.apache.org/viewvc?rev=1126389view=rev
Log:
Assert ranges are not overlapping in AbstractBounds.normalize
patch by stuhood; reviewed by slebresne for CASSANDRA-2641

Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126389r1=1126388r2=1126389view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 08:51:54 2011
@@ -15,6 +15,7 @@
  * add DROP INDEX support to CLI (CASSANDRA-2616)
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
  * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
+ * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
 
 
 0.8.0-final

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java?rev=1126389r1=1126388r2=1126389view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java
 Mon May 23 08:51:54 2011
@@ -90,13 +90,21 @@ public abstract class AbstractBounds imp
 
 /**
  * @return A copy of the given list of non-intersecting bounds with all 
bounds unwrapped, sorted by bound.left.
+ * This method does not allow overlapping ranges as input.
  */
 public static ListAbstractBounds normalize(Collection? extends 
AbstractBounds bounds)
 {
 // unwrap all
 ListAbstractBounds output = new ArrayListAbstractBounds();
+AbstractBounds previous = null;
 for (AbstractBounds bound : bounds)
-output.addAll(bound.unwrap());
+{
+ListAbstractBounds unwrapped = bound.unwrap();
+assert previous == null || 
previous.right.compareTo(unwrapped.get(0).left) = 0 :
+Overlapping ranges passed to normalize: see CASSANDRA-2461:  
+ previous +  and  + unwrapped;
+output.addAll(unwrapped);
+previous = unwrapped.get(unwrapped.size() - 1);
+}
 
 // sort by left
 Collections.sort(output, new ComparatorAbstractBounds()

Modified: 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java?rev=1126389r1=1126388r2=1126389view=diff
==
--- 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
 Mon May 23 08:51:54 2011
@@ -115,90 +115,90 @@ public class StreamingTransferTest exten
 @Test
 public void testTransferTableMultiple() throws Exception
 {
-// write a temporary SSTable, but don't register it
+// write temporary SSTables, but don't register them
 SetString content = new HashSetString();
-content.add(transfer1);
-content.add(transfer2);
-content.add(transfer3);
+content.add(test);
+content.add(test2);
+content.add(test3);
 SSTableReader sstable = SSTableUtils.prepare().write(content);
 String tablename = sstable.getTableName();
 String cfname = sstable.getColumnFamilyName();
 
-SetString content2 = new HashSetString();
-content2.add(test);
-content2.add(test2);
-content2.add(test3);
-SSTableReader sstable2 = SSTableUtils.prepare().write(content2);
+content = new HashSetString();
+content.add(transfer1);
+content.add(transfer2);
+content.add(transfer3);
+SSTableReader sstable2 = SSTableUtils.prepare().write(content);
 
 // transfer the first and last key
 IPartitioner p = StorageService.getPartitioner();
 ListRange ranges = new ArrayListRange();
-ranges.add(new Range(p.getMinimumToken(), 
p.getToken(ByteBufferUtil.bytes(transfer1;
-ranges.add(new Range(p.getToken(ByteBufferUtil.bytes(test2)), 
p.getMinimumToken()));
+ranges.add(new Range(p.getMinimumToken(), 

svn commit: r1126391 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/dht/ test/unit/org/apache/cassandra/streaming/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 08:54:05 2011
New Revision: 1126391

URL: http://svn.apache.org/viewvc?rev=1126391view=rev
Log:
merge from 0.8

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/dht/AbstractBounds.java

cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 08:54:05 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 /cassandra/branches/cassandra-0.7:1026516-1125002
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1125101,1126356
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1125101,1126356,1126389
 /cassandra/branches/cassandra-0.8.0:1125021-1125100
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1126391r1=1126390r2=1126391view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon May 23 08:54:05 2011
@@ -15,6 +15,7 @@
  * add DROP INDEX support to CLI (CASSANDRA-2616)
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
  * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
+ * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
 
 
 0.8.0-final

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 08:54:05 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1125002
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1125101,1126356
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1125101,1126356,1126389
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1125100
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 08:54:05 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1125002
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1125101,1126356
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1125101,1126356,1126389
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1125100
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 08:54:05 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 

[jira] [Commented] (CASSANDRA-2641) AbstractBounds.normalize should deal with overlapping ranges

2011-05-23 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2641?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037822#comment-13037822
 ] 

Hudson commented on CASSANDRA-2641:
---

Integrated in Cassandra-0.8 #122 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.8/122/])
Assert ranges are not overlapping in AbstractBounds.normalize
patch by stuhood; reviewed by slebresne for CASSANDRA-2641

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1126389
Files : 
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/dht/AbstractBounds.java


 AbstractBounds.normalize should deal with overlapping ranges
 

 Key: CASSANDRA-2641
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2641
 Project: Cassandra
  Issue Type: Test
  Components: Core
Reporter: Stu Hood
Assignee: Stu Hood
Priority: Minor
 Fix For: 0.8.1

 Attachments: 0001-Assert-non-overlapping-ranges-in-normalize.txt, 
 0002-Don-t-use-overlapping-ranges-in-tests.txt


 Apparently no consumers have encountered it in production, but 
 AbstractBounds.normalize does not handle overlapping ranges. If given 
 overlapping ranges, the output will be sorted but still overlapping, for 
 which SSTableReader.getPositionsForRanges will choose ranges in an SSTable 
 that may overlap.
 We should either add an assert in normalize(), or in getPositionsForRanges() 
 to ensure that this never bites us in production.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2280) Request specific column families using StreamIn

2011-05-23 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2280?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037826#comment-13037826
 ] 

Sylvain Lebresne commented on CASSANDRA-2280:
-

* If we're going to put that in 0.8.1 (which we should), we cannot rely on 
MessagingService.VERSION_07. We must bump the version for 0.8.0. Turns out 
CASSANDRA-2433 already have this problem, so I suggest we introduce a 
MS.VERSION_080 and stick to that (as a side note, when that's done, we should 
be careful with StreamRequestMessage as it will have a 0.7 and 0.8.0 part, i.e, 
we shouldn't blindly s/VERSION_07/VERSION_080 in there).
* In StreamHeader and StreamRequestMessage, Iterables.size() is used. Is there 
a reason for that ? Though google collections are probably smart enough to not 
do a full iteration to compute the size when possible, in theory we can't 
really be sure so I don't see why not use .size() (and use a Collection 
instead of Iterable in StreamHeader, although see next point).
* Why are we sending the cfs in StreamHeader at all. It's never used and I 
don't see why it should (StreamInSession will know what it receive with each 
file, no reason why it should know upfront what was the request that initiated 
the streaming).

 Request specific column families using StreamIn
 ---

 Key: CASSANDRA-2280
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2280
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Stu Hood
Assignee: Jonathan Ellis
 Fix For: 0.8.1

 Attachments: 
 0001-Allow-specific-column-families-to-be-requested-for-str.txt, 
 0001-Allow-specific-column-families-to-be-requested-for-str.txt, 2280-v3.txt


 StreamIn.requestRanges only specifies a keyspace, meaning that requesting a 
 range will request it for all column families: if you have a large number of 
 CFs, this can cause quite a headache.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126416 - in /cassandra/branches/cassandra-0.8: ./ src/java/org/apache/cassandra/db/ test/unit/org/apache/cassandra/ test/unit/org/apache/cassandra/db/ test/unit/org/apache/cassandra/serv

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 10:16:25 2011
New Revision: 1126416

URL: http://svn.apache.org/viewvc?rev=1126416view=rev
Log:
Don't write CounterUpdateColumn to disk in tests
patch by stuhood; reviewed by slebresne for CASSANDRA-2650

Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceCounterTest.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceStandardTest.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126416r1=1126415r2=1126416view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 10:16:25 2011
@@ -16,6 +16,7 @@
  * don't perform HH to client-mode [storageproxy] nodes (CASSANDRA-2668)
  * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
  * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
+ * Don't write CounterUpdateColumn to disk in tests (CASSANDRA-2650)
 
 
 0.8.0-final

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java?rev=1126416r1=1126415r2=1126416view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java
 Mon May 23 10:16:25 2011
@@ -72,6 +72,11 @@ public class CounterMutation implements 
 return rowMutation.getTable();
 }
 
+public CollectionInteger getColumnFamilyIds()
+{
+return rowMutation.getColumnFamilyIds();
+}
+
 public ByteBuffer key()
 {
 return rowMutation.key();

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java?rev=1126416r1=1126415r2=1126416view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java
 Mon May 23 10:16:25 2011
@@ -19,11 +19,14 @@
 package org.apache.cassandra.db;
 
 import java.nio.ByteBuffer;
-
+import java.io.IOException;
+import java.util.Collection;
 
 public interface IMutation
 {
 public String getTable();
+public CollectionInteger getColumnFamilyIds();
 public ByteBuffer key();
+public void apply() throws IOException;
 public String toString(boolean shallow);
 }

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java?rev=1126416r1=1126415r2=1126416view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java
 Mon May 23 10:16:25 2011
@@ -82,6 +82,11 @@ public class RowMutation implements IMut
 return table_;
 }
 
+public CollectionInteger getColumnFamilyIds()
+{
+return modifications_.keySet();
+}
+
 public ByteBuffer key()
 {
 return key_;

Modified: 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java?rev=1126416r1=1126415r2=1126416view=diff
==
--- cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java 
(original)
+++ cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java 
Mon May 23 10:16:25 2011
@@ -106,18 +106,16 @@ public class Util
  * @param rows A group of RowMutations for the same table 

buildbot failure in ASF Buildbot on cassandra-trunk

2011-05-23 Thread buildbot
The Buildbot has detected a new failure on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1322

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1126422
Blamelist: slebresne

BUILD FAILED: failed compile

sincerely,
 -The Buildbot



[jira] [Commented] (CASSANDRA-2650) AntiEntropyServiceCounterTest writes CounterUpdateColumn to disk

2011-05-23 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2650?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037899#comment-13037899
 ] 

Hudson commented on CASSANDRA-2650:
---

Integrated in Cassandra-0.8 #123 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.8/123/])
Don't write CounterUpdateColumn to disk in tests
patch by stuhood; reviewed by slebresne for CASSANDRA-2650

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1126416
Files : 
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/IMutation.java
* /cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/Util.java
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceStandardTest.java
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceCounterTest.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java


 AntiEntropyServiceCounterTest writes CounterUpdateColumn to disk
 

 Key: CASSANDRA-2650
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2650
 Project: Cassandra
  Issue Type: Test
  Components: Tests
Reporter: Stu Hood
Assignee: Stu Hood
Priority: Minor
  Labels: counters
 Fix For: 1.0

 Attachments: 
 0001-Make-IMutation-more-uniform-and-apply-IMutation-in-Uti.txt


 By using an unwrapped RowMutation to apply a counter update, AESCT was 
 applying/flushing a CounterUpdateColumn to disk. I'm still not a fan of the 
 magic that is going on with CUC, but for now fixing misuses is the most 
 reasonable approach.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2685) NPE in Table.createReplicationStrategy during sends from HintedHandOffManager

2011-05-23 Thread Marko Mikulicic (JIRA)
NPE in Table.createReplicationStrategy during sends from HintedHandOffManager
-

 Key: CASSANDRA-2685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2685
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.6
 Environment: 2.6.32-5-xen-amd64 #1 SMP Wed Jan 12 05:46:49 UTC 2011 
x86_64 GNU/Linux

Reporter: Marko Mikulicic


After about 800k inserts in a column family with RF=1, I get this exception:

{code}
ERROR [HintedHandoff:2] 2011-05-20 18:38:25,089 AbstractCassandraDaemon.java 
(line 114) Fatal exception in thread Thread[HintedHandoff:2,1,main]
java.lang.RuntimeException: java.lang.NullPointerException
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
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.lang.NullPointerException
at 
org.apache.cassandra.db.Table.createReplicationStrategy(Table.java:266)
at org.apache.cassandra.db.Table.init(Table.java:212)
at org.apache.cassandra.db.Table.open(Table.java:106)
at 
org.apache.cassandra.db.HintedHandOffManager.sendMessage(HintedHandOffManager.java:131)
at 
org.apache.cassandra.db.HintedHandOffManager.deliverHintsToEndpoint(HintedHandOffManager.java:331)
at 
org.apache.cassandra.db.HintedHandOffManager.access$100(HintedHandOffManager.java:88)
at 
org.apache.cassandra.db.HintedHandOffManager$2.runMayThrow(HintedHandOffManager.java:409)
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
... 3 more
{code}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126477 - in /cassandra/branches/cassandra-0.8: ./ bin/ src/java/org/apache/cassandra/io/sstable/ src/java/org/apache/cassandra/service/ src/java/org/apache/cassandra/streaming/ src/java/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 12:51:03 2011
New Revision: 1126477

URL: http://svn.apache.org/viewvc?rev=1126477view=rev
Log:
Add sstable bulk loading utility
patch by slebresne; reviewed by jbellis for CASSANDRA-1278

Added:
cassandra/branches/cassandra-0.8/bin/sstableloader

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageServiceMBean.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/OperationType.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamOutSession.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/BloomFilter.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126477r1=1126476r2=1126477view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 12:51:03 2011
@@ -17,6 +17,7 @@
  * Improve forceDeserialize/getCompactedRow encapsulation (CASSANDRA-2659)
  * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
  * Don't write CounterUpdateColumn to disk in tests (CASSANDRA-2650)
+ * Add sstable bulk loading utility (CASSANDRA-1278)
 
 
 0.8.0-final

Added: cassandra/branches/cassandra-0.8/bin/sstableloader
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/bin/sstableloader?rev=1126477view=auto
==
--- cassandra/branches/cassandra-0.8/bin/sstableloader (added)
+++ cassandra/branches/cassandra-0.8/bin/sstableloader Mon May 23 12:51:03 2011
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# 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.
+
+if [ x$CASSANDRA_INCLUDE = x ]; then
+for include in /usr/share/cassandra/cassandra.in.sh \
+   /usr/local/share/cassandra/cassandra.in.sh \
+   /opt/cassandra/cassandra.in.sh \
+   ~/.cassandra.in.sh \
+   `dirname $0`/cassandra.in.sh; do
+if [ -r $include ]; then
+. $include
+break
+fi
+done
+elif [ -r $CASSANDRA_INCLUDE ]; then
+. $CASSANDRA_INCLUDE
+fi
+
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+JAVA=$JAVA_HOME/bin/java
+else
+JAVA=`which java`
+fi
+
+if [ -z $CLASSPATH ]; then
+echo You must set the CLASSPATH var 2
+exit 1
+fi
+
+$JAVA -ea -cp $CLASSPATH -Xmx256M \
+-Dlog4j.configuration=log4j-tools.properties \
+org.apache.cassandra.tools.BulkLoader $@
+
+# vi:ai sw=4 ts=4 tw=0 et

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java?rev=1126477r1=1126476r2=1126477view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java
 Mon May 23 12:51:03 2011
@@ -85,9 +85,10 @@ public abstract class SSTable
 
 protected SSTable(Descriptor descriptor, SetComponent components, 
CFMetaData metadata, ReplayPosition replayPosition, IPartitioner partitioner, 
EstimatedHistogram rowSizes, EstimatedHistogram columnCounts)
 {
+// In almost all cases, metadata shouldn't be null, but allowing null 
allows to create a mostly functional SSTable without
+// 

[jira] [Commented] (CASSANDRA-1278) Make bulk loading into Cassandra less crappy, more pluggable

2011-05-23 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-1278?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037933#comment-13037933
 ] 

Hudson commented on CASSANDRA-1278:
---

Integrated in Cassandra-0.8 #124 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.8/124/])
Add sstable bulk loading utility
patch by slebresne; reviewed by jbellis for CASSANDRA-1278

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1126477
Files : 
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/BloomFilter.java
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageServiceMBean.java
* /cassandra/branches/cassandra-0.8/bin/sstableloader
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/BulkLoader.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/OperationType.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/streaming/StreamOutSession.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTable.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java


 Make bulk loading into Cassandra less crappy, more pluggable
 

 Key: CASSANDRA-1278
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1278
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Jeremy Hanna
Assignee: Sylvain Lebresne
 Fix For: 0.8.1

 Attachments: 0001-Add-bulk-loader-utility-v2.patch, 
 0001-Add-bulk-loader-utility.patch, 1278-cassandra-0.7-v2.txt, 
 1278-cassandra-0.7.1.txt, 1278-cassandra-0.7.txt

   Original Estimate: 40h
  Time Spent: 40h 40m
  Remaining Estimate: 0h

 Currently bulk loading into Cassandra is a black art.  People are either 
 directed to just do it responsibly with thrift or a higher level client, or 
 they have to explore the contrib/bmt example - 
 http://wiki.apache.org/cassandra/BinaryMemtable  That contrib module requires 
 delving into the code to find out how it works and then applying it to the 
 given problem.  Using either method, the user also needs to keep in mind that 
 overloading the cluster is possible - which will hopefully be addressed in 
 CASSANDRA-685
 This improvement would be to create a contrib module or set of documents 
 dealing with bulk loading.  Perhaps it could include code in the Core to make 
 it more pluggable for external clients of different types.
 It is just that this is something that many that are new to Cassandra need to 
 do - bulk load their data into Cassandra.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126483 - in /cassandra/branches/cassandra-0.8.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 13:27:02 2011
New Revision: 1126483

URL: http://svn.apache.org/viewvc?rev=1126483view=rev
Log:
merge from 0.7

Modified:
cassandra/branches/cassandra-0.8.0/   (props changed)
cassandra/branches/cassandra-0.8.0/CHANGES.txt
cassandra/branches/cassandra-0.8.0/contrib/   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-0.8.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:27:02 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1102504,1124338,1126290
+/cassandra/branches/cassandra-0.7:1026516-1126482
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 
/cassandra/branches/cassandra-0.8:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-0.8.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/CHANGES.txt?rev=1126483r1=1126482r2=1126483view=diff
==
--- cassandra/branches/cassandra-0.8.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.0/CHANGES.txt Mon May 23 13:27:02 2011
@@ -35,6 +35,8 @@
  * add quote-escaping via backslash to CLI (CASSANDRA-2623)
  * fig pig example script (CASSANDRA-2487)
  * fix dynamic snitch race in adding latencies (CASSANDRA-2618)
+ * Start/stop cassandra after more important services such as mdadm in
+   debian packaging (CASSANDRA-2481)
 
 
 0.8.0-beta2

Propchange: cassandra/branches/cassandra-0.8.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:27:02 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1102504,1124338,1126290
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126482
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 
/cassandra/branches/cassandra-0.8/contrib:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:27:02 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1102504,1124338,1126290
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126482
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:27:02 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1102504,1124338,1126290
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126482
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 

svn commit: r1126484 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/service/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 13:28:29 2011
New Revision: 1126484

URL: http://svn.apache.org/viewvc?rev=1126484view=rev
Log:
merge from 0.7

Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:28:29 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1125002,1126290
+/cassandra/branches/cassandra-0.7:1026516-1126483
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1126293

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:28:29 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1125002,1126290
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126483
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1126293

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:28:29 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1125002,1126290
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126483
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126293

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:28:29 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1125002,1126290
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126483
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1126293

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 13:28:29 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000

buildbot success in ASF Buildbot on cassandra-trunk

2011-05-23 Thread buildbot
The Buildbot has detected a restored build on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1323

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1126485
Blamelist: jbellis

Build succeeded!

sincerely,
 -The Buildbot



[jira] [Updated] (CASSANDRA-2680) range scan doesn't repair missing rows

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2680?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2680:
--

Reviewer: slebresne  (was: bcoverston)

 range scan doesn't repair missing rows
 --

 Key: CASSANDRA-2680
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2680
 Project: Cassandra
  Issue Type: Bug
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.7

 Attachments: 2680.txt


 Range scans do not do digest queries but they do compare all the replicas 
 they receive and repair any discrepancies in the background.  (Thus, to get 
 comparable behavior to normal read repair, CL.ALL must be used.)
 The bug is that currently, replicas that omit a row entirely will be ignored 
 and that row will not be sent to them.  

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2675) java.io.IOError: java.io.EOFException with version 0.7.6

2011-05-23 Thread rene kochen (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2675?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

rene kochen updated CASSANDRA-2675:
---

Attachment: CassandraIssueJava.zip

Included the Java version of the test program.

Usage:

java -jar CassandraIssue.jar [ip [keyspace [column-family [port



 java.io.IOError: java.io.EOFException with version 0.7.6 
 -

 Key: CASSANDRA-2675
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2675
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.6
 Environment: Single node.
Reporter: rene kochen
 Attachments: CassandraIssue.zip, CassandraIssueJava.zip


 I use the following data-model
 column_metadata: []
 name: Customers
 column_type: Super
 gc_grace_seconds: 60
 I have a super-column-family with a single row.
 Within this row I have a single super-column.
 Within this super-column, I concurrently create, read and delete columns.
 I have three threads:
 - Do in a loop: add a column to the super-column.
 - Do in a loop: delete a random column from the super-column.
 - Do in a loop: read the super-column (with all columns).
 After running the above threads concurrently, I always receive one of the 
 following errors:
 ERROR 17:09:57,036 Fatal exception in thread Thread[ReadStage:81,5,main]
 java.io.IOError: java.io.EOFException
 at 
 org.apache.cassandra.io.util.ColumnIterator.deserializeNext(ColumnSortedMap.java:252)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:268)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:227)
 at java.util.concurrent.ConcurrentSkipListMap.buildFromSorted(Unknown 
 Source)
 at java.util.concurrent.ConcurrentSkipListMap.init(Unknown Source)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:379)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:362)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:322)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:79)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:40)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.hasNext(SSTableSliceIterator.java:108)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.set(CollatingIterator.java:283)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.least(CollatingIterator.java:326)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.next(CollatingIterator.java:230)
 at 
 org.apache.cassandra.utils.ReducingIterator.computeNext(ReducingIterator.java:69)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.filter.SliceQueryFilter.collectReducedColumns(SliceQueryFilter.java:116)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collectCollatedColumns(QueryFilter.java:130)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1390)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1267)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1195)
 at org.apache.cassandra.db.Table.getRow(Table.java:324)
 at 
 org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:63)
 at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:451)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(Unknown 
 Source)
 at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
 at java.lang.Thread.run(Unknown Source)
 Caused by: java.io.EOFException
 at java.io.RandomAccessFile.readByte(Unknown Source)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readShortLength(ByteBufferUtil.java:324)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength(ByteBufferUtil.java:335)
 at 
 org.apache.cassandra.db.ColumnSerializer.deserialize(ColumnSerializer.java:71)
 at 
 org.apache.cassandra.io.util.ColumnIterator.deserializeNext(ColumnSortedMap.java:248)
 ... 30 more
 

[jira] [Updated] (CASSANDRA-2685) NPE in Table.createReplicationStrategy during sends from HintedHandOffManager

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2685?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2685:
--

 Reviewer: gdusbabek
 Priority: Minor  (was: Major)
Affects Version/s: (was: 0.7.6)
   0.7.0
Fix Version/s: 0.8.1
   0.7.7
 Assignee: Jonathan Ellis

 NPE in Table.createReplicationStrategy during sends from HintedHandOffManager
 -

 Key: CASSANDRA-2685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2685
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
 Environment: 2.6.32-5-xen-amd64 #1 SMP Wed Jan 12 05:46:49 UTC 2011 
 x86_64 GNU/Linux
Reporter: Marko Mikulicic
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.7, 0.8.1

 Attachments: 2685.txt


 After about 800k inserts in a column family with RF=1, I get this exception:
 {code}
 ERROR [HintedHandoff:2] 2011-05-20 18:38:25,089 AbstractCassandraDaemon.java 
 (line 114) Fatal exception in thread Thread[HintedHandoff:2,1,main]
 java.lang.RuntimeException: java.lang.NullPointerException
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
   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.lang.NullPointerException
   at 
 org.apache.cassandra.db.Table.createReplicationStrategy(Table.java:266)
   at org.apache.cassandra.db.Table.init(Table.java:212)
   at org.apache.cassandra.db.Table.open(Table.java:106)
   at 
 org.apache.cassandra.db.HintedHandOffManager.sendMessage(HintedHandOffManager.java:131)
   at 
 org.apache.cassandra.db.HintedHandOffManager.deliverHintsToEndpoint(HintedHandOffManager.java:331)
   at 
 org.apache.cassandra.db.HintedHandOffManager.access$100(HintedHandOffManager.java:88)
   at 
 org.apache.cassandra.db.HintedHandOffManager$2.runMayThrow(HintedHandOffManager.java:409)
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
   ... 3 more
 {code}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2685) NPE in Table.createReplicationStrategy during sends from HintedHandOffManager

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2685?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2685:
--

Attachment: 2685.txt

patch to skip replay of hints for dropped KS/CF

 NPE in Table.createReplicationStrategy during sends from HintedHandOffManager
 -

 Key: CASSANDRA-2685
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2685
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
 Environment: 2.6.32-5-xen-amd64 #1 SMP Wed Jan 12 05:46:49 UTC 2011 
 x86_64 GNU/Linux
Reporter: Marko Mikulicic
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.7, 0.8.1

 Attachments: 2685.txt


 After about 800k inserts in a column family with RF=1, I get this exception:
 {code}
 ERROR [HintedHandoff:2] 2011-05-20 18:38:25,089 AbstractCassandraDaemon.java 
 (line 114) Fatal exception in thread Thread[HintedHandoff:2,1,main]
 java.lang.RuntimeException: java.lang.NullPointerException
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
   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.lang.NullPointerException
   at 
 org.apache.cassandra.db.Table.createReplicationStrategy(Table.java:266)
   at org.apache.cassandra.db.Table.init(Table.java:212)
   at org.apache.cassandra.db.Table.open(Table.java:106)
   at 
 org.apache.cassandra.db.HintedHandOffManager.sendMessage(HintedHandOffManager.java:131)
   at 
 org.apache.cassandra.db.HintedHandOffManager.deliverHintsToEndpoint(HintedHandOffManager.java:331)
   at 
 org.apache.cassandra.db.HintedHandOffManager.access$100(HintedHandOffManager.java:88)
   at 
 org.apache.cassandra.db.HintedHandOffManager$2.runMayThrow(HintedHandOffManager.java:409)
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
   ... 3 more
 {code}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2675) java.io.IOError: java.io.EOFException with version 0.7.6

2011-05-23 Thread rene kochen (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2675?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

rene kochen updated CASSANDRA-2675:
---

Environment: 
Reproduced on single Cassandra node (CentOS 5.5)
Reproduced on single Cassandra node (Windows Server 2008)

  was:Single node.


 java.io.IOError: java.io.EOFException with version 0.7.6 
 -

 Key: CASSANDRA-2675
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2675
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.6
 Environment: Reproduced on single Cassandra node (CentOS 5.5)
 Reproduced on single Cassandra node (Windows Server 2008)
Reporter: rene kochen
 Attachments: CassandraIssue.zip, CassandraIssueJava.zip


 I use the following data-model
 column_metadata: []
 name: Customers
 column_type: Super
 gc_grace_seconds: 60
 I have a super-column-family with a single row.
 Within this row I have a single super-column.
 Within this super-column, I concurrently create, read and delete columns.
 I have three threads:
 - Do in a loop: add a column to the super-column.
 - Do in a loop: delete a random column from the super-column.
 - Do in a loop: read the super-column (with all columns).
 After running the above threads concurrently, I always receive one of the 
 following errors:
 ERROR 17:09:57,036 Fatal exception in thread Thread[ReadStage:81,5,main]
 java.io.IOError: java.io.EOFException
 at 
 org.apache.cassandra.io.util.ColumnIterator.deserializeNext(ColumnSortedMap.java:252)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:268)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:227)
 at java.util.concurrent.ConcurrentSkipListMap.buildFromSorted(Unknown 
 Source)
 at java.util.concurrent.ConcurrentSkipListMap.init(Unknown Source)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:379)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:362)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:322)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:79)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:40)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.hasNext(SSTableSliceIterator.java:108)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.set(CollatingIterator.java:283)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.least(CollatingIterator.java:326)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.next(CollatingIterator.java:230)
 at 
 org.apache.cassandra.utils.ReducingIterator.computeNext(ReducingIterator.java:69)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.filter.SliceQueryFilter.collectReducedColumns(SliceQueryFilter.java:116)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collectCollatedColumns(QueryFilter.java:130)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1390)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1267)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1195)
 at org.apache.cassandra.db.Table.getRow(Table.java:324)
 at 
 org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:63)
 at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:451)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(Unknown 
 Source)
 at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
 at java.lang.Thread.run(Unknown Source)
 Caused by: java.io.EOFException
 at java.io.RandomAccessFile.readByte(Unknown Source)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readShortLength(ByteBufferUtil.java:324)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength(ByteBufferUtil.java:335)
 at 
 org.apache.cassandra.db.ColumnSerializer.deserialize(ColumnSerializer.java:71)
 at 
 

[jira] [Updated] (CASSANDRA-2675) java.io.IOError: java.io.EOFException with version 0.7.6

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2675?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2675:
--

Fix Version/s: 0.7.7
 Assignee: Sylvain Lebresne

 java.io.IOError: java.io.EOFException with version 0.7.6 
 -

 Key: CASSANDRA-2675
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2675
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.6
 Environment: Reproduced on single Cassandra node (CentOS 5.5)
 Reproduced on single Cassandra node (Windows Server 2008)
Reporter: rene kochen
Assignee: Sylvain Lebresne
 Fix For: 0.7.7

 Attachments: CassandraIssue.zip, CassandraIssueJava.zip


 I use the following data-model
 column_metadata: []
 name: Customers
 column_type: Super
 gc_grace_seconds: 60
 I have a super-column-family with a single row.
 Within this row I have a single super-column.
 Within this super-column, I concurrently create, read and delete columns.
 I have three threads:
 - Do in a loop: add a column to the super-column.
 - Do in a loop: delete a random column from the super-column.
 - Do in a loop: read the super-column (with all columns).
 After running the above threads concurrently, I always receive one of the 
 following errors:
 ERROR 17:09:57,036 Fatal exception in thread Thread[ReadStage:81,5,main]
 java.io.IOError: java.io.EOFException
 at 
 org.apache.cassandra.io.util.ColumnIterator.deserializeNext(ColumnSortedMap.java:252)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:268)
 at 
 org.apache.cassandra.io.util.ColumnIterator.next(ColumnSortedMap.java:227)
 at java.util.concurrent.ConcurrentSkipListMap.buildFromSorted(Unknown 
 Source)
 at java.util.concurrent.ConcurrentSkipListMap.init(Unknown Source)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:379)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:362)
 at 
 org.apache.cassandra.db.SuperColumnSerializer.deserialize(SuperColumn.java:322)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:79)
 at 
 org.apache.cassandra.db.columniterator.SimpleSliceReader.computeNext(SimpleSliceReader.java:40)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.columniterator.SSTableSliceIterator.hasNext(SSTableSliceIterator.java:108)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.set(CollatingIterator.java:283)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.least(CollatingIterator.java:326)
 at 
 org.apache.commons.collections.iterators.CollatingIterator.next(CollatingIterator.java:230)
 at 
 org.apache.cassandra.utils.ReducingIterator.computeNext(ReducingIterator.java:69)
 at 
 com.google.common.collect.AbstractIterator.tryToComputeNext(AbstractIterator.java:136)
 at 
 com.google.common.collect.AbstractIterator.hasNext(AbstractIterator.java:131)
 at 
 org.apache.cassandra.db.filter.SliceQueryFilter.collectReducedColumns(SliceQueryFilter.java:116)
 at 
 org.apache.cassandra.db.filter.QueryFilter.collectCollatedColumns(QueryFilter.java:130)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1390)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1267)
 at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1195)
 at org.apache.cassandra.db.Table.getRow(Table.java:324)
 at 
 org.apache.cassandra.db.SliceFromReadCommand.getRow(SliceFromReadCommand.java:63)
 at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:451)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(Unknown 
 Source)
 at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
 at java.lang.Thread.run(Unknown Source)
 Caused by: java.io.EOFException
 at java.io.RandomAccessFile.readByte(Unknown Source)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readShortLength(ByteBufferUtil.java:324)
 at 
 org.apache.cassandra.utils.ByteBufferUtil.readWithShortLength(ByteBufferUtil.java:335)
 at 
 org.apache.cassandra.db.ColumnSerializer.deserialize(ColumnSerializer.java:71)
 at 
 

svn commit: r1126507 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/service/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 14:25:28 2011
New Revision: 1126507

URL: http://svn.apache.org/viewvc?rev=1126507view=rev
Log:
merge from 0.7

Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:25:28 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126483
+/cassandra/branches/cassandra-0.7:1026516-1126504
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1126293

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126507r1=1126506r2=1126507view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 14:25:28 2011
@@ -18,6 +18,8 @@
  * Assert ranges are not overlapping in AB.normalize (CASSANDRA-2641)
  * Don't write CounterUpdateColumn to disk in tests (CASSANDRA-2650)
  * Add sstable bulk loading utility (CASSANDRA-1278)
+ * avoid replaying hints to dropped columnfamilies (CASSANDRA-2685)
+ * add placeholders for missing rows in range query pseudo-RR (CASSANDRA-2680)
 
 
 0.8.0-final

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:25:28 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126483
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126504
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1126293

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:25:28 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126483
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126293

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:25:28 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126483
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126504
 

[jira] [Created] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA
Distributed per row locks
-

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Contrib
Affects Versions: 0.7.4
 Environment: any
Reporter: Luís Ferreira
 Fix For: 0.7.4


Instead of using a centralized locking strategy like cages with zookeeper, I 
would like to have it in a decentralized way. Even if it carries some 
limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037965#comment-13037965
 ] 

Luís Ferreira commented on CASSANDRA-2686:
--

Is there any way to do this? Can a consensus be achieved between the nodes 
responsible for a key? Maybe by creating a new kind of column that would have 
write once properties, and by using something like hinted handoff of locks if a 
node is down at the time of locking.

I am going to try to implement this. But it would be really good to get some 
ideas on how to do it.

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
Affects Versions: 0.7.4
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Luís Ferreira updated CASSANDRA-2686:
-

Affects Version/s: (was: 0.7.4)

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126518 - in /cassandra/branches/cassandra-0.8.0: ./ examples/hadoop_streaming_output/ src/java/org/apache/cassandra/hadoop/ src/java/org/apache/cassandra/hadoop/streaming/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 14:40:51 2011
New Revision: 1126518

URL: http://svn.apache.org/viewvc?rev=1126518view=rev
Log:
switch to native Thrift for Hadoop map/reduce
patch by Mck SembWever; reviewed by tjake and jbellis for CASSANDRA-2667

Removed:
cassandra/branches/cassandra-0.8.0/examples/hadoop_streaming_output/

cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/streaming/
Modified:
cassandra/branches/cassandra-0.8.0/CHANGES.txt
cassandra/branches/cassandra-0.8.0/NEWS.txt

cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java

cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java

Modified: cassandra/branches/cassandra-0.8.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/CHANGES.txt?rev=1126518r1=1126517r2=1126518view=diff
==
--- cassandra/branches/cassandra-0.8.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.0/CHANGES.txt Mon May 23 14:40:51 2011
@@ -4,6 +4,7 @@
  * update CQL consistency levels (CASSANDRA-2566)
  * debian packaging fixes (CASSANDRA-2481, 2647)
  * fix UUIDType, IntegerType for direct buffers (CASSANDRA-2682, 2684)
+ * switch to native Thrift for Hadoop map/reduce (CASSANDRA-2667)
 
 
 0.8.0-rc1

Modified: cassandra/branches/cassandra-0.8.0/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/NEWS.txt?rev=1126518r1=1126517r2=1126518view=diff
==
--- cassandra/branches/cassandra-0.8.0/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8.0/NEWS.txt Mon May 23 14:40:51 2011
@@ -13,8 +13,10 @@ Upgrading
 - 0.8 is fully API-compatible with 0.7.  You can continue
   to use your 0.7 clients.
 - Avro record classes used in map/reduce and Hadoop streaming code have
-  moved from org.apache.cassandra.avro to org.apache.cassandra.hadoop.avro,
-  applications using these classes will need to be updated accordingly.
+  been removed. Map/reduce can be switched to Thrift by changing
+  org.apache.cassandra.avro in import statements to 
+  org.apache.cassandra.thrift (no class names change). Streaming support 
+  has been removed for the time being.
 - The loadbalance command has been removed from nodetool.  For similar
   behavior, decommission then rebootstrap with empty initial_token.
 

Modified: 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java?rev=1126518r1=1126517r2=1126518view=diff
==
--- 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
 (original)
+++ 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
 Mon May 23 14:40:51 2011
@@ -31,7 +31,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.auth.SimpleAuthenticator;
-import org.apache.cassandra.hadoop.avro.Mutation;
 import org.apache.cassandra.thrift.*;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.*;

Modified: 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java?rev=1126518r1=1126517r2=1126518view=diff
==
--- 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
 (original)
+++ 
cassandra/branches/cassandra-0.8.0/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java
 Mon May 23 14:40:51 2011
@@ -59,8 +59,8 @@ import org.apache.cassandra.utils.ByteBu
  * @see OutputFormat
  * 
  */
-final class ColumnFamilyRecordWriter extends 
RecordWriterByteBuffer,Listorg.apache.cassandra.hadoop.avro.Mutation
-implements 
org.apache.hadoop.mapred.RecordWriterByteBuffer,Listorg.apache.cassandra.hadoop.avro.Mutation
+final class ColumnFamilyRecordWriter extends 
RecordWriterByteBuffer,ListMutation
+implements org.apache.hadoop.mapred.RecordWriterByteBuffer,ListMutation
 {
 // The configuration this writer is associated with.
 private final Configuration conf;
@@ -122,7 +122,7 @@ implements org.apache.hadoop.mapred.Reco
  * @throws IOException
  */
 @Override
-public void write(ByteBuffer keybuff, 
Listorg.apache.cassandra.hadoop.avro.Mutation value) throws IOException
+public void write(ByteBuffer keybuff, ListMutation value) throws 
IOException
 

svn commit: r1126519 - /cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 14:41:50 2011
New Revision: 1126519

URL: http://svn.apache.org/viewvc?rev=1126519view=rev
Log:
update pig for switch to native Thrift for Hadoop map/reduce

Modified:

cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

Modified: 
cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java?rev=1126519r1=1126518r2=1126519view=diff
==
--- 
cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 (original)
+++ 
cassandra/branches/cassandra-0.8.0/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 Mon May 23 14:41:50 2011
@@ -22,6 +22,7 @@ import java.util.*;
 
 import org.apache.cassandra.config.ConfigurationException;
 import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.TypeParser;
 import org.apache.cassandra.thrift.*;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.commons.logging.Log;
@@ -32,9 +33,9 @@ import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.SuperColumn;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.hadoop.*;
-import org.apache.cassandra.hadoop.avro.Mutation;
-import org.apache.cassandra.hadoop.avro.Deletion;
-import org.apache.cassandra.hadoop.avro.ColumnOrSuperColumn;
+import org.apache.cassandra.thrift.Mutation;
+import org.apache.cassandra.thrift.Deletion;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 import org.apache.hadoop.conf.Configuration;
@@ -158,7 +159,7 @@ public class CassandraStorage extends Lo
 
 // super
 ArrayListTuple subcols = new ArrayListTuple();
-for (IColumn subcol : ((SuperColumn)col).getSubColumns())
+for (IColumn subcol : col.getSubColumns())
 subcols.add(columnToTuple(subcol.name(), subcol, cfDef));
 
 pair.set(1, new DefaultDataBag(subcols));
@@ -179,8 +180,8 @@ public class CassandraStorage extends Lo
 AbstractType default_validator = null;
 try
 {
-comparator = FBUtilities.getComparator(cfDef.comparator_type);
-default_validator = 
FBUtilities.getComparator(cfDef.default_validation_class);
+comparator = TypeParser.parse(cfDef.comparator_type);
+default_validator = 
TypeParser.parse(cfDef.default_validation_class);
 }
 catch (ConfigurationException e)
 {
@@ -202,7 +203,7 @@ public class CassandraStorage extends Lo
 AbstractType validator = null;
 try
 {
-validator = 
FBUtilities.getComparator(cd.getValidation_class());
+validator = TypeParser.parse(cd.getValidation_class());
 validators.put(cd.name, validator);
 }
 catch (ConfigurationException e)
@@ -385,13 +386,13 @@ public class CassandraStorage extends Lo
if (pair.get(1) == null)
{
mutation.deletion = new Deletion();
-   mutation.deletion.predicate = new 
org.apache.cassandra.hadoop.avro.SlicePredicate();
+   mutation.deletion.predicate = new 
org.apache.cassandra.thrift.SlicePredicate();
mutation.deletion.predicate.column_names = 
Arrays.asList(objToBB(pair.get(0)));
mutation.deletion.timestamp = 
System.currentTimeMillis() * 1000;
}
else
{
-   org.apache.cassandra.hadoop.avro.Column column = new 
org.apache.cassandra.hadoop.avro.Column();
+   org.apache.cassandra.thrift.Column column = new 
org.apache.cassandra.thrift.Column();
column.name = 
marshallers.get(0).decompose((pair.get(0)));
if (validators.get(column.name) == null)
// Have to special case BytesType to convert 
DataByteArray into ByteBuffer




[jira] [Updated] (CASSANDRA-2667) Rewrite ColumnFamilyOutputFormat to use thrift (not arvo)

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2667?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2667:
--

 Reviewer: tjake
 Priority: Minor  (was: Major)
Affects Version/s: (was: 0.8.0)
Fix Version/s: 0.8.0

committed, with attempt to fix contrib/pig too

 Rewrite ColumnFamilyOutputFormat to use thrift (not arvo)
 -

 Key: CASSANDRA-2667
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2667
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Reporter: Mck SembWever
Assignee: Mck SembWever
Priority: Minor
 Fix For: 0.8.0

 Attachments: CASSANDRA-2667.patch, CASSANDRA-2667.patch


 From Jonathan Ellis in 
 http://article.gmane.org/gmane.comp.db.cassandra.user/16478
  Using native Thrift mutations makes the most sense to me now, which
  would keep it similar in structure but avoid the avroToThrift copy.
 The itch here is that i'd like to use CounterColumn in 
 ColumnFamilyOutputFormat

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126520 - in /cassandra/branches/cassandra-0.8: ./ contrib/ contrib/pig/src/java/org/apache/cassandra/hadoop/pig/ examples/hadoop_streaming_output/ interface/thrift/gen-java/org/apache/ca

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 14:43:48 2011
New Revision: 1126520

URL: http://svn.apache.org/viewvc?rev=1126520view=rev
Log:
merge from 0.8.0

Removed:
cassandra/branches/cassandra-0.8/examples/hadoop_streaming_output/

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/streaming/
Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/NEWS.txt
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:43:48 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7:1026516-1126504
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0:1125021-1126507
+/cassandra/branches/cassandra-0.8.0:1125021-1126519
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126520r1=1126519r2=1126520view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 14:43:48 2011
@@ -28,6 +28,7 @@
  * update CQL consistency levels (CASSANDRA-2566)
  * debian packaging fixes (CASSANDRA-2481, 2647)
  * fix UUIDType, IntegerType for direct buffers (CASSANDRA-2682, 2684)
+ * switch to native Thrift for Hadoop map/reduce (CASSANDRA-2667)
 
 
 0.8.0-rc1 

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1126520r1=1126519r2=1126520view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Mon May 23 14:43:48 2011
@@ -13,8 +13,10 @@ Upgrading
 - 0.8 is fully API-compatible with 0.7.  You can continue
   to use your 0.7 clients.
 - Avro record classes used in map/reduce and Hadoop streaming code have
-  moved from org.apache.cassandra.avro to org.apache.cassandra.hadoop.avro,
-  applications using these classes will need to be updated accordingly.
+  been removed. Map/reduce can be switched to Thrift by changing
+  org.apache.cassandra.avro in import statements to 
+  org.apache.cassandra.thrift (no class names change). Streaming support 
+  has been removed for the time being.
 - The loadbalance command has been removed from nodetool.  For similar
   behavior, decommission then rebootstrap with empty initial_token.
 - Thrift unframed mode has been removed.

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:43:48 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7/contrib:1026516-1126504
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126507
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126519
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Modified: 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
URL: 

svn commit: r1126524 - in /cassandra/branches/cassandra-0.8: ./ contrib/ contrib/bmt_example/ contrib/circuit/ contrib/client_only/ contrib/hadoop_streaming_output/ contrib/py_stress/ contrib/stress/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 14:52:17 2011
New Revision: 1126524

URL: http://svn.apache.org/viewvc?rev=1126524view=rev
Log:
merge from 0.8.0

Removed:
cassandra/branches/cassandra-0.8/contrib/bmt_example/
cassandra/branches/cassandra-0.8/contrib/circuit/
cassandra/branches/cassandra-0.8/contrib/client_only/
cassandra/branches/cassandra-0.8/contrib/hadoop_streaming_output/
cassandra/branches/cassandra-0.8/contrib/py_stress/
cassandra/branches/cassandra-0.8/contrib/stress/
cassandra/branches/cassandra-0.8/contrib/word_count/
Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/NEWS.txt
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:52:17 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7:1026516-1126504
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0:1125021-1126519
+/cassandra/branches/cassandra-0.8.0:1125021-1126523
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1126524r1=1126523r2=1126524view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Mon May 23 14:52:17 2011
@@ -59,6 +59,9 @@ Other
   to compact that anyway (which will free up space if there are
   a lot of expired tombstones), use the new forceUserDefinedCompaction
   JMX method on CompactionManager.
+- most of contrib/ (which was not part of the binary releases)
+  has been moved either to examples/ or tools/. We plan to move the
+  rest for 0.8.1.
 
 JMX
 ---

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:52:17 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7/contrib:1026516-1126504
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126519
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126523
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 14:52:17 2011
@@ -2,7 +2,7 @@
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126519
+/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126523
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo 

[jira] [Commented] (CASSANDRA-2649) work-around schema disagreements from cqlsh

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13037998#comment-13037998
 ] 

Jonathan Ellis commented on CASSANDRA-2649:
---

The right thing to do is wait for agreement after each schema change. Relying 
on integrityerror is broken since inserts will just fail.  using 
describe_schema_versions let's this be 100% correct instead of hoping you slept 
long enough before proceeding.

bq. this currently employs no use of the thrift RPC API

since cql is built on thrift, it wouldn't be difficult to use the thrift method 
until there is a native replacement.



 work-around schema disagreements from cqlsh
 ---

 Key: CASSANDRA-2649
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2649
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.8.0 beta 2
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 0.8.0

 Attachments: 
 v1-0001-CASSANDRA-2649-try-to-work-around-schema-disagreement-.txt


 It is handy to be able to put CQL statements in a flat-file and load them by 
 redirecting to {{cqlsh}} stdin, but this can fail on a cluster when executing 
 statements that modify schema.
 The attached patch works around this problem by retrying up to 3 times, with 
 a progressive delay after each attempt.  A better solution would probably be 
 to compare schema versions, but this seems to work well enough, and is better 
 than _not_ handling it at all.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2657) Allow configuration of multiple types of the Thrift server

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2657?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2657:
--

  Component/s: (was: Core)
   API
 Priority: Minor  (was: Major)
Affects Version/s: (was: 0.8.1)
Fix Version/s: (was: 0.8.0)

 Allow configuration of multiple types of the Thrift server
 --

 Key: CASSANDRA-2657
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2657
 Project: Cassandra
  Issue Type: Improvement
  Components: API
 Environment: JVM 1.6
Reporter: Vijay
Assignee: Vijay
Priority: Minor
 Fix For: 0.8.1


 Thrift server has multiple modes of operations specifically...
  
 1) TNonblockingServer
 2) THsHaServer
 3) TThreadPoolServer
 We should provide a configuration to enable all of the above. The client 
 library can either use Async or the Sync... (independent of the server side)
 This patch also might address the issue (which we where seeing), when there 
 are large number of connections to the server (throughput reduces).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-1278) Make bulk loading into Cassandra less crappy, more pluggable

2011-05-23 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-1278?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038007#comment-13038007
 ] 

Sylvain Lebresne commented on CASSANDRA-1278:
-

Note that I'm marking this resolved since that has been committed. However, as 
it stands sstableloader doesn't handler failure very well (because streaming 
doesn't). Once CASSANDRA-2433 is committed, this can be easily improved.

 Make bulk loading into Cassandra less crappy, more pluggable
 

 Key: CASSANDRA-1278
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1278
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Jeremy Hanna
Assignee: Sylvain Lebresne
 Fix For: 0.8.1

 Attachments: 0001-Add-bulk-loader-utility-v2.patch, 
 0001-Add-bulk-loader-utility.patch, 1278-cassandra-0.7-v2.txt, 
 1278-cassandra-0.7.1.txt, 1278-cassandra-0.7.txt

   Original Estimate: 40h
  Time Spent: 40h 40m
  Remaining Estimate: 0h

 Currently bulk loading into Cassandra is a black art.  People are either 
 directed to just do it responsibly with thrift or a higher level client, or 
 they have to explore the contrib/bmt example - 
 http://wiki.apache.org/cassandra/BinaryMemtable  That contrib module requires 
 delving into the code to find out how it works and then applying it to the 
 given problem.  Using either method, the user also needs to keep in mind that 
 overloading the cluster is possible - which will hopefully be addressed in 
 CASSANDRA-685
 This improvement would be to create a contrib module or set of documents 
 dealing with bulk loading.  Perhaps it could include code in the Core to make 
 it more pluggable for external clients of different types.
 It is just that this is something that many that are new to Cassandra need to 
 do - bulk load their data into Cassandra.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2678) Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5

2011-05-23 Thread Jon Hermes (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038011#comment-13038011
 ] 

Jon Hermes commented on CASSANDRA-2678:
---

KSMetaData:55
{noformat}
maybeAddReplicationFactor(options, ks_def.strategy_class, 
ks_def.isSetReplication_factor() ? ks_def.replication_factor : null);
{noformat}
...needs to be
{noformat}
maybeAddReplicationFactor(options, ks_def.strategy_class.toString(), 
ks_def.replication_factor);
{noformat}

It's much clearer to not ternary on the value (since you're not going to use it 
in the `ne SS || ONTS` case), and more importantly that ks_def.strategy_class 
is a CharSequence, so you'll hit an error if you expect it to be a String in 
maybe...().

Otherwise straightforward.

 Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5
 --

 Key: CASSANDRA-2678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2678
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.0 beta 2
 Environment: 10 node cluster, RHELL6.0
 0.7.5, Single DC using NTS and RF=3 (DC1:3) - upgraded to 0.8.0-rc1. 
Reporter: Chris Trahman
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.8.0

 Attachments: 2678.txt


 After an upgrade from 0.7.5 to 0.8.0-rc1 on a 10 node, single DC ring 
 configured with NTS, operations fail due to an inability to reach replicas in 
 the 'second datacenter':
 ERROR [pool-2-thread-8] 2011-05-17 12:15:23,145 Cassandra.java (line 3294) 
 Internal error processing insert
 java.lang.IllegalStateException: datacenter (replication_factor) has no more 
 endpoints, (3) replicas still needed
 at 
 org.apache.cassandra.locator.NetworkTopologyStrategy.calculateNaturalEndpoints(NetworkTopologyStrategy.java:118)
 at 
 org.apache.cassandra.locator.AbstractReplicationStrategy.getNaturalEndpoints(AbstractReplicationStrategy.java:100)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1611)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1599)
 at 
 org.apache.cassandra.service.StorageProxy.getWriteEndpoints(StorageProxy.java:217)
 at 
 org.apache.cassandra.service.StorageProxy.performWrite(StorageProxy.java:202)
 at 
 org.apache.cassandra.service.StorageProxy.mutate(StorageProxy.java:154)
 at 
 org.apache.cassandra.thrift.CassandraServer.doInsert(CassandraServer.java:557)
 at 
 org.apache.cassandra.thrift.CassandraServer.internal_insert(CassandraServer.java:434)
 at 
 org.apache.cassandra.thrift.CassandraServer.insert(CassandraServer.java:442)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor$insert.process(Cassandra.java:3286)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor.process(Cassandra.java:2889)
 at 
 org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:187)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 DEBUG [ScheduledTasks:1] 2011-05-17 12:15:33,975 StorageLoadBalancer.java 
 (line 334) Disseminating load info ...
 On checking the keyspace definition with cassandra-cli, it appears that 
 0.8.0-rc1 considered the 'replication_factor:3' configuration in the older 
 version as a DC name in part of the DC replication strategy:
   Replication Strategy: org.apache.cassandra.locator.NetworkTopologyStrategy
 Options: [replication_factor:3, DC1:3]
 I attempted to remove replication_factor as a DC using the 'update keyspace' 
 command, but it would persist.  I was able to remove the DC1:3 and use:
 update keyspace MyKeyspace with strategy_options=[{replication_factor:3}];
 then changed the topology properties file, renamed DC1 to replication_factor, 
 and it worked - so there is a workaround. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2687) generate-eclipse-files ant target throws StackOverflowError in eclipse

2011-05-23 Thread T Jake Luciani (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2687?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-2687:
--

 Reviewer: urandom
Affects Version/s: 0.8.0
Fix Version/s: 0.8.0

 generate-eclipse-files ant target throws StackOverflowError in eclipse
 --

 Key: CASSANDRA-2687
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2687
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Minor
 Fix For: 0.8.0




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2687) generate-eclipse-files ant target throws StackOverflowError in eclipse

2011-05-23 Thread T Jake Luciani (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2687?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani updated CASSANDRA-2687:
--

Attachment: v1-0001-CASSANDRA-2687-fix-eclipse-stackoverflow-issue.txt

 generate-eclipse-files ant target throws StackOverflowError in eclipse
 --

 Key: CASSANDRA-2687
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2687
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Minor
 Fix For: 0.8.0

 Attachments: 
 v1-0001-CASSANDRA-2687-fix-eclipse-stackoverflow-issue.txt




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-1405) Switch to THsHaServer, redux

2011-05-23 Thread T Jake Luciani (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-1405?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038021#comment-13038021
 ] 

T Jake Luciani commented on CASSANDRA-1405:
---

Anything holding this back from going in now that 0.8 uses thrift-0.6?

 Switch to THsHaServer, redux
 

 Key: CASSANDRA-1405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1405
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.0

 Attachments: libthrift-r1026391.jar, trunk-1405.patch


 Brian's patch to CASSANDRA-876  suggested using a custom TProcessorFactory 
 subclass, overriding getProcessor to reset to a default state when a new 
 client connects. It looks like this would allow dropping 
 CustomTThreadPoolServer as well as allowing non-thread based servers. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2388) ColumnFamilyRecordReader fails for a given split because a host is down, even if records could reasonably be read from other replica.

2011-05-23 Thread Mck SembWever (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2388?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038026#comment-13038026
 ] 

Mck SembWever commented on CASSANDRA-2388:
--

I'm having a go currently at CASSANDRA-1125 so i might as well look at this 
too. (but you've caught me on a holiday-week...)

 ColumnFamilyRecordReader fails for a given split because a host is down, even 
 if records could reasonably be read from other replica.
 -

 Key: CASSANDRA-2388
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2388
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Reporter: Eldon Stegall
Assignee: Mck SembWever
  Labels: hadoop, inputformat
 Fix For: 0.8.1

 Attachments: 0002_On_TException_try_next_split.patch


 ColumnFamilyRecordReader only tries the first location for a given split. We 
 should try multiple locations for a given split.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2688) Support wide rows with Hadoop support

2011-05-23 Thread Jeremy Hanna (JIRA)
Support wide rows with Hadoop support
-

 Key: CASSANDRA-2688
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2688
 Project: Cassandra
  Issue Type: Improvement
Reporter: Jeremy Hanna


Currently the Hadoop support can only operate over the maximum row width of 
thrift afaik.  Then a user must do paging of the row within their hadoop 
interface - java, pig, hive.  It would be much nicer to have the hadoop support 
page through the row internally, if possible.  Seeing that one of cassandra's 
features is extremely wide rows, it would be nice feature parity so that people 
didn't have to adjust their cassandra plans based on hadoop support limitations.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-1405) Switch to THsHaServer, redux

2011-05-23 Thread Vijay (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-1405?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038028#comment-13038028
 ] 

Vijay commented on CASSANDRA-1405:
--

I did some testing And the performance of THSHA server is not that great 
compared to the custom implementation of TTPS on a small installation (less 
connections)... IMHO We shouldn't replace the existing Thrift server 
implementation... it should be a additional configurable server and i am trying 
to write a multi threaded select server similar to 
https://issues.apache.org/jira/browse/THRIFT-1167

 Switch to THsHaServer, redux
 

 Key: CASSANDRA-1405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1405
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.0

 Attachments: libthrift-r1026391.jar, trunk-1405.patch


 Brian's patch to CASSANDRA-876  suggested using a custom TProcessorFactory 
 subclass, overriding getProcessor to reset to a default state when a new 
 client connects. It looks like this would allow dropping 
 CustomTThreadPoolServer as well as allowing non-thread based servers. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2687) generate-eclipse-files ant target throws StackOverflowError in eclipse

2011-05-23 Thread Eric Evans (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2687?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038029#comment-13038029
 ] 

Eric Evans commented on CASSANDRA-2687:
---

Nice. +1

 generate-eclipse-files ant target throws StackOverflowError in eclipse
 --

 Key: CASSANDRA-2687
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2687
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Minor
 Fix For: 0.8.0

 Attachments: 
 v1-0001-CASSANDRA-2687-fix-eclipse-stackoverflow-issue.txt




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-1405) Switch to THsHaServer, redux

2011-05-23 Thread T Jake Luciani (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-1405?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038033#comment-13038033
 ] 

T Jake Luciani commented on CASSANDRA-1405:
---

Yeah I would like a more pluggable interface for the thrift service.

 Switch to THsHaServer, redux
 

 Key: CASSANDRA-1405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1405
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.0

 Attachments: libthrift-r1026391.jar, trunk-1405.patch


 Brian's patch to CASSANDRA-876  suggested using a custom TProcessorFactory 
 subclass, overriding getProcessor to reset to a default state when a new 
 client connects. It looks like this would allow dropping 
 CustomTThreadPoolServer as well as allowing non-thread based servers. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2689) output version string w/ bin/cassandra -v

2011-05-23 Thread Eric Evans (JIRA)
output version string w/ bin/cassandra -v
-

 Key: CASSANDRA-2689
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2689
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 0.8.0
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
 Attachments: v1-0001-CASSANDRA-2689-print-version-string.txt, 
v2-0001-CASSANDRA-2689-print-version-string.txt

Add support for printing the current version to stdout.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2689) output version string w/ bin/cassandra -v

2011-05-23 Thread Eric Evans (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eric Evans updated CASSANDRA-2689:
--

Attachment: v1-0001-CASSANDRA-2689-print-version-string.txt

 output version string w/ bin/cassandra -v
 -

 Key: CASSANDRA-2689
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2689
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 0.8.0
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
 Attachments: v1-0001-CASSANDRA-2689-print-version-string.txt, 
 v2-0001-CASSANDRA-2689-print-version-string.txt


 Add support for printing the current version to stdout.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2689) output version string w/ bin/cassandra -v

2011-05-23 Thread Eric Evans (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eric Evans updated CASSANDRA-2689:
--

Attachment: v2-0001-CASSANDRA-2689-print-version-string.txt

 output version string w/ bin/cassandra -v
 -

 Key: CASSANDRA-2689
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2689
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 0.8.0
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
 Attachments: v1-0001-CASSANDRA-2689-print-version-string.txt, 
 v2-0001-CASSANDRA-2689-print-version-string.txt


 Add support for printing the current version to stdout.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2689) output version string w/ bin/cassandra -v

2011-05-23 Thread Eric Evans (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2689?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eric Evans updated CASSANDRA-2689:
--

Attachment: (was: v1-0001-CASSANDRA-2689-print-version-string.txt)

 output version string w/ bin/cassandra -v
 -

 Key: CASSANDRA-2689
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2689
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 0.8.0
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
 Attachments: v2-0001-CASSANDRA-2689-print-version-string.txt


 Add support for printing the current version to stdout.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2477) CQL support for describing keyspaces / column familes

2011-05-23 Thread Vivek Mishra (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2477?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038043#comment-13038043
 ] 

Vivek Mishra commented on CASSANDRA-2477:
-

Hi,
Just took a reference from oracle data dictionary:
dba_all_tables

* dba_indexes

* dba_ind_partitions

* dba_ind_subpartitions

* dba_object_tables

* dba_part_col_statistics

* dba_subpart_col_statistics

* dba_tables

* dba_tab_cols

* dba_tab_columns

* dba_tab_col_statistics

* dba_tab_partitions

* dba_tab_subpartitions 



out of these, which looks to be required for Cassandra?

dba_all_tables, dba_object_tables, dba_tab_columns ?




 CQL support for describing keyspaces / column familes
 -

 Key: CASSANDRA-2477
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2477
 Project: Cassandra
  Issue Type: Sub-task
  Components: API, Core
Reporter: Eric Evans
  Labels: cql
 Fix For: 0.8.1

 Attachments: 2477-virtual-cfs-false-start.txt




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread Stu Hood (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038060#comment-13038060
 ] 

Stu Hood commented on CASSANDRA-2686:
-

The Spinnaker paper described a complete solution to this problem that embedded 
Zookeeper: www.vldb.org/pvldb/vol4/p243-rao.pdf

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038071#comment-13038071
 ] 

Luís Ferreira commented on CASSANDRA-2686:
--

Yes, but this uses a centralized or semi centralized approach, in which 
zookeeper controls who has the lock. I would like for all (up) the nodes to 
reach an agreement on who has the lock. I don't know if this is possible, and 
if so, at what price...

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread Ryan King (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038070#comment-13038070
 ] 

Ryan King commented on CASSANDRA-2686:
--

You'll likely end up reimplementing something like Paxos (what google's chubby 
uses) or ZAB (what Zookeeper uses).

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Stephen Connolly (JIRA)
Make the release build fail if the publish to central repository also fails
---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly


If the publish to Central fails for one artifact that failure is not picked up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread Ryan King (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038078#comment-13038078
 ] 

Ryan King commented on CASSANDRA-2686:
--

Those protocols are methods for reach[ing] agreement. You're basically 
describing how ZK works.

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Stephen Connolly (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2690?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stephen Connolly updated CASSANDRA-2690:


Attachment: CASSANDRA-2690-v0.7.patch

 Make the release build fail if the publish to central repository also fails
 ---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2690-v-trunk.patch, CASSANDRA-2690-v0.7.patch, 
 CASSANDRA-2690-v0.8.patch


 If the publish to Central fails for one artifact that failure is not picked 
 up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Stephen Connolly (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2690?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stephen Connolly updated CASSANDRA-2690:


Attachment: CASSANDRA-2690-v0.8.patch

 Make the release build fail if the publish to central repository also fails
 ---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2690-v-trunk.patch, CASSANDRA-2690-v0.7.patch, 
 CASSANDRA-2690-v0.8.patch


 If the publish to Central fails for one artifact that failure is not picked 
 up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Stephen Connolly (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2690?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Stephen Connolly updated CASSANDRA-2690:


Attachment: CASSANDRA-2690-v-trunk.patch

 Make the release build fail if the publish to central repository also fails
 ---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2690-v-trunk.patch, CASSANDRA-2690-v0.7.patch, 
 CASSANDRA-2690-v0.8.patch


 If the publish to Central fails for one artifact that failure is not picked 
 up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038090#comment-13038090
 ] 

Luís Ferreira commented on CASSANDRA-2686:
--

Maybe I misunderstood, but to get locks with ZK, every node has to make it's 
presence known to ZK, and ask ZK to get a certain lock (which I think it's what 
cages does). Can't this be a bottleneck? 

I know consensus can't be achieved with one failing node, therefore the need 
for something like ZK. Still, isn't there a way to do this using something like 
hinted handoff? 

Maybe I haven't explained correctly my idea. I'd like to have locks, but 
maintain the general structure of a cassandra cluster, and change as little as 
possible the kind of messages the nodes send. 

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038093#comment-13038093
 ] 

Luís Ferreira commented on CASSANDRA-2686:
--

Probably you're right, and the only way to do this is by using some kind of 
protocol as ZAB or Paxos. Still, if other ideas come up it would be great. Or 
even a explanation of why that's the only way... 

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Stephen Connolly (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2690?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038102#comment-13038102
 ] 

Stephen Connolly commented on CASSANDRA-2690:
-

see CASSANDRA-2691 for the MGPG-35 fix

 Make the release build fail if the publish to central repository also fails
 ---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2690-v-trunk.patch, CASSANDRA-2690-v0.7.patch, 
 CASSANDRA-2690-v0.8.patch


 If the publish to Central fails for one artifact that failure is not picked 
 up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2691) If an upload to central repository fails for an artifact, retry a couple of times before killing the build

2011-05-23 Thread Stephen Connolly (JIRA)
If an upload to central repository fails for an artifact, retry a couple of 
times before killing the build
--

 Key: CASSANDRA-2691
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2691
 Project: Cassandra
  Issue Type: Improvement
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly


Depends on MGPG-35 http://jira.codehaus.org/browse/MGPG-35

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038107#comment-13038107
 ] 

Jonathan Ellis commented on CASSANDRA-2686:
---

Pretty sure Spinnaker only used ZK for leader election, not normal row updates.

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126639 - /cassandra/branches/cassandra-0.7/build.xml

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 18:32:00 2011
New Revision: 1126639

URL: http://svn.apache.org/viewvc?rev=1126639view=rev
Log:
Make the release build fail if the publish to central repository also fails
patch by stephenc; reviewed by slebresne for CASSANDRA-2690

Modified:
cassandra/branches/cassandra-0.7/build.xml

Modified: cassandra/branches/cassandra-0.7/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/build.xml?rev=1126639r1=1126638r2=1126639view=diff
==
--- cassandra/branches/cassandra-0.7/build.xml (original)
+++ cassandra/branches/cassandra-0.7/build.xml Mon May 23 18:32:00 2011
@@ -237,7 +237,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 arg 
value=org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file /
 arg value=-DpomFile=@{pomFile} /
 arg value=-Dfile=@{file} /
@@ -253,7 +253,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
 arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.2:sign-and-deploy-file /
 arg value=-Durl=${maven-repository-url} /




svn commit: r1126641 - in /cassandra/branches/cassandra-0.8.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 18:33:32 2011
New Revision: 1126641

URL: http://svn.apache.org/viewvc?rev=1126641view=rev
Log:
merge from 0.7

Modified:
cassandra/branches/cassandra-0.8.0/   (props changed)
cassandra/branches/cassandra-0.8.0/build.xml
cassandra/branches/cassandra-0.8.0/contrib/   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-0.8.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:33:32 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126503
+/cassandra/branches/cassandra-0.7:1026516-1126503,1126639
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 
/cassandra/branches/cassandra-0.8:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-0.8.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.0/build.xml?rev=1126641r1=1126640r2=1126641view=diff
==
--- cassandra/branches/cassandra-0.8.0/build.xml (original)
+++ cassandra/branches/cassandra-0.8.0/build.xml Mon May 23 18:33:32 2011
@@ -301,7 +301,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 arg 
value=org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file /
 arg value=-DpomFile=@{pomFile} /
 arg value=-Dfile=@{file} /
@@ -317,7 +317,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
 arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.2:sign-and-deploy-file /
 arg value=-Durl=${maven-repository-url} /

Propchange: cassandra/branches/cassandra-0.8.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:33:32 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126503
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126503,1126639
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 
/cassandra/branches/cassandra-0.8/contrib:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:33:32 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126503
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126503,1126639
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo 

[jira] [Commented] (CASSANDRA-2689) output version string w/ bin/cassandra -v

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2689?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038123#comment-13038123
 ] 

Jonathan Ellis commented on CASSANDRA-2689:
---

+1

 output version string w/ bin/cassandra -v
 -

 Key: CASSANDRA-2689
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2689
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 0.8.0
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
 Attachments: v2-0001-CASSANDRA-2689-print-version-string.txt


 Add support for printing the current version to stdout.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2690) Make the release build fail if the publish to central repository also fails

2011-05-23 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2690?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038124#comment-13038124
 ] 

Sylvain Lebresne commented on CASSANDRA-2690:
-

+1

 Make the release build fail if the publish to central repository also fails
 ---

 Key: CASSANDRA-2690
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2690
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2690-v-trunk.patch, CASSANDRA-2690-v0.7.patch, 
 CASSANDRA-2690-v0.8.patch


 If the publish to Central fails for one artifact that failure is not picked 
 up.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126644 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 18:35:12 2011
New Revision: 1126644

URL: http://svn.apache.org/viewvc?rev=1126644view=rev
Log:
merge from 0.8.0

Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/build.xml
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:35:12 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126504
+/cassandra/branches/cassandra-0.7:1026516-1126504,1126639
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0:1125021-1126523
+/cassandra/branches/cassandra-0.8.0:1125021-1126523,1126641
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/branches/cassandra-0.8/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1126644r1=1126643r2=1126644view=diff
==
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Mon May 23 18:35:12 2011
@@ -301,7 +301,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 arg 
value=org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file /
 arg value=-DpomFile=@{pomFile} /
 arg value=-Dfile=@{file} /
@@ -317,7 +317,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
 arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.2:sign-and-deploy-file /
 arg value=-Durl=${maven-repository-url} /

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:35:12 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126504
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126504,1126639
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126523
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126523,1126641
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:35:12 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504,1126639
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 

svn commit: r1126646 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-05-23 Thread slebresne
Author: slebresne
Date: Mon May 23 18:36:58 2011
New Revision: 1126646

URL: http://svn.apache.org/viewvc?rev=1126646view=rev
Log:
merge from 0.8

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/build.xml
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:36:58 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126483
+/cassandra/branches/cassandra-0.7:1026516-1126483,1126639
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1126484
-/cassandra/branches/cassandra-0.8.0:1125021-1126293
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1126484,1126644
+/cassandra/branches/cassandra-0.8.0:1125021-1126293,1126641
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020

Modified: cassandra/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1126646r1=1126645r2=1126646view=diff
==
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Mon May 23 18:36:58 2011
@@ -301,7 +301,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 arg 
value=org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file /
 arg value=-DpomFile=@{pomFile} /
 arg value=-Dfile=@{file} /
@@ -317,7 +317,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 attribute name=classifier default=/
 attribute name=packaging default=jar/
 sequential
-  artifact:mvn mavenVersion=${maven.version} fork=true
+  artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
 arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.2:sign-and-deploy-file /
 arg value=-Durl=${maven-repository-url} /

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:36:58 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126483
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126483,1126639
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1126484
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126293
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1126484,1126644
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126293,1126641
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 18:36:58 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126483
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126483,1126639
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1126484

[jira] [Commented] (CASSANDRA-2678) Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038126#comment-13038126
 ] 

Jonathan Ellis commented on CASSANDRA-2678:
---

bq. If the def has a null value for RF (as it correctly should post-RF change)

As above, it can't (since it is an int not an Integer), but it can be unset.

bq. should we verify that 'replication_factor' already exists in the map inside 
of maybe() and do nothing?

No, the strategy class is responsible for actually validating its options.  
We're just trying to stick a thin compatibility layer in here so people can 
continue using 0.7 clients w/ 0.8 server temporarily.

 Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5
 --

 Key: CASSANDRA-2678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2678
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.0 beta 2
 Environment: 10 node cluster, RHELL6.0
 0.7.5, Single DC using NTS and RF=3 (DC1:3) - upgraded to 0.8.0-rc1. 
Reporter: Chris Trahman
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.8.0

 Attachments: 2678-v2.txt, 2678.txt


 After an upgrade from 0.7.5 to 0.8.0-rc1 on a 10 node, single DC ring 
 configured with NTS, operations fail due to an inability to reach replicas in 
 the 'second datacenter':
 ERROR [pool-2-thread-8] 2011-05-17 12:15:23,145 Cassandra.java (line 3294) 
 Internal error processing insert
 java.lang.IllegalStateException: datacenter (replication_factor) has no more 
 endpoints, (3) replicas still needed
 at 
 org.apache.cassandra.locator.NetworkTopologyStrategy.calculateNaturalEndpoints(NetworkTopologyStrategy.java:118)
 at 
 org.apache.cassandra.locator.AbstractReplicationStrategy.getNaturalEndpoints(AbstractReplicationStrategy.java:100)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1611)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1599)
 at 
 org.apache.cassandra.service.StorageProxy.getWriteEndpoints(StorageProxy.java:217)
 at 
 org.apache.cassandra.service.StorageProxy.performWrite(StorageProxy.java:202)
 at 
 org.apache.cassandra.service.StorageProxy.mutate(StorageProxy.java:154)
 at 
 org.apache.cassandra.thrift.CassandraServer.doInsert(CassandraServer.java:557)
 at 
 org.apache.cassandra.thrift.CassandraServer.internal_insert(CassandraServer.java:434)
 at 
 org.apache.cassandra.thrift.CassandraServer.insert(CassandraServer.java:442)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor$insert.process(Cassandra.java:3286)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor.process(Cassandra.java:2889)
 at 
 org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:187)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 DEBUG [ScheduledTasks:1] 2011-05-17 12:15:33,975 StorageLoadBalancer.java 
 (line 334) Disseminating load info ...
 On checking the keyspace definition with cassandra-cli, it appears that 
 0.8.0-rc1 considered the 'replication_factor:3' configuration in the older 
 version as a DC name in part of the DC replication strategy:
   Replication Strategy: org.apache.cassandra.locator.NetworkTopologyStrategy
 Options: [replication_factor:3, DC1:3]
 I attempted to remove replication_factor as a DC using the 'update keyspace' 
 command, but it would persist.  I was able to remove the DC1:3 and use:
 update keyspace MyKeyspace with strategy_options=[{replication_factor:3}];
 then changed the topology properties file, renamed DC1 to replication_factor, 
 and it worked - so there is a workaround. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


buildbot failure in ASF Buildbot on cassandra-trunk

2011-05-23 Thread buildbot
The Buildbot has detected a new failure on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1324

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1126646
Blamelist: slebresne

BUILD FAILED: failed compile

sincerely,
 -The Buildbot



[jira] [Commented] (CASSANDRA-2678) Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5

2011-05-23 Thread Jon Hermes (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2678?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038130#comment-13038130
 ] 

Jon Hermes commented on CASSANDRA-2678:
---

bq. As above, it can't (since it is an int not an Integer), but it can be 
unset.
I meant the null that we pass in line 55 because it was 'unset'.

I agree with the latter choice. We could doubly validate here and catch the 
error just a _little_ bit faster than waiting for the class to validate, but 
it's not a big deal. Assuming the duplicate code was removed, +1.

 Incorrect NetworkTopolgyStrategy Options on upgrade from 0.7.5
 --

 Key: CASSANDRA-2678
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2678
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.0 beta 2
 Environment: 10 node cluster, RHELL6.0
 0.7.5, Single DC using NTS and RF=3 (DC1:3) - upgraded to 0.8.0-rc1. 
Reporter: Chris Trahman
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.8.0

 Attachments: 2678-v2.txt, 2678.txt


 After an upgrade from 0.7.5 to 0.8.0-rc1 on a 10 node, single DC ring 
 configured with NTS, operations fail due to an inability to reach replicas in 
 the 'second datacenter':
 ERROR [pool-2-thread-8] 2011-05-17 12:15:23,145 Cassandra.java (line 3294) 
 Internal error processing insert
 java.lang.IllegalStateException: datacenter (replication_factor) has no more 
 endpoints, (3) replicas still needed
 at 
 org.apache.cassandra.locator.NetworkTopologyStrategy.calculateNaturalEndpoints(NetworkTopologyStrategy.java:118)
 at 
 org.apache.cassandra.locator.AbstractReplicationStrategy.getNaturalEndpoints(AbstractReplicationStrategy.java:100)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1611)
 at 
 org.apache.cassandra.service.StorageService.getNaturalEndpoints(StorageService.java:1599)
 at 
 org.apache.cassandra.service.StorageProxy.getWriteEndpoints(StorageProxy.java:217)
 at 
 org.apache.cassandra.service.StorageProxy.performWrite(StorageProxy.java:202)
 at 
 org.apache.cassandra.service.StorageProxy.mutate(StorageProxy.java:154)
 at 
 org.apache.cassandra.thrift.CassandraServer.doInsert(CassandraServer.java:557)
 at 
 org.apache.cassandra.thrift.CassandraServer.internal_insert(CassandraServer.java:434)
 at 
 org.apache.cassandra.thrift.CassandraServer.insert(CassandraServer.java:442)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor$insert.process(Cassandra.java:3286)
 at 
 org.apache.cassandra.thrift.Cassandra$Processor.process(Cassandra.java:2889)
 at 
 org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:187)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 DEBUG [ScheduledTasks:1] 2011-05-17 12:15:33,975 StorageLoadBalancer.java 
 (line 334) Disseminating load info ...
 On checking the keyspace definition with cassandra-cli, it appears that 
 0.8.0-rc1 considered the 'replication_factor:3' configuration in the older 
 version as a DC name in part of the DC replication strategy:
   Replication Strategy: org.apache.cassandra.locator.NetworkTopologyStrategy
 Options: [replication_factor:3, DC1:3]
 I attempted to remove replication_factor as a DC using the 'update keyspace' 
 command, but it would persist.  I was able to remove the DC1:3 and use:
 update keyspace MyKeyspace with strategy_options=[{replication_factor:3}];
 then changed the topology properties file, renamed DC1 to replication_factor, 
 and it worked - so there is a workaround. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2692) Nuke BMT from orbit

2011-05-23 Thread Brandon Williams (JIRA)
Nuke BMT from orbit
---

 Key: CASSANDRA-2692
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2692
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Brandon Williams
Priority: Minor
 Fix For: 1.0


Now that we have CASSANDRA-1278, let's remove BMT since it often confuses 
people in the config, is not used or tested very much, and is suboptimal.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2280) Request specific column families using StreamIn

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2280?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2280:
--

Attachment: 2280-v4.txt

bq. We must bump the version for 0.8

Done in v4.

bq. In StreamHeader and StreamRequestMessage, Iterables.size() is used

Pretty sure we are passing in an Iterables.concat result, which is not a 
Collection.  (If not, no reason not to leave that as an option.  Yes, 
Iterables.size does call .size() on Collection objects.)

bq. Why are we sending the cfs in StreamHeader at all?

Removed in v4.

 Request specific column families using StreamIn
 ---

 Key: CASSANDRA-2280
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2280
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Stu Hood
Assignee: Jonathan Ellis
 Fix For: 0.8.1

 Attachments: 
 0001-Allow-specific-column-families-to-be-requested-for-str.txt, 
 0001-Allow-specific-column-families-to-be-requested-for-str.txt, 2280-v3.txt, 
 2280-v4.txt


 StreamIn.requestRanges only specifies a keyspace, meaning that requesting a 
 range will request it for all column families: if you have a large number of 
 CFs, this can cause quite a headache.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2686) Distributed per row locks

2011-05-23 Thread Stu Hood (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2686?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038139#comment-13038139
 ] 

Stu Hood commented on CASSANDRA-2686:
-

bq. Pretty sure Spinnaker only used ZK for leader election, not normal row 
updates.
If you've done leader election such that one replica is the leader of the 
replica set, then there is no need for locking... although CAS operations must 
speak directly to the leader.

 Distributed per row locks
 -

 Key: CASSANDRA-2686
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2686
 Project: Cassandra
  Issue Type: Wish
  Components: Core
 Environment: any
Reporter: Luís Ferreira
  Labels: api-addition, features

 Instead of using a centralized locking strategy like cages with zookeeper, I 
 would like to have it in a decentralized way. Even if it carries some 
 limitations. 

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Resolved] (CASSANDRA-2687) generate-eclipse-files ant target throws StackOverflowError in eclipse

2011-05-23 Thread T Jake Luciani (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2687?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

T Jake Luciani resolved CASSANDRA-2687.
---

Resolution: Fixed

committed

 generate-eclipse-files ant target throws StackOverflowError in eclipse
 --

 Key: CASSANDRA-2687
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2687
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0
Reporter: T Jake Luciani
Assignee: T Jake Luciani
Priority: Minor
 Fix For: 0.8.0

 Attachments: 
 v1-0001-CASSANDRA-2687-fix-eclipse-stackoverflow-issue.txt




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Nicholas Telford (JIRA)
Renaming/Dropping Keyspace shouldn't touch hints


 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial


Currently, when renaming or dropping a keyspace, 
HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
for that keyspace with the new keyspace name.

This code appears to have been written for a different HintsCF schema, as it 
drops the row named by the old keyspace name and re-creates all of it's columns 
under the key of the new keyspace name. This is not the current HintsCF schema. 
It seems the impact of this is that it doesn't do anything (beyond a pointless 
index scan for the HintsCF) as the keys will never exist.

It looks safe to remove this code entirely and let the hints simply become 
invalid. When they're replayed invalid hints are silently dropped, which seems 
like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126671 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/loca

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 19:12:29 2011
New Revision: 1126671

URL: http://svn.apache.org/viewvc?rev=1126671view=rev
Log:
merge from 0.8.0

Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:12:29 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7:1026516-1126504,1126639
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0:1125021-1126659
+/cassandra/branches/cassandra-0.8.0:1125021-1126670
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126671r1=1126670r2=1126671view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 19:12:29 2011
@@ -30,8 +30,11 @@
  * fix UUIDType, IntegerType for direct buffers (CASSANDRA-2682, 2684)
  * switch to native Thrift for Hadoop map/reduce (CASSANDRA-2667)
  * fix StackOverflowError when building from eclipse (CASSANDRA-2687)
+ * only provide replication_factor to strategy_options help for
+   SimpleStrategy, OldNetworkTopologyStrategy (CASSANDRA-2678)
 
-0.8.0-rc1 
+
+0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
rebuffering in BRAF (CASSANDRA-2581)
  * fix returning null column values in the python cql driver (CASSANDRA-2593)

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:12:29 2011
@@ -2,7 +2,7 @@
 /cassandra/branches/cassandra-0.7/contrib:1026516-1126504,1126639
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126659
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126670
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:12:29 2011
@@ -2,7 +2,7 @@
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504,1126639
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
-/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126659
+/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126670
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- 

[jira] [Updated] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2693?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2693:
--

Fix Version/s: 0.7.7

 Renaming/Dropping Keyspace shouldn't touch hints
 

 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial
 Fix For: 0.7.7

 Attachments: 
 CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff


 Currently, when renaming or dropping a keyspace, 
 HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
 for that keyspace with the new keyspace name.
 This code appears to have been written for a different HintsCF schema, as it 
 drops the row named by the old keyspace name and re-creates all of it's 
 columns under the key of the new keyspace name. This is not the current 
 HintsCF schema. It seems the impact of this is that it doesn't do anything 
 (beyond a pointless index scan for the HintsCF) as the keys will never exist.
 It looks safe to remove this code entirely and let the hints simply become 
 invalid. When they're replayed invalid hints are silently dropped, which 
 seems like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2693?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038150#comment-13038150
 ] 

Jonathan Ellis commented on CASSANDRA-2693:
---

There is one problem w/ the current ignore-hints-for-dropped-CFs code: if a CF 
is dropped, then re-added, hints from the old one can be replayed.

Storing CF id instead of tablename/cfname would fix this.

 Renaming/Dropping Keyspace shouldn't touch hints
 

 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial
 Fix For: 0.7.7

 Attachments: 
 CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff


 Currently, when renaming or dropping a keyspace, 
 HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
 for that keyspace with the new keyspace name.
 This code appears to have been written for a different HintsCF schema, as it 
 drops the row named by the old keyspace name and re-creates all of it's 
 columns under the key of the new keyspace name. This is not the current 
 HintsCF schema. It seems the impact of this is that it doesn't do anything 
 (beyond a pointless index scan for the HintsCF) as the keys will never exist.
 It looks safe to remove this code entirely and let the hints simply become 
 invalid. When they're replayed invalid hints are silently dropped, which 
 seems like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Nicholas Telford (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2693?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nicholas Telford updated CASSANDRA-2693:


Attachment: CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff

Removed HintedHandoffManager.renameHints(). Renaming or dropping a keyspace now 
leaves old hints to be discarded during replay.

 Renaming/Dropping Keyspace shouldn't touch hints
 

 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial
 Fix For: 0.7.7

 Attachments: 
 CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff


 Currently, when renaming or dropping a keyspace, 
 HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
 for that keyspace with the new keyspace name.
 This code appears to have been written for a different HintsCF schema, as it 
 drops the row named by the old keyspace name and re-creates all of it's 
 columns under the key of the new keyspace name. This is not the current 
 HintsCF schema. It seems the impact of this is that it doesn't do anything 
 (beyond a pointless index scan for the HintsCF) as the keys will never exist.
 It looks safe to remove this code entirely and let the hints simply become 
 invalid. When they're replayed invalid hints are silently dropped, which 
 seems like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Nicholas Telford (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2693?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038152#comment-13038152
 ] 

Nicholas Telford commented on CASSANDRA-2693:
-

Is that within the scope of this ticket?

 Renaming/Dropping Keyspace shouldn't touch hints
 

 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial
 Fix For: 0.7.7

 Attachments: 
 CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff


 Currently, when renaming or dropping a keyspace, 
 HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
 for that keyspace with the new keyspace name.
 This code appears to have been written for a different HintsCF schema, as it 
 drops the row named by the old keyspace name and re-creates all of it's 
 columns under the key of the new keyspace name. This is not the current 
 HintsCF schema. It seems the impact of this is that it doesn't do anything 
 (beyond a pointless index scan for the HintsCF) as the keys will never exist.
 It looks safe to remove this code entirely and let the hints simply become 
 invalid. When they're replayed invalid hints are silently dropped, which 
 seems like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2693) Renaming/Dropping Keyspace shouldn't touch hints

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2693?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038153#comment-13038153
 ] 

Jonathan Ellis commented on CASSANDRA-2693:
---

No. :)

 Renaming/Dropping Keyspace shouldn't touch hints
 

 Key: CASSANDRA-2693
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2693
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Nicholas Telford
Priority: Trivial
 Fix For: 0.7.7

 Attachments: 
 CASSANDRA-2693-remove-hint-changes-on-keyspace-change-001.diff


 Currently, when renaming or dropping a keyspace, 
 HintedHandoffManager.renameHints() is called to drop and re-insert every hint 
 for that keyspace with the new keyspace name.
 This code appears to have been written for a different HintsCF schema, as it 
 drops the row named by the old keyspace name and re-creates all of it's 
 columns under the key of the new keyspace name. This is not the current 
 HintsCF schema. It seems the impact of this is that it doesn't do anything 
 (beyond a pointless index scan for the HintsCF) as the keys will never exist.
 It looks safe to remove this code entirely and let the hints simply become 
 invalid. When they're replayed invalid hints are silently dropped, which 
 seems like the best option.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2477) CQL support for describing keyspaces / column familes

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2477?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038155#comment-13038155
 ] 

Jonathan Ellis commented on CASSANDRA-2477:
---

Probably.

IMO the right way to think about this is how can we expose the data we have in 
KSMetaData and CFMetaData not how can we make this look like Oracle.

 CQL support for describing keyspaces / column familes
 -

 Key: CASSANDRA-2477
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2477
 Project: Cassandra
  Issue Type: Sub-task
  Components: API, Core
Reporter: Eric Evans
  Labels: cql
 Fix For: 0.8.1

 Attachments: 2477-virtual-cfs-false-start.txt




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126682 - in /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra: gms/FailureDetector.java locator/DynamicEndpointSnitch.java

2011-05-23 Thread brandonwilliams
Author: brandonwilliams
Date: Mon May 23 19:43:53 2011
New Revision: 1126682

URL: http://svn.apache.org/viewvc?rev=1126682view=rev
Log:
Simplify FD/DES calculations.
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-2597

Modified:

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java?rev=1126682r1=1126681r2=1126682view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java
 Mon May 23 19:43:53 2011
@@ -200,6 +200,12 @@ class ArrivalWindow
 private double tLast_ = 0L;
 private BoundedStatsDeque arrivalIntervals_;
 
+// this is useless except to provide backwards compatibility in 
phi_convict_threshold,
+// because everyone seems pretty accustomed to the default of 8, and users 
who have
+// already tuned their phi_convict_threshold for their own environments 
won't need to
+// change.
+private final double PHI_FACTOR = 1.0 / Math.log(10.0);
+
 ArrivalWindow(int size)
 {
 arrivalIntervals_ = new BoundedStatsDeque(size);
@@ -249,26 +255,16 @@ class ArrivalWindow
 {
 arrivalIntervals_.clear();
 }
-
-double p(double t)
-{
-double mean = mean();
-double exponent = (-1)*(t)/mean;
-return Math.pow(Math.E, exponent);
-}
-
+
+// see CASSANDRA-2597 for an explanation of the math at work here.
 double phi(long tnow)
-{
+{
 int size = arrivalIntervals_.size();
-double log = 0d;
-if ( size  0 )
-{
-double t = tnow - tLast_;
-double probability = p(t);   
-log = (-1) * Math.log10( probability );
 
-}
-return log;   
-} 
+double t = tnow - tLast_;
+return (size  0)
+   ? PHI_FACTOR * t / mean()
+   : 0.0;
+}
 
 public String toString()
 {

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java?rev=1126682r1=1126681r2=1126682view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
 Mon May 23 19:43:53 2011
@@ -274,7 +274,6 @@ public class DynamicEndpointSnitch exten
 class AdaptiveLatencyTracker extends AbstractStatsDeque
 {
 private final LinkedBlockingDequeDouble latencies;
-private static final double SENTINEL_COMPARE = 0.0001; // arbitrary; as 
long as it is the same across hosts it doesn't matter
 
 AdaptiveLatencyTracker(int size)
 {
@@ -312,22 +311,9 @@ class AdaptiveLatencyTracker extends Abs
 return latencies.size();
 }
 
-double p(double t)
-{
-double mean = mean();
-double exponent = (-1) * (t) / mean;
-return 1 - Math.pow( Math.E, exponent);
-}
-
 double score()
 {
-double log = 0d;
-if ( latencies.size()  0 )
-{
-double probability = p(SENTINEL_COMPARE);
-log = (-1) * Math.log10( probability );
-}
-return log;
+return (size()  0) ? mean() : 0.0;
 }
 
 }




svn commit: r1126686 - in /cassandra/branches/cassandra-0.8.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 19:45:41 2011
New Revision: 1126686

URL: http://svn.apache.org/viewvc?rev=1126686view=rev
Log:
merge from 0.7

Modified:
cassandra/branches/cassandra-0.8.0/   (props changed)
cassandra/branches/cassandra-0.8.0/contrib/   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-0.8.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:45:41 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126503,1126639
+/cassandra/branches/cassandra-0.7:1026516-1126684
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 
/cassandra/branches/cassandra-0.8:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Propchange: cassandra/branches/cassandra-0.8.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:45:41 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126503,1126639
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126684
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 
/cassandra/branches/cassandra-0.8/contrib:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:45:41 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126503,1126639
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126684
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:45:41 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126503,1126639
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126684
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1102793,1102850,1103861,1103886,1103922,1125005,1125622
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:45:41 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000

[jira] [Updated] (CASSANDRA-2597) inconsistent implementation of 'cumulative distribution function' for Exponential Distribution

2011-05-23 Thread Brandon Williams (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2597?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brandon Williams updated CASSANDRA-2597:


Fix Version/s: (was: 0.7.7)
   0.8.1

 inconsistent implementation of 'cumulative distribution function' for 
 Exponential Distribution
 --

 Key: CASSANDRA-2597
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2597
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.1

 Attachments: 0001-simplify-failure-detection-calculations.txt


 As reported on the mailing list 
 (http://mail-archives.apache.org/mod_mbox/cassandra-dev/201104.mbox/%3CAANLkTimdMSLE8-z0x+0kvzqp7za3AEMLaOFXvd4Z=t...@mail.gmail.com%3E),
 {quote}
 I just found there are two implementations of 'cumulative distribution
 function' for Exponential Distribution and there are inconsistent :
 *FailureDetector*
 {code:java}
 org.apache.cassandra.gms.ArrivalWindow.p(double)
double p(double t)
{
double mean = mean();
double exponent = (-1)*(t)/mean;
return *Math.pow(Math.E, exponent)*;
}
 {code}
 *DynamicEndpointSnitch*
 {code:java}
 org.apache.cassandra.locator.AdaptiveLatencyTracker.p(double)
double p(double t)
{
double mean = mean();
double exponent = (-1) * (t) / mean;
return *1 - Math.pow( Math.E, exponent);*
}
 {code}
 According to the  Exponential Distribution cumulative distribution function
 definitionhttp://en.wikipedia.org/wiki/Exponential_distribution#Cumulative_distribution_function,
 the later one is correct
 {quote}
 ... however FailureDetector has been working as advertised for some time now. 
  Does this mean the Snitch version is actually wrong?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126688 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/db/migra

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 19:46:58 2011
New Revision: 1126688

URL: http://svn.apache.org/viewvc?rev=1126688view=rev
Log:
merge from 0.7 (#2693)

Modified:
cassandra/branches/cassandra-0.8/   (props changed)
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/contrib/   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/DropKeyspace.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/RenameKeyspace.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:46:58 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7:1026516-1126686
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1126670

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1126688r1=1126687r2=1126688view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon May 23 19:46:58 2011
@@ -20,6 +20,7 @@
  * Add sstable bulk loading utility (CASSANDRA-1278)
  * avoid replaying hints to dropped columnfamilies (CASSANDRA-2685)
  * add placeholders for missing rows in range query pseudo-RR (CASSANDRA-2680)
+ * remove no-op HHOM.renameHints (CASSANDRA-2693)
 
 
 0.8.0-final

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:46:58 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126686
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1126670

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:46:58 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126686
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1126670

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:46:58 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1126686
 

[jira] [Updated] (CASSANDRA-2045) Simplify HH to decrease read load when nodes come back

2011-05-23 Thread Nicholas Telford (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2045?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Nicholas Telford updated CASSANDRA-2045:


Attachment: CASSANDRA-2045-simplify-hinted-handoff-001.diff

Implements serialized RowMutations for Hints.

This should be optional, but currently isn't. The if (true) should be 
replaced with some logic to either detect the appropriate strategy from the CF 
histogram or using a manual per-CF setting. I've left this out for now pending 
a consensus on the matter.

I'm not hugely familiar with the Cassandra codebase, so it's quite possible 
I've missed something.

Unit tests are currently missing, I'll get those sorted out next. I wanted to 
get feedback on the implementation before continuing.

I've optimised the patch for fewest changes, as such there's lots of room for 
refactoring (e.g. HHM.sendRow() and HHM.sendMutation() share a lot of 
validation code).

Importantly, the RowMutations are indexed under a sub-column representing the 
MessagingService.version_ that serialized them. This allows nodes running on a 
different version to classify these hints as invalid and discard them.

 Simplify HH to decrease read load when nodes come back
 --

 Key: CASSANDRA-2045
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2045
 Project: Cassandra
  Issue Type: Improvement
Reporter: Chris Goffinet
 Fix For: 1.0

 Attachments: CASSANDRA-2045-simplify-hinted-handoff-001.diff


 Currently when HH is enabled, hints are stored, and when a node comes back, 
 we begin sending that node data. We do a lookup on the local node for the row 
 to send. To help reduce read load (if a node is offline for long period of 
 time) we should store the data we want forward the node locally instead. We 
 wouldn't have to do any lookups, just take byte[] and send to the destination.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126694 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/db/ src/java/org/apac

2011-05-23 Thread jbellis
Author: jbellis
Date: Mon May 23 19:53:56 2011
New Revision: 1126694

URL: http://svn.apache.org/viewvc?rev=1126694view=rev
Log:
merge from 0.8

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java

cassandra/trunk/src/java/org/apache/cassandra/db/migration/RenameKeyspace.java
cassandra/trunk/src/java/org/apache/cassandra/gms/FailureDetector.java

cassandra/trunk/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java

cassandra/trunk/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:53:56 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7:1026516-1126686
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1126660
-/cassandra/branches/cassandra-0.8.0:1125021-1126659
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1126691
+/cassandra/branches/cassandra-0.8.0:1125021-1126670
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1126694r1=1126693r2=1126694view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon May 23 19:53:56 2011
@@ -20,6 +20,7 @@
  * Add sstable bulk loading utility (CASSANDRA-1278)
  * avoid replaying hints to dropped columnfamilies (CASSANDRA-2685)
  * add placeholders for missing rows in range query pseudo-RR (CASSANDRA-2680)
+ * remove no-op HHOM.renameHints (CASSANDRA-2693)
 
 
 0.8.0-final
@@ -30,8 +31,11 @@
  * fix UUIDType, IntegerType for direct buffers (CASSANDRA-2682, 2684)
  * switch to native Thrift for Hadoop map/reduce (CASSANDRA-2667)
  * fix StackOverflowError when building from eclipse (CASSANDRA-2687)
+ * only provide replication_factor to strategy_options help for
+   SimpleStrategy, OldNetworkTopologyStrategy (CASSANDRA-2678)
 
-0.8.0-rc1 
+
+0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
rebuffering in BRAF (CASSANDRA-2581)
  * fix returning null column values in the python cql driver (CASSANDRA-2593)

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:53:56 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1126504,1126639
+/cassandra/branches/cassandra-0.7/contrib:1026516-1126686
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1126660
-/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126659
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1126691
+/cassandra/branches/cassandra-0.8.0/contrib:1125021-1126670
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 19:53:56 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1126504,1126639

buildbot success in ASF Buildbot on cassandra-trunk

2011-05-23 Thread buildbot
The Buildbot has detected a restored build on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1326

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1126694
Blamelist: jbellis

Build succeeded!

sincerely,
 -The Buildbot



[jira] [Updated] (CASSANDRA-2692) Nuke BMT from orbit

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2692?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2692:
--

Attachment: (was: 2692.txt)

 Nuke BMT from orbit
 ---

 Key: CASSANDRA-2692
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2692
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Brandon Williams
Priority: Minor
 Fix For: 1.0


 Now that we have CASSANDRA-1278, let's remove BMT since it often confuses 
 people in the config, is not used or tested very much, and is suboptimal.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2692) Nuke BMT from orbit

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2692?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2692:
--

Attachment: 2692.txt

with prejudice.

 Nuke BMT from orbit
 ---

 Key: CASSANDRA-2692
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2692
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Brandon Williams
Priority: Minor
 Fix For: 1.0


 Now that we have CASSANDRA-1278, let's remove BMT since it often confuses 
 people in the config, is not used or tested very much, and is suboptimal.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2433) Failed Streams Break Repair

2011-05-23 Thread Stu Hood (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038181#comment-13038181
 ] 

Stu Hood commented on CASSANDRA-2433:
-

0001
* Since we're not trying to control throughput or monitor sessions, could we 
just use Stage.MISC?
0002
* I think RepairSession.exception needs to be volatile to ensure that the 
awoken thread sees it
* Would it be better if RepairSession implemented 
IEndpointStateChangeSubscriber directly?
* The endpoint set needs to be threadsafe, since it will be modified by the 
endpoint state change thread, and the AE_STAGE thread
0003
* Should StreamInSession.retries be volatile/atomic? (likely they won't retry 
quickly enough for it to be a problem, but...)
0004
* Playing devil's advocate: would sending a half-built tree in case of failure 
still be useful?

Thanks Sylvain!

 Failed Streams Break Repair
 ---

 Key: CASSANDRA-2433
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2433
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Benjamin Coverston
Assignee: Sylvain Lebresne
  Labels: repair
 Fix For: 0.8.1

 Attachments: 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re-v2.patch, 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re.patch, 
 0002-Register-in-gossip-to-handle-node-failures-v2.patch, 
 0002-Register-in-gossip-to-handle-node-failures.patch, 
 0003-Report-streaming-errors-back-to-repair-v2.patch, 
 0003-Report-streaming-errors-back-to-repair.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair-v2.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair.patch


 Running repair in cases where a stream fails we are seeing multiple problems.
 1. Although retry is initiated and completes, the old stream doesn't seem to 
 clean itself up and repair hangs.
 2. The temp files are left behind and multiple failures can end up filling up 
 the data partition.
 These issues together are making repair very difficult for nearly everyone 
 running repair on a non-trivial sized data set.
 This issue is also being worked on w.r.t CASSANDRA-2088, however that was 
 moved to 0.8 for a few reasons. This ticket is to fix the immediate issues 
 that we are seeing in 0.7.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Issue Comment Edited] (CASSANDRA-2433) Failed Streams Break Repair

2011-05-23 Thread Stu Hood (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038181#comment-13038181
 ] 

Stu Hood edited comment on CASSANDRA-2433 at 5/23/11 8:09 PM:
--

0001
* Since we're not trying to control throughput or monitor sessions, could we 
just use Stage.MISC?

0002
* I think RepairSession.exception needs to be volatile to ensure that the 
awoken thread sees it
* Would it be better if RepairSession implemented 
IEndpointStateChangeSubscriber directly?
* The endpoint set needs to be threadsafe, since it will be modified by the 
endpoint state change thread, and the AE_STAGE thread

0003
* Should StreamInSession.retries be volatile/atomic? (likely they won't retry 
quickly enough for it to be a problem, but...)

0004
* Playing devil's advocate: would sending a half-built tree in case of failure 
still be useful?

Thanks Sylvain!

  was (Author: stuhood):
0001
* Since we're not trying to control throughput or monitor sessions, could we 
just use Stage.MISC?
0002
* I think RepairSession.exception needs to be volatile to ensure that the 
awoken thread sees it
* Would it be better if RepairSession implemented 
IEndpointStateChangeSubscriber directly?
* The endpoint set needs to be threadsafe, since it will be modified by the 
endpoint state change thread, and the AE_STAGE thread
0003
* Should StreamInSession.retries be volatile/atomic? (likely they won't retry 
quickly enough for it to be a problem, but...)
0004
* Playing devil's advocate: would sending a half-built tree in case of failure 
still be useful?

Thanks Sylvain!
  
 Failed Streams Break Repair
 ---

 Key: CASSANDRA-2433
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2433
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Benjamin Coverston
Assignee: Sylvain Lebresne
  Labels: repair
 Fix For: 0.8.1

 Attachments: 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re-v2.patch, 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re.patch, 
 0002-Register-in-gossip-to-handle-node-failures-v2.patch, 
 0002-Register-in-gossip-to-handle-node-failures.patch, 
 0003-Report-streaming-errors-back-to-repair-v2.patch, 
 0003-Report-streaming-errors-back-to-repair.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair-v2.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair.patch


 Running repair in cases where a stream fails we are seeing multiple problems.
 1. Although retry is initiated and completes, the old stream doesn't seem to 
 clean itself up and repair hangs.
 2. The temp files are left behind and multiple failures can end up filling up 
 the data partition.
 These issues together are making repair very difficult for nearly everyone 
 running repair on a non-trivial sized data set.
 This issue is also being worked on w.r.t CASSANDRA-2088, however that was 
 moved to 0.8 for a few reasons. This ticket is to fix the immediate issues 
 that we are seeing in 0.7.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Issue Comment Edited] (CASSANDRA-2433) Failed Streams Break Repair

2011-05-23 Thread Stu Hood (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2433?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038181#comment-13038181
 ] 

Stu Hood edited comment on CASSANDRA-2433 at 5/23/11 8:10 PM:
--

0001
* Since we're not trying to control throughput or monitor sessions, could we 
just use Stage.MISC?

0002
* I think RepairSession.exception needs to be volatile to ensure that the 
awoken thread sees it
* Would it be better if RepairSession implemented 
IEndpointStateChangeSubscriber directly?
* The endpoint set needs to be threadsafe, since it will be modified by the 
endpoint state change thread, and the AE_STAGE thread

0003
* Should StreamInSession.retries be volatile/atomic? (likely they won't retry 
quickly enough for it to be a problem, but...)

0004
* Playing devil's advocate: would sending a half-built tree in case of failure 
still be useful?
* success might need to be volatile as well

Thanks Sylvain!

  was (Author: stuhood):
0001
* Since we're not trying to control throughput or monitor sessions, could we 
just use Stage.MISC?

0002
* I think RepairSession.exception needs to be volatile to ensure that the 
awoken thread sees it
* Would it be better if RepairSession implemented 
IEndpointStateChangeSubscriber directly?
* The endpoint set needs to be threadsafe, since it will be modified by the 
endpoint state change thread, and the AE_STAGE thread

0003
* Should StreamInSession.retries be volatile/atomic? (likely they won't retry 
quickly enough for it to be a problem, but...)

0004
* Playing devil's advocate: would sending a half-built tree in case of failure 
still be useful?

Thanks Sylvain!
  
 Failed Streams Break Repair
 ---

 Key: CASSANDRA-2433
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2433
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Benjamin Coverston
Assignee: Sylvain Lebresne
  Labels: repair
 Fix For: 0.8.1

 Attachments: 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re-v2.patch, 
 0001-Put-repair-session-on-a-Stage-and-add-a-method-to-re.patch, 
 0002-Register-in-gossip-to-handle-node-failures-v2.patch, 
 0002-Register-in-gossip-to-handle-node-failures.patch, 
 0003-Report-streaming-errors-back-to-repair-v2.patch, 
 0003-Report-streaming-errors-back-to-repair.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair-v2.patch, 
 0004-Reports-validation-compaction-errors-back-to-repair.patch


 Running repair in cases where a stream fails we are seeing multiple problems.
 1. Although retry is initiated and completes, the old stream doesn't seem to 
 clean itself up and repair hangs.
 2. The temp files are left behind and multiple failures can end up filling up 
 the data partition.
 These issues together are making repair very difficult for nearly everyone 
 running repair on a non-trivial sized data set.
 This issue is also being worked on w.r.t CASSANDRA-2088, however that was 
 moved to 0.8 for a few reasons. This ticket is to fix the immediate issues 
 that we are seeing in 0.7.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-2692) Nuke BMT from orbit

2011-05-23 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2692?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-2692:
--

Attachment: 2692.txt

 Nuke BMT from orbit
 ---

 Key: CASSANDRA-2692
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2692
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Brandon Williams
Priority: Minor
 Fix For: 1.0

 Attachments: 2692.txt


 Now that we have CASSANDRA-1278, let's remove BMT since it often confuses 
 people in the config, is not used or tested very much, and is suboptimal.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2649) work-around schema disagreements from cqlsh

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038187#comment-13038187
 ] 

Jonathan Ellis commented on CASSANDRA-2649:
---

Let's create a ticket to do this right for 0.8.1, but this patch is 
definitely a minimally inasive improvement on the existing 
multiple-schema-changes-are-guaranteed-to-hose-cqlsh status quo, so +1 for 
0.8.0.

 work-around schema disagreements from cqlsh
 ---

 Key: CASSANDRA-2649
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2649
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.8.0 beta 2
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 0.8.0

 Attachments: 
 v1-0001-CASSANDRA-2649-try-to-work-around-schema-disagreement-.txt


 It is handy to be able to put CQL statements in a flat-file and load them by 
 redirecting to {{cqlsh}} stdin, but this can fail on a cluster when executing 
 statements that modify schema.
 The attached patch works around this problem by retrying up to 3 times, with 
 a progressive delay after each attempt.  A better solution would probably be 
 to compare schema versions, but this seems to work well enough, and is better 
 than _not_ handling it at all.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2683) Allow writes to bypass the commit log for certain column families

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038194#comment-13038194
 ] 

Jonathan Ellis commented on CASSANDRA-2683:
---

the serializer approach to skipping CL seems excessively complicated.  why not 
just have RMVH and RM.apply pass cfs.metadata.bypass_commitlog as the boolean 
writeCommitlog parameter?

(note that RMVH is basically inlining RM.apply in its own Table.apply call, if 
you fix that then there will be only one code path so even less risk of 
confusion.)

 Allow writes to bypass the commit log for certain column families
 -

 Key: CASSANDRA-2683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2683
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: T Jake Luciani
Assignee: T Jake Luciani
 Fix For: 0.8.1

 Attachments: v1-0001-CASSANDRA-2683-add-bypass_commitlog-flag.txt, 
 v1-0002-CASSANDRA-2683-thrift-add-bypass_commitlog-flag.txt, 
 v1-0003-CASSANDRA-2683-Fix-broken-unit-tests.txt


 Some data in cassandra does not need durability on a single node.  Also ec2 
 users often wish to disable the commitlog since they are using the ephemeral 
 disks.
 This patch let's you set bypass_commitlog=true in the CfMetaData, the effect 
 being RowMutations on ColumnFamilies with this flag will bypass the commit log

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2683) Allow writes to bypass the commit log for certain column families

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038195#comment-13038195
 ] 

Jonathan Ellis commented on CASSANDRA-2683:
---

bq. Seems like thrift generated code changed a bunch, I'm using the thrift-0.6 
compiler.

go ahead and commit a re-gen of the existing IDL first to keep the history 
un-muddled.

 Allow writes to bypass the commit log for certain column families
 -

 Key: CASSANDRA-2683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2683
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: T Jake Luciani
Assignee: T Jake Luciani
 Fix For: 0.8.1

 Attachments: v1-0001-CASSANDRA-2683-add-bypass_commitlog-flag.txt, 
 v1-0002-CASSANDRA-2683-thrift-add-bypass_commitlog-flag.txt, 
 v1-0003-CASSANDRA-2683-Fix-broken-unit-tests.txt


 Some data in cassandra does not need durability on a single node.  Also ec2 
 users often wish to disable the commitlog since they are using the ephemeral 
 disks.
 This patch let's you set bypass_commitlog=true in the CfMetaData, the effect 
 being RowMutations on ColumnFamilies with this flag will bypass the commit log

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2597) inconsistent implementation of 'cumulative distribution function' for Exponential Distribution

2011-05-23 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2597?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038201#comment-13038201
 ] 

Hudson commented on CASSANDRA-2597:
---

Integrated in Cassandra-0.8 #128 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.8/128/])
Simplify FD/DES calculations.
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-2597

brandonwilliams : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1126682
Files : 
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/FailureDetector.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java


 inconsistent implementation of 'cumulative distribution function' for 
 Exponential Distribution
 --

 Key: CASSANDRA-2597
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2597
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.1

 Attachments: 0001-simplify-failure-detection-calculations.txt


 As reported on the mailing list 
 (http://mail-archives.apache.org/mod_mbox/cassandra-dev/201104.mbox/%3CAANLkTimdMSLE8-z0x+0kvzqp7za3AEMLaOFXvd4Z=t...@mail.gmail.com%3E),
 {quote}
 I just found there are two implementations of 'cumulative distribution
 function' for Exponential Distribution and there are inconsistent :
 *FailureDetector*
 {code:java}
 org.apache.cassandra.gms.ArrivalWindow.p(double)
double p(double t)
{
double mean = mean();
double exponent = (-1)*(t)/mean;
return *Math.pow(Math.E, exponent)*;
}
 {code}
 *DynamicEndpointSnitch*
 {code:java}
 org.apache.cassandra.locator.AdaptiveLatencyTracker.p(double)
double p(double t)
{
double mean = mean();
double exponent = (-1) * (t) / mean;
return *1 - Math.pow( Math.E, exponent);*
}
 {code}
 According to the  Exponential Distribution cumulative distribution function
 definitionhttp://en.wikipedia.org/wiki/Exponential_distribution#Cumulative_distribution_function,
 the later one is correct
 {quote}
 ... however FailureDetector has been working as advertised for some time now. 
  Does this mean the Snitch version is actually wrong?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-2683) Allow writes to bypass the commit log for certain column families

2011-05-23 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2683?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13038203#comment-13038203
 ] 

Jonathan Ellis commented on CASSANDRA-2683:
---

I think there's a further wrinkle here: Table.apply and RM are per-keyspace, 
but CL-skipping is per-CF. (Is that why you took the serializer approach? If 
so, I'm a bit slow.)

I'm still not a fan of making it more complex, though.  I'd rather just  the 
bypass values together and if any CF wants the CL, we throw the whole RM into 
it.  IMO mixing bypassed- and non- in the same batch is not something we should 
encourage anyway.

 Allow writes to bypass the commit log for certain column families
 -

 Key: CASSANDRA-2683
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2683
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: T Jake Luciani
Assignee: T Jake Luciani
 Fix For: 0.8.1

 Attachments: v1-0001-CASSANDRA-2683-add-bypass_commitlog-flag.txt, 
 v1-0002-CASSANDRA-2683-thrift-add-bypass_commitlog-flag.txt, 
 v1-0003-CASSANDRA-2683-Fix-broken-unit-tests.txt


 Some data in cassandra does not need durability on a single node.  Also ec2 
 users often wish to disable the commitlog since they are using the ephemeral 
 disks.
 This patch let's you set bypass_commitlog=true in the CfMetaData, the effect 
 being RowMutations on ColumnFamilies with this flag will bypass the commit log

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira


svn commit: r1126728 - in /cassandra/branches/cassandra-0.8: bin/cassandra src/java/org/apache/cassandra/tools/GetVersion.java

2011-05-23 Thread eevans
Author: eevans
Date: Mon May 23 20:38:04 2011
New Revision: 1126728

URL: http://svn.apache.org/viewvc?rev=1126728view=rev
Log:
print version string

Patch by eevans; reviewed by jbellis for CASSANDRA-2689

Added:

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/GetVersion.java
Modified:
cassandra/branches/cassandra-0.8/bin/cassandra

Modified: cassandra/branches/cassandra-0.8/bin/cassandra
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/bin/cassandra?rev=1126728r1=1126727r2=1126728view=diff
==
--- cassandra/branches/cassandra-0.8/bin/cassandra (original)
+++ cassandra/branches/cassandra-0.8/bin/cassandra Mon May 23 20:38:04 2011
@@ -19,6 +19,7 @@
 # OPTIONS:
 #   -f: start in foreground
 #   -p filename: log the pid to a file (useful to kill it later)
+#   -v: print version string and exit
 
 # CONTROLLING STARTUP:
 # 
@@ -129,7 +130,7 @@ launch_service()
 }
 
 # Parse any command line options.
-args=`getopt fhp:bD: $@`
+args=`getopt vfhp:bD: $@`
 eval set -- $args
 
 classname=org.apache.cassandra.thrift.CassandraDaemon
@@ -148,6 +149,10 @@ while true; do
 echo Usage: $0 [-f] [-h] [-p pidfile]
 exit 0
 ;;
+-v)
+$JAVA -cp $CLASSPATH org.apache.cassandra.tools.GetVersion
+exit 0
+;;
 -D)
 properties=$properties -D$2
 shift 2

Added: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/GetVersion.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/GetVersion.java?rev=1126728view=auto
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/GetVersion.java
 (added)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/GetVersion.java
 Mon May 23 20:38:04 2011
@@ -0,0 +1,26 @@
+/**
+ * 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.tools;
+
+import static org.apache.cassandra.utils.FBUtilities.getReleaseVersionString;
+
+public class GetVersion {
+public static void main(String[] args) {
+System.out.println(getReleaseVersionString());
+}
+}




  1   2   >