svn commit: r1101772 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 07:19:32 2011
New Revision: 1101772

URL: http://svn.apache.org/viewvc?rev=1101772view=rev
Log:
Fix regression where boostrapping a node without schema defined fails
patch by slebresne; reviewed by jbellis for CASSANDRA-2625

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

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

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101772r1=1101771r2=1101772view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 07:19:32 2011
@@ -15,6 +15,8 @@
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
  * Don't allow {LOCAL|EACH}_QUORUM unless strategy is NTS (CASSANDRA-2627)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.7.5

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1101772r1=1101771r2=1101772view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 Wed May 11 07:19:32 2011
@@ -453,7 +453,12 @@ public class StorageService implements I
 bootstrap(token);
 assert !isBootstrapMode; // bootstrap will block until finished
 }
-// else nothing to do, go directly to participating in ring
+else
+{
+// nothing to bootstrap, go directly to participating in ring
+SystemTable.setBootstrapped(true);
+setToken(token);
+}
 }
 else
 {




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

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 07:20:53 2011
New Revision: 1101773

URL: http://svn.apache.org/viewvc?rev=1101773view=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/service/StorageService.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:20:53 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1101773r1=1101772r2=1101773view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 07:20:53 2011
@@ -42,6 +42,8 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.8.0-beta1

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:20:53 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:20:53 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:20:53 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1100900,1101021,1101772
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
 

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

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 07:24:50 2011
New Revision: 1101775

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

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-0.8.1/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:24:50 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597
+/cassandra/branches/cassandra-0.8:1090935-1101597,1101773
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350

Modified: cassandra/branches/cassandra-0.8.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.1/CHANGES.txt?rev=1101775r1=1101774r2=1101775view=diff
==
--- cassandra/branches/cassandra-0.8.1/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.1/CHANGES.txt Wed May 11 07:24:50 2011
@@ -58,6 +58,8 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.8.0-beta1

Propchange: cassandra/branches/cassandra-0.8.1/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:24:50 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1101597
+/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/contrib:810145-810987,810994-834239,834349-834350

Propchange: 
cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:24:50 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772
 
/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:1090935-1101597
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1101597,1101773
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350

Propchange: 

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

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 07:28:22 2011
New Revision: 1101777

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

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/service/StorageService.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:28:22 2011
@@ -1,8 +1,8 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597
-/cassandra/branches/cassandra-0.8.1:1101014-1101613
+/cassandra/branches/cassandra-0.8:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8.1:1101014-1101613,1101775
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1101777r1=1101776r2=1101777view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed May 11 07:28:22 2011
@@ -56,6 +56,8 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.8.0-beta1

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:28:22 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1101597
-/cassandra/branches/cassandra-0.8.1/contrib:1101014-1101613
+/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8.1/contrib:1101014-1101613,1101775
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/contrib:810145-810987,810994-834239,834349-834350

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 07:28:22 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-1100900,1101021
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772
 
/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:1090935-1101597
-/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1101613
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1101613,1101775
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
 

[jira] [Commented] (CASSANDRA-2625) auto bootstrapping a node into a cluster without a schema silently fails

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2625:
---

Integrated in Cassandra-0.7 #476 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/476/])
Fix regression where boostrapping a node without schema defined fails
patch by slebresne; reviewed by jbellis for CASSANDRA-2625


 auto bootstrapping a node into a cluster without a schema silently fails
 

 Key: CASSANDRA-2625
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2625
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Aaron Morton
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.6

 Attachments: 0001-2625.patch


 from http://www.mail-archive.com/user@cassandra.apache.org/msg13001.html
 StorageService.joinRing() aborts the auto bootstrap process if the cluster 
 does not have a schema defined. It looks like the node is left in the 
 Joining mode and there is no logging. 
 There could be a schema defined and no data loaded, so just having a schema 
 does not make the token selection any better. And BootStrapper.bootstrap() 
 handles their been no non system tables.
 Can we let the bootstrap process continue ?

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


[jira] [Commented] (CASSANDRA-2631) Replaying a commitlog entry from a dropped keyspace will cause an error

2011-05-11 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2631:
-

+1

 Replaying a commitlog entry from a dropped keyspace will cause an error
 ---

 Key: CASSANDRA-2631
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2631
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
 Fix For: 0.7.6

 Attachments: 2631-0.7.txt, 2631-0.8.txt




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


svn commit: r1101792 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/SystemTable.java

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 09:10:54 2011
New Revision: 1101792

URL: http://svn.apache.org/viewvc?rev=1101792view=rev
Log:
Allow removing LocationInfo sstables (to allow cluster rename)
patch by amorton; reviewed by slebresne for CASSANDRA-2632

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

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SystemTable.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101792r1=1101791r2=1101792view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 09:10:54 2011
@@ -17,6 +17,7 @@
  * Don't allow {LOCAL|EACH}_QUORUM unless strategy is NTS (CASSANDRA-2627)
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.7.5

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SystemTable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SystemTable.java?rev=1101792r1=1101791r2=1101792view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SystemTable.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/SystemTable.java
 Wed May 11 09:10:54 2011
@@ -221,18 +221,9 @@ public class SystemTable
 if (cf == null)
 {
 // this is either a brand new node (there will be no files), or 
the partitioner was changed from RP to OPP.
-for (String path : 
DatabaseDescriptor.getAllDataFileLocationsForTable(system))
-{
-File[] dbContents = new File(path).listFiles(new 
FilenameFilter()
-{
-public boolean accept(File dir, String name)
-{
-return name.endsWith(.db);
-}
-}); 
-if (dbContents.length  0)
-throw new ConfigurationException(Found system table 
files, but they couldn't be loaded. Did you change the partitioner?);
-}
+ColumnFamilyStore cfs = table.getColumnFamilyStore(STATUS_CF);
+if (!cfs.getSSTables().isEmpty())
+throw new ConfigurationException(Found system table files, 
but they couldn't be loaded. Did you change the partitioner?);
 
 // no system files.  this is a new node.
 RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, LOCATION_KEY);




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

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 09:14:32 2011
New Revision: 1101794

URL: http://svn.apache.org/viewvc?rev=1101794view=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/SystemTable.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:14: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1101794r1=1101793r2=1101794view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 09:14:32 2011
@@ -44,6 +44,7 @@
definition alone (CASSANDRA-2619)
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.8.0-beta1

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:14: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:14: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772,1101792
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:14:32 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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1100900,1101021,1101772,1101792
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
 

[jira] [Commented] (CASSANDRA-2632) ConfigurationException when starting a node after deleting LocationInfo SStables

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2632:
---

Integrated in Cassandra-0.7 #477 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/477/])
Allow removing LocationInfo sstables (to allow cluster rename)
patch by amorton; reviewed by slebresne for CASSANDRA-2632


 ConfigurationException when starting a node after deleting LocationInfo 
 SStables
 

 Key: CASSANDRA-2632
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2632
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Aaron Morton
Assignee: Aaron Morton
Priority: Minor
 Fix For: 0.7.6

 Attachments: 
 0001-only-check-for-existing-LocationInfo-SSTables-during.patch


 from http://www.mail-archive.com/user@cassandra.apache.org/msg13170.html
 SystemTable.checkHealth() assumes that if the LOCATION_KEY row is not in the 
 STATUS system CF their should be no other files in the system data directory. 
 If it's safe to delete the LocationInfo sstables this stops the server 
 restarting.
 I think the intention of the check is to assert that the reason the row was 
 not found is that there is no data in the STATUS CF. 

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


svn commit: r1101802 - in /cassandra/branches/cassandra-0.8.1: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 09:45:08 2011
New Revision: 1101802

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

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

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

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

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

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

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

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/db/SystemTable.java

Propchange: cassandra/branches/cassandra-0.8.1/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:45:08 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8:1090935-1101597,1101773,1101794
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350

Modified: cassandra/branches/cassandra-0.8.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.1/CHANGES.txt?rev=1101802r1=1101801r2=1101802view=diff
==
--- cassandra/branches/cassandra-0.8.1/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.1/CHANGES.txt Wed May 11 09:45:08 2011
@@ -60,6 +60,7 @@
definition alone (CASSANDRA-2619)
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.8.0-beta1

Propchange: cassandra/branches/cassandra-0.8.1/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:45:08 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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773,1101794
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/contrib:810145-810987,810994-834239,834349-834350

Propchange: 
cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:45:08 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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772,1101792
 
/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:1090935-1101597,1101773
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1101597,1101773,1101794
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java:810145-834239,834349-834350

Propchange: 

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

2011-05-11 Thread slebresne
Author: slebresne
Date: Wed May 11 09:51:12 2011
New Revision: 1101806

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

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/SystemTable.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:51: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597,1101773
-/cassandra/branches/cassandra-0.8.1:1101014-1101613,1101775
+/cassandra/branches/cassandra-0.8:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8.1:1101014-1101613,1101775,1101802
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1101806r1=1101805r2=1101806view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed May 11 09:51:12 2011
@@ -58,6 +58,7 @@
definition alone (CASSANDRA-2619)
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.8.0-beta1

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:51: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/contrib:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773
-/cassandra/branches/cassandra-0.8.1/contrib:1101014-1101613,1101775
+/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8.1/contrib:1101014-1101613,1101775,1101802
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573
 
/incubator/cassandra/branches/cassandra-0.4/contrib:810145-810987,810994-834239,834349-834350

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 09:51: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-1100900,1101021,1101772
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1100900,1101021,1101772,1101792
 
/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:1090935-1101597,1101773
-/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1101613,1101775
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1101613,1101775,1101802
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 

[jira] [Updated] (CASSANDRA-2614) create Column and CounterColumn in the same column family

2011-05-11 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2614:


Reviewer:   (was: slebresne)

 create Column and CounterColumn in the same column family
 -

 Key: CASSANDRA-2614
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2614
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Dave Rav
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.8.1


 create Column and CounterColumn in the same column family

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


[jira] [Updated] (CASSANDRA-2622) Select * doesn't include row key

2011-05-11 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2622:
---

Attachment: grammar-fix.patch

grammar should build without warnings.

 Select * doesn't include row key
 

 Key: CASSANDRA-2622
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2622
 Project: Cassandra
  Issue Type: Bug
  Components: API
Affects Versions: 0.8 beta 1
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
 Fix For: 0.8.0

 Attachments: 2622.txt, grammar-fix.patch




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


[jira] [Created] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Richard Low (JIRA)
Keys get lost in bootstrap
--

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical


When bootstrapping a new node, the key at the upper end of the new node's range 
can get lost.  To reproduce:

* Set up one cassandra node, create a keyspace and column family and perform 
some inserts
* Read every row back
* Bootstrap a second node
* Read every row back

You find one row is missing, whose row key is exactly equal to the token the 
new node gets (for OPP - for RP it's the key whose hash is equal to the token). 
 If you don't do the reads after the inserts, the key is not lost.  I tracked 
the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  The problem 
is that the cached position is used if it is there (so only if the reads were 
performed).  But this is incorrect because the cached position is the start of 
the row, not the end.  This means the end row itself is not transferred.  This 
causes the last key in the range to get lost.

Although I haven't seen it, this may occur during antientropy repairs too.

The attached patch (against the 0.7 branch) fixes it by not using the cache for 
Operator.GT.  I haven't tested with 0.8 but from looking at the code I think 
the problem is present.

This might be related to CASSANDRA-1992

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


[jira] [Updated] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Richard Low (JIRA)

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

Richard Low updated CASSANDRA-2633:
---

Attachment: 0.7-2633.txt

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Updated] (CASSANDRA-2615) in cassandra-cli, the help command output on validation types should be updated

2011-05-11 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2615:
---

Attachment: CASSANDRA-2615.patch

Added CounterColumnType to functions + fixed doc and assume function.

 in cassandra-cli, the help command output on validation types should be 
 updated 
 

 Key: CASSANDRA-2615
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2615
 Project: Cassandra
  Issue Type: Bug
Reporter: Jackson Chung
Assignee: Pavel Yaskevich
Priority: Minor
 Attachments: CASSANDRA-2615.patch


 from cassandra-cli, say type help assume
 you will find:
   Supported values are:
 - AsciiType
 - BytesType
 - CounterColumnType (distributed counter column)
 - IntegerType (a generic variable-length integer type)
 - LexicalUUIDType
 - LongType
 - UTF8Type
 ok now:
 [default@cfs] assume inode comparator as UTF8Type;   
 Type 'UTF8Type' was not found. Available: bytes, integer, long, lexicaluuid, 
 timeuuid, utf8, ascii.
 so looks like the supported type list should be update by taking away the 
 Type post-fix..
 however, on the other hand, you can't really use it:
 [default@cfs] update column family inode; 
 Unable to find abstract-type class 'org.apache.cassandra.db.marshal.utf8'
 looks like from the update, you still need the Type (case insensitive?)

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


MultinodeCluster reverted to revision 6 on Cassandra Wiki

2011-05-11 Thread Apache Wiki
Dear wiki user,

You have subscribed to a wiki page Cassandra Wiki for change notification.

The page MultinodeCluster has been reverted to revision 6 by MakiWatanabe.
The comment on this change is: Latest update by Roger are not make sense.
http://wiki.apache.org/cassandra/MultinodeCluster?action=diffrev1=7rev2=8

--

  The default cassandra.yaml uses the local, loopback address as its listen 
(inter-node) and Thrift (client access) addresses:
  
  {{{
- listen_address: http://www.angosso.net/
+ listen_address: localhost
  
- rpc_address: angosso.net
+ rpc_address: localhost
  }}}
  
- As the listen address is used for intra-cluster communication, it must be 
changed to a routable address so the other nodes can reach it.  For example, 
assuming you have an Ethernet interface with address 207.46.31.61, you would 
change the listen address like so:
+ As the listen address is used for intra-cluster communication, it must be 
changed to a routable address so the other nodes can reach it.  For example, 
assuming you have an Ethernet interface with address 192.168.1.1, you would 
change the listen address like so:
  
  {{{
- listen_address: 207.46.31.61
+ listen_address: 192.168.1.1
  }}}
  
  The Thrift interface can be configured using either a specified address, like 
the listen address, or using the wildcard 0.0.0.0, which causes cassandra to 
listen for clients on all available interfaces.  Update it as either:
  
  {{{
- rpc_address: 207.46.31.61
+ rpc_address: 192.168.1.1
  }}}
  
  Or:
  
  {{{
- rpc_address: 65.55.39.12
+ rpc_address: 0.0.0.0
  }}}
  
  If the DNS entry for your host is correct, it is safe to use a hostname 
instead of an IP address.  Similarly, the seed information should be changed 
from the loopback address:
@@ -46, +46 @@

  
  {{{
  seeds:
-   - 207.46.31.61
+   - 192.168.1.1
  
  }}}
  
  Once these changes are made, simply restart cassandra on this node.  Use 
netstat to verify cassandra is listening on the right address.  Look for a line 
like this:
  
- {{{tcp4   0  0  207.46.31.61.7000 *angosso.net*   
 LISTEN}}}
+ {{{tcp4   0  0  192.168.1.1.7000 *.*
LISTEN}}}
  
  If netstat still shows cassandra listening on 127.0.0.1.7000, then either the 
previous cassandra process was not properly killed or you are not editing the 
cassandra.yaml file cassandra is actually using.
  
@@ -65, +65 @@

  auto_bootstrap: true
  }}}
  
- The second change is to the listen address, as it must also not be the 
loopback and cannot be the same as any other node.  Assuming your second node 
has an Ethernet interface with the address 207.46.31.61, set its listen address 
with:
+ The second change is to the listen address, as it must also not be the 
loopback and cannot be the same as any other node.  Assuming your second node 
has an Ethernet interface with the address 192.168.2.34, set its listen address 
with:
  
  {{{
- listen_address: 207.46.31.61
+ listen_address: 192.168.2.34
  }}}
  
  Finally, update the the Thrift address to accept client connections, as with 
the first node, either with a specific address or the wildcard:
  
  {{{
- rpc_address: 207.46.31.61
+ rpc_address: 192.168.2.34
  }}}
  
  Or:
  
  {{{
- rpc_address: 65.55.39.12)
+ rpc_address: 0.0.0.0
  }}}
  
  Note that you should leave the Seeds section of the configuration as is so 
the new nodes know to use the first node for bootstrapping.  Once these changes 
are made, start cassandra on the new node and it will automatically join the 
ring, assign itself an initial token, and prepare itself to handle requests.


[jira] [Created] (CASSANDRA-2634) .NET driver for CQL

2011-05-11 Thread JIRA
.NET driver for CQL
---

 Key: CASSANDRA-2634
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2634
 Project: Cassandra
  Issue Type: Sub-task
Reporter: Michal Augustýn
Priority: Minor


The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
implement 
[IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
 interface and all related interfaces (i.e. 
[IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).

We must ensure that the connection is pooled.

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


[jira] [Updated] (CASSANDRA-2634) .NET driver for CQL

2011-05-11 Thread JIRA

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

Michal Augustýn updated CASSANDRA-2634:
---

Description: 
The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
implement 
[IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
 interface and all related interfaces (i.e. 
[IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).

We must ensure that the connection is pooled.

The implementation will be probably similar to CASSANDRA-1710.

  was:
The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
implement 
[IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
 interface and all related interfaces (i.e. 
[IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).

We must ensure that the connection is pooled.


 .NET driver for CQL
 ---

 Key: CASSANDRA-2634
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2634
 Project: Cassandra
  Issue Type: Sub-task
  Components: API
Reporter: Michal Augustýn
Priority: Minor
 Fix For: 0.8 beta 1


 The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
 implement 
 [IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
  interface and all related interfaces (i.e. 
 [IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).
 We must ensure that the connection is pooled.
 The implementation will be probably similar to CASSANDRA-1710.

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


[Cassandra Wiki] Update of Operations_JP by MakiWatanabe

2011-05-11 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Cassandra Wiki for 
change notification.

The Operations_JP page has been changed by MakiWatanabe.
The comment on this change is: Sync to EN#89.
http://wiki.apache.org/cassandra/Operations_JP?action=diffrev1=107rev2=108

--

  ## page was copied from Operations
+ 
  TableOfContents()
  
  == ハードウェア ==
@@ -10, +11 @@

  [[PerformanceTuning_JP|PerformanceTuning]]を参照して下さい。
  
  == スキーマ管理 ==
+ ノードのクロックをntpなどで同期して下さい。クロックが同期していない場合、更新時刻のずれによってスキーマ変更が無効と見なされる可能性があります。
  [[LiveSchemaUpdates_JP|LiveSchemaUpdates]]を参照して下さい。[0.7で導入された機能]
  
  == リング管理 ==
@@ -28, +30 @@

  クラスタ上で一度データが配置されたら、データの削除・再起動なしにパーティショナを変更することはできません。
  
  === レプリケーション ===
- 
カサンドラクラスタのキー空間は上述したトークンによって複数の区間に分割されますが、追加のレプリカの配置は設定ファイルのIReplicaPlacementStrategyによってカスタマイズできます。標準のストラテジは次の通りです。(レプリケーションファクタをNとします)
+ 
カサンドラクラスタのキー空間は上述したトークンによって複数の区間に分割されますが、追加のレプリカの配置は設定ファイルのIReplicaPlacementStrategyによってカスタマイズできます。標準のストラテジは次の通りです。(レプリケーションファクターをNとします)
  
  * !RackUnawareStrategy: レプリカはトークンを昇順で並べた場合の「次のN-1個のノード」に配置されます。
  
@@ -38, +40 @@

  
  * 
これらの議論の帰結として、次のことが言えます。複数のデータセンターを同時に構築しない場合、即ち最初に一つ目のデータセンターを構築し、後で二つ目を追加する場合、二つ目のデータセンターでは徐々にノードを追加していくのではなく、一つ目のデータセンターと同数のノードを一度に設置すべきです。
  
- レプリケーションファクタを稼働中のグラスタで変更することは想定していません。しかし以下のいずれかの方法によりレプリケーションファクタを増やすことができます。
+ 
稼働中のクラスターでレプリケーションファクターを変更することは想定されていませんが、コンセプト的には単純です。CLIからreplication_factorを更新(後述)した後、新しいレプリカ定義に基づいてそれぞれのノードに適切なデータを格納させるために、クラスターの各ノードに対してrepairを実行してください。
  
-  a. ConsistencyLevel.QUORUM または ALL で read 
することにより(どちらを使うかは既存のレプリケーションファクタに依ります)、実データを保持しているノードからデータを複製する
-  a. ダウンタイムを許容できるならanti-entropyを実行する(下記参照)
-  a. もしくはリペアが完了するまで、新たなレプリケーション先への read に対してクライアントに「no data exists」が返る可能性を許容する
- 
+ Repairが完了するまで、3つの選択肢があります。
+  * レプリカ間でデータが整合していることを保証するため、ConsistencyLevel=QUORUMまたはALLでReadを行う
+  * 
より低いConsitencyLevelでReadする代わり、いくつかのリクエストが失敗することを許容する。(ReadRepairが設定されている場合、通常は最初のクエリだけが失敗するはずです)
+  * Repairが完了するまで、サービスのダウンタイムを設ける
  
  レプリケーションストラテジを変更する場合も同じ選択肢が適用されます。
  
- レプリケーションファクタを減らすのは簡単です。レプリケーションファクタを減らした後、余分なレプリカデータを削除するためにcleanupを実行して下さい。
+ レプリケーションファクターを減らすのは簡単です。レプリケーションファクターを減らした後、余分なレプリカデータを削除するためにcleanupを実行して下さい。
+ 
+ 
稼働中のクラスターのレプリケーションファクターを更新するには、cassandra.yamlのことは忘れて下さい。代わりに、'''cassandra-cli'''
 を使用して以下のコマンドを実行して下さい。
+   update keyspace Keyspace1 with replication_factor = 3;
  
  === ネットワークトポロジー ===
  
レプリケーションストラテジーによってデータセンター間のレプリカ配置を制御できますが、これに加えてデータセンター内でどのノードが同じラックに設置されているかをCassandraに認識させることができます。Cassandraはreadやトークン範囲変更のためのデータの移動の際にこの情報を使用して最も近いレプリカを使用します。近接ノード検出の挙動は設定ファイルで差し替え可能な!EndpointSnitchクラスで変更可能です。
@@ -100, +105 @@

for x in xrange(nodes): 
print 2 ** 127 / nodes * x
  
- `nodetool 
loadbalance`は指定ノードに対してトークン選択の項で説明した自動トークン選択ルールに基づいて新たなトークンを決定し、decomissionとbootstrapを実行するコマンドです。このコマンドではリング全体の負荷均等化は行えません。
+ Cassandra 0.7.*以降では`nodetool loadbalance`コマンドが用意されています。これは基本的には decomission と 
bootstrap を組み合わせたような機能で、ターゲットのノードに移動先のトークン値を指定する代わりに、auto bootstrap 
と同様のヒューリスティックなアルゴリズムに基づいて新しいトークン値を自動的に選択します。ただし、このコマンドではリング全体の負荷均等化はできません。
  
- 移動やデータ格納量の均等化状況はnodetoolのnetstats引数(0.7以降)またはstreams 引数(Cassandra 0.6)で監視できます。
+ moveやloadbalance操作の進捗状況は`nodetool netstat`コマンドで確認できます。(Cassandra 0.6.* 以前では 
`streams` コマンドを使用します。)
+ 
  
  == 整合性 ==
  
Cassandraではreadやwriteにおいて必要な整合性レベルをクライアントが指定できます([[API]]参照)。R、W、Nがそれぞれ読み出したレプリカ数、書き込んだレプリカ数、レプリケーションファクターを示すとすると、R
 + W  N であればすべての read は最新の write を読むことができます。この条件を満たさない場合、タイミングによっては read 
は古いデータを返すかもしれません。これは結果整合性evantual consistencyと呼ばれています。


[jira] [Commented] (CASSANDRA-2634) .NET driver for CQL

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2634:
---

If you're looking at the jdbc driver for inspiration, note that the current 
code in drivers/java has evolved since the original patch. I'd advise starting 
with that instead of the old one.

 .NET driver for CQL
 ---

 Key: CASSANDRA-2634
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2634
 Project: Cassandra
  Issue Type: Sub-task
  Components: API
Reporter: Michal Augustýn
Priority: Minor
 Fix For: 0.8 beta 1


 The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
 implement 
 [IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
  interface and all related interfaces (i.e. 
 [IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).
 We must ensure that the connection is pooled.
 The implementation will be probably similar to CASSANDRA-1710.

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


svn commit: r1101893 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/commitlog/CommitLog.java

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 14:19:20 2011
New Revision: 1101893

URL: http://svn.apache.org/viewvc?rev=1101893view=rev
Log:
avoid attempting to replay mutationsfrom dropped keyspaces
patch by jbellis; reviewed by slebresne for CASSANDRA-2631

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

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/commitlog/CommitLog.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101893r1=1101892r2=1101893view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 14:19:20 2011
@@ -18,6 +18,7 @@
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
  * Allow removing LocationInfo sstables (CASSANDRA-2632)
+ * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
 
 
 0.7.5

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/commitlog/CommitLog.java?rev=1101893r1=1101892r2=1101893view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
 Wed May 11 14:19:20 2011
@@ -165,7 +165,7 @@ public class CommitLog
 
 public static void recover(File[] clogs) throws IOException
 {
-SetTable tablesRecovered = new HashSetTable();
+final SetTable tablesRecovered = new HashSetTable();
 ListFuture? futures = new ArrayListFuture?();
 byte[] bytes = new byte[4096];
 MapInteger, AtomicInteger invalidMutations = new HashMapInteger, 
AtomicInteger();
@@ -270,9 +270,7 @@ public class CommitLog
 rm.getTable(),
 
ByteBufferUtil.bytesToHex(rm.key()),
 { + 
StringUtils.join(rm.getColumnFamilies(), , ) + }));
-final Table table = Table.open(rm.getTable());
-tablesRecovered.add(table);
-final CollectionColumnFamily columnFamilies = new 
ArrayListColumnFamily(rm.getColumnFamilies());
+
 final long entryLocation = reader.getFilePointer();
 final CommitLogHeader finalHeader = clHeader;
 final RowMutation frm = rm;
@@ -280,12 +278,15 @@ public class CommitLog
 {
 public void runMayThrow() throws IOException
 {
+if 
(DatabaseDescriptor.getKSMetaData(frm.getTable()) == null)
+return;
+final Table table = Table.open(frm.getTable());
 RowMutation newRm = new 
RowMutation(frm.getTable(), frm.key());
 
 // Rebuild the row mutation, omitting column 
families that a) have already been flushed,
 // b) are part of a cf that was dropped. Keep in 
mind that the cf.name() is suspect. do every
 // thing based on the cfid instead.
-for (ColumnFamily columnFamily : columnFamilies)
+for (ColumnFamily columnFamily : 
frm.getColumnFamilies())
 {
 if (CFMetaData.getCF(columnFamily.id()) == 
null)
 // null means the cf has been dropped
@@ -297,6 +298,7 @@ public class CommitLog
 if (!newRm.isEmpty())
 {
 Table.open(newRm.getTable()).apply(newRm, 
null, false);
+tablesRecovered.add(table);
 }
 }
 };




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

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 14:21:38 2011
New Revision: 1101894

URL: http://svn.apache.org/viewvc?rev=1101894view=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/commitlog/CommitLog.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 14:21:38 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
+/cassandra/branches/cassandra-0.7:1026516-1101893
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1101894r1=1101893r2=1101894view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 14:21:38 2011
@@ -15,6 +15,10 @@
(CASSANDRA-2622)
  * Don't allow {LOCAL|EACH}_QUORUM unless strategy is NTS (CASSANDRA-2627)
  * validate keyspace strategy_options during CQL create (CASSANDRA-2624)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
+ * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
 
 
 0.8.0-beta2
@@ -42,9 +46,6 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
- * Fix regression where bootstrapping a node with no schema fails
-   (CASSANDRA-2625)
- * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.8.0-beta1

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 14:21:38 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-1100900,1101021,1101772,1101792
+/cassandra/branches/cassandra-0.7/contrib:1026516-1101893
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 14:21:38 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-1100900,1101021,1101772,1101792
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1101893
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 14:21:38 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

[jira] [Created] (CASSANDRA-2635) make cache skipping optional

2011-05-11 Thread Peter Schuller (JIRA)
make cache skipping optional


 Key: CASSANDRA-2635
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2635
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Peter Schuller
Priority: Minor


We've applied this patch locally in order to turn of page skipping; not 
completely but only for compaction/repair situations where it can be directly 
detrimental in the sense of causing data to become cold even though your entire 
data set fits in memory.

It's better than completely disabling DONTNEED because the cache skipping does 
make sense and has no relevant (that I can see) detrimental effects in some 
cases, like when dumping caches.

The patch is against 0.7.5 right now but if the change is desired I can make a 
patch for trunk. Also, the name of the configuration option is dubious since 
saying 'false' does not actually turn it off completely. I wasn't able to 
figure out a good name that conveyed the functionality in a short brief name 
however.

A related concern as discussed in CASSANDRA-1902 is that the cache skipping 
isn't fsync:ing and so won't work reliably on writes. If the feature is to be 
retained that's something to fix in a different ticket.

A question is also whether to retain the default to true or change it to false. 
I'm kinda leaning to false since it's detrimental in the easy cases of little 
data. In big cases with lots of data people will have to think and tweak 
anyway, so better to put the burden on that end.


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


svn commit: r1101895 - /cassandra/branches/cassandra-0.8/CHANGES.txt

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 14:23:21 2011
New Revision: 1101895

URL: http://svn.apache.org/viewvc?rev=1101895view=rev
Log:
update CHANGES

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

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1101895r1=1101894r2=1101895view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 14:23:21 2011
@@ -1,3 +1,10 @@
+0.8-?
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
+ * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
+
+
 0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
rebuffering in BRAF (CASSANDRA-2581)
@@ -15,10 +22,6 @@
(CASSANDRA-2622)
  * Don't allow {LOCAL|EACH}_QUORUM unless strategy is NTS (CASSANDRA-2627)
  * validate keyspace strategy_options during CQL create (CASSANDRA-2624)
- * Fix regression where bootstrapping a node with no schema fails
-   (CASSANDRA-2625)
- * Allow removing LocationInfo sstables (CASSANDRA-2632)
- * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
 
 
 0.8.0-beta2




[jira] [Updated] (CASSANDRA-2635) make cache skipping optional

2011-05-11 Thread Peter Schuller (JIRA)

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

Peter Schuller updated CASSANDRA-2635:
--

Attachment: CASSANDRA-2635-075.txt

 make cache skipping optional
 

 Key: CASSANDRA-2635
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2635
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Peter Schuller
Priority: Minor
 Attachments: CASSANDRA-2635-075.txt


 We've applied this patch locally in order to turn of page skipping; not 
 completely but only for compaction/repair situations where it can be directly 
 detrimental in the sense of causing data to become cold even though your 
 entire data set fits in memory.
 It's better than completely disabling DONTNEED because the cache skipping 
 does make sense and has no relevant (that I can see) detrimental effects in 
 some cases, like when dumping caches.
 The patch is against 0.7.5 right now but if the change is desired I can make 
 a patch for trunk. Also, the name of the configuration option is dubious 
 since saying 'false' does not actually turn it off completely. I wasn't able 
 to figure out a good name that conveyed the functionality in a short brief 
 name however.
 A related concern as discussed in CASSANDRA-1902 is that the cache skipping 
 isn't fsync:ing and so won't work reliably on writes. If the feature is to be 
 retained that's something to fix in a different ticket.
 A question is also whether to retain the default to true or change it to 
 false. I'm kinda leaning to false since it's detrimental in the easy cases 
 of little data. In big cases with lots of data people will have to think 
 and tweak anyway, so better to put the burden on that end.

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


[jira] [Updated] (CASSANDRA-2615) in cassandra-cli, the help command output on validation types should be updated

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2615:
--

Reviewer: cywjackson  (was: jbellis)

 in cassandra-cli, the help command output on validation types should be 
 updated 
 

 Key: CASSANDRA-2615
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2615
 Project: Cassandra
  Issue Type: Bug
Reporter: Jackson Chung
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8.0

 Attachments: CASSANDRA-2615.patch


 from cassandra-cli, say type help assume
 you will find:
   Supported values are:
 - AsciiType
 - BytesType
 - CounterColumnType (distributed counter column)
 - IntegerType (a generic variable-length integer type)
 - LexicalUUIDType
 - LongType
 - UTF8Type
 ok now:
 [default@cfs] assume inode comparator as UTF8Type;   
 Type 'UTF8Type' was not found. Available: bytes, integer, long, lexicaluuid, 
 timeuuid, utf8, ascii.
 so looks like the supported type list should be update by taking away the 
 Type post-fix..
 however, on the other hand, you can't really use it:
 [default@cfs] update column family inode; 
 Unable to find abstract-type class 'org.apache.cassandra.db.marshal.utf8'
 looks like from the update, you still need the Type (case insensitive?)

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


[jira] [Commented] (CASSANDRA-2631) Replaying a commitlog entry from a dropped keyspace will cause an error

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2631:
---

Integrated in Cassandra-0.7 #478 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/478/])
avoid attempting to replay mutationsfrom dropped keyspaces
patch by jbellis; reviewed by slebresne for CASSANDRA-2631


 Replaying a commitlog entry from a dropped keyspace will cause an error
 ---

 Key: CASSANDRA-2631
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2631
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
 Fix For: 0.7.6, 0.8.1

 Attachments: 2631-0.7.txt, 2631-0.8.txt




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


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2633:
---

So say we have a node A with rows A B C D on it.

We bootstrap a node C.

C requests (A, C] from A.

A will do a GT scan starting with A.  So a cache hit will result in [A, C] 
being transferred instead. That is a bug, I'll see if I can create a unit test 
that demonstrates that separately.

But I don't see how this affects the C row?


 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Richard Low (JIRA)

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

Richard Low commented on CASSANDRA-2633:


A cache hit results in [A, C) being returned.  All GT scans with cache hits 
give positions at the start of the row rather than the end.  The above patch 
fixes both ends - skip over A, but include C.

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[Cassandra Wiki] Update of FAQ by MakiWatanabe

2011-05-11 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Cassandra Wiki for 
change notification.

The FAQ page has been changed by MakiWatanabe.
The comment on this change is: Add jconsole_array_arg.
http://wiki.apache.org/cassandra/FAQ?action=diffrev1=119rev2=120

--

   * [[#bigcommitlog|Commit Log gets very big. Cassandra does not delete old 
commit logs. Why?]]
   * [[#seed|What are seeds?]]
   * [[#seed_spof|Does single seed mean single point of failure?]]
+  * [[#jconsole_array_arg|Why can't I call jmx method X on jconsole? (ex. 
getNaturalEndpoints)]]
  
  
  Anchor(cant_listen_on_ip_any)
@@ -460, +461 @@

  without the seed. However, it will need more time to spread status changes of 
node over the ring.
  It is recommended to have multiple seeds in production system.
  
+ Anchor(jconsole_array_arg)
+ 
+ == Why can't I call jmx method X on jconsole? (ex. getNaturalEndpoints) ==
+ 
+ Some of JMX operations can't be called with jconsole because the buttons are 
inactive for them. Jconsole doesn't support array argument, so operations which 
need array as arugument can't be invoked on jconsole.
+ You need to write a JMX client to call such operations or need array capable 
JMX monitoring tool.
+ 


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2633:
---

getPosition only affects start of scan, not end.

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Updated] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2633:


Attachment: 0001-2633-unit-test.patch

Good catch. Attaching a unit test to catch the bug.

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Created] (CASSANDRA-2636) Import/Export of Schema Migrations

2011-05-11 Thread David Boxenhorn (JIRA)
Import/Export of Schema Migrations
--

 Key: CASSANDRA-2636
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2636
 Project: Cassandra
  Issue Type: Improvement
Reporter: David Boxenhorn


My use case is like this: I have a development cluster, a staging cluster and a 
production cluster. When I finish a set of migrations on the development 
cluster, I want to apply them to the staging cluster, and eventually the 
production cluster. I don't want to do it by hand, because it's a painful and 
error-prone process. What I would like to do is export the last N migrations 
from the development cluster as a text file, with exactly the same format as 
the original text commands, and import them to the staging and production 
clusters. 

I think the best place to do this might be the CLI, since you would probably 
want to view your migrations before exporting them. Something like this:

show migrations N;   Shows the last N 
migrations.
export migrations N fileNameExports the last N migrations to file 
fileName.
import migrations fileNameImports migrations from 
fileName.

The import process would apply the migrations one at a time giving you feedback 
like, applying migration: update column family If a migration fails, the 
process should give an appropriate message and stop. 

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


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Richard Low (JIRA)

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

Richard Low commented on CASSANDRA-2633:


It looks to me that for client reads, getPosition is just used for the start of 
an iterator, as you say.  But for streaming, getPosition is used for the end 
position too in SSTableReader.getPositionsForRanges.  Or have I misunderstood 
what's going on?

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2633:
-

bq. But I don't see how this affects the C row?

This affects the C row because it will use the position of C found as the 
position where to stop scanning. But the position of C is the start of C, so 
when used as an end position, it excludes it. That is, getPositionForRanges 
will return (start of A, start of C), which results in scanning [A, C) as 
Richard says.

So +1 on this.

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Created] (CASSANDRA-2637) bloom filter true positives not counted unless key cache is enabled

2011-05-11 Thread Jonathan Ellis (JIRA)
bloom filter true positives not counted unless key cache is enabled
---

 Key: CASSANDRA-2637
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2637
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.6




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


[jira] [Updated] (CASSANDRA-2637) bloom filter true positives not counted unless key cache is enabled

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2637:
--

Attachment: 2637.txt

 bloom filter true positives not counted unless key cache is enabled
 ---

 Key: CASSANDRA-2637
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2637
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.6

 Attachments: 2637.txt




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


[jira] [Commented] (CASSANDRA-2637) bloom filter true positives not counted unless key cache is enabled

2011-05-11 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2637:
-

+1

 bloom filter true positives not counted unless key cache is enabled
 ---

 Key: CASSANDRA-2637
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2637
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.6

 Attachments: 2637.txt




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


[jira] [Commented] (CASSANDRA-2634) .NET driver for CQL

2011-05-11 Thread JIRA

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

Michal Augustýn commented on CASSANDRA-2634:


Ok, thank you for the information.

 .NET driver for CQL
 ---

 Key: CASSANDRA-2634
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2634
 Project: Cassandra
  Issue Type: Sub-task
  Components: API
Reporter: Michal Augustýn
Priority: Minor
 Fix For: 0.8 beta 1


 The goal is to create ADO.NET driver for Cassandra, using CQL. So we have to 
 implement 
 [IDbConnection|http://msdn.microsoft.com/en-us/library/system.data.idbconnection.aspx]
  interface and all related interfaces (i.e. 
 [IDbCommand|http://msdn.microsoft.com/en-us/library/system.data.idbcommand.aspx]).
 We must ensure that the connection is pooled.
 The implementation will be probably similar to CASSANDRA-1710.

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


svn commit: r1101933 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableReader.java test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 16:03:12 2011
New Revision: 1101933

URL: http://svn.apache.org/viewvc?rev=1101933view=rev
Log:
avoid using cached position of a keywhen GTis requested
patch by Richard Low and slebresne; reviewed by jbellis for CASSANDRA-2633

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

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

cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101933r1=1101932r2=1101933view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 16:03:12 2011
@@ -19,6 +19,7 @@
(CASSANDRA-2625)
  * Allow removing LocationInfo sstables (CASSANDRA-2632)
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
+ * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
 
 
 0.7.5

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1101933r1=1101932r2=1101933view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 Wed May 11 16:03:12 2011
@@ -451,10 +451,13 @@ public class SSTableReader extends SSTab
 }
 
 // next, the key cache
-PairDescriptor, DecoratedKey unifiedKey = new PairDescriptor, 
DecoratedKey(descriptor, decoratedKey);
-Long cachedPosition = getCachedPosition(unifiedKey);
-if (cachedPosition != null)
-return cachedPosition;
+if (op == Operator.EQ || op == Operator.GE)
+{
+PairDescriptor, DecoratedKey unifiedKey = new PairDescriptor, 
DecoratedKey(descriptor, decoratedKey);
+Long cachedPosition = getCachedPosition(unifiedKey);
+if (cachedPosition != null)
+return cachedPosition;
+}
 
 // next, see if the sampled index says it's impossible for the key to 
be present
 IndexSummary.KeyPosition sampledPosition = 
getIndexScanPosition(decoratedKey);

Modified: 
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java?rev=1101933r1=1101932r2=1101933view=diff
==
--- 
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
 Wed May 11 16:03:12 2011
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.ExecutionException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
@@ -148,4 +149,48 @@ public class SSTableReaderTest extends C
 store.forceBlockingFlush();
 assert store.getMaxRowSize() != 0;
 }
+
+@Test
+public void testGetPositionsForRangesWithKeyCache() throws IOException, 
ExecutionException, InterruptedException
+{
+Table table = Table.open(Keyspace1);
+ColumnFamilyStore store = table.getColumnFamilyStore(Standard2);
+store.getKeyCache().setCapacity(100);
+
+// insert data and compact to a single sstable
+CompactionManager.instance.disableAutoCompaction();
+for (int j = 0; j  10; j++)
+{
+ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j));
+RowMutation rm = new RowMutation(Keyspace1, key);
+rm.add(new QueryPath(Standard2, null, 
ByteBufferUtil.bytes(0)), ByteBufferUtil.EMPTY_BYTE_BUFFER, j);
+rm.apply();
+}
+store.forceBlockingFlush();
+CompactionManager.instance.performMajor(store);
+
+SSTableReader sstable = store.getSSTables().iterator().next();
+long p2 = sstable.getPosition(k(2), SSTableReader.Operator.EQ);
+long p3 = sstable.getPosition(k(3), SSTableReader.Operator.EQ);
+long p6 = sstable.getPosition(k(6), SSTableReader.Operator.EQ);
+long p7 = sstable.getPosition(k(7), SSTableReader.Operator.EQ);
+
+PairLong, Long p = sstable.getPositionsForRanges(makeRanges(t(2), 
t(6))).iterator().next();
+
+// range are start exclusive so we 

[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2633:
---

got it.  committed, thanks!

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.5
Reporter: Richard Low
Priority: Critical
 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


svn commit: r1101940 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableReader.java

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 16:07:13 2011
New Revision: 1101940

URL: http://svn.apache.org/viewvc?rev=1101940view=rev
Log:
fix counting bloom filter true positives
patch by jbellis; reviewed by slebresne for CASSANDRA-2637

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

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

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101940r1=1101939r2=1101940view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 16:07:13 2011
@@ -20,6 +20,7 @@
  * Allow removing LocationInfo sstables (CASSANDRA-2632)
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
  * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
+ * fix counting bloom filter true positives (CASSANDRA-2637)
 
 
 0.7.5

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1101940r1=1101939r2=1101940view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 Wed May 11 16:07:13 2011
@@ -488,12 +488,12 @@ public class SSTableReader extends SSTab
 {
 if (comparison == 0  keyCache != null  
keyCache.getCapacity()  0)
 {
-if (op == Operator.EQ)
-bloomFilterTracker.addTruePositive();
 // store exact match for the key
 if (decoratedKey.key != null)
 cacheKey(decoratedKey, dataPosition);
 }
+if (op == Operator.EQ)
+bloomFilterTracker.addTruePositive();
 return dataPosition;
 }
 if (v  0)




[jira] [Resolved] (CASSANDRA-2637) bloom filter true positives not counted unless key cache is enabled

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-2637.
---

   Resolution: Fixed
Fix Version/s: 0.8.1
 Reviewer: slebresne

 bloom filter true positives not counted unless key cache is enabled
 ---

 Key: CASSANDRA-2637
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2637
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.6, 0.8.1

 Attachments: 2637.txt




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


[jira] [Updated] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2633:
--

 Reviewer: slebresne
Affects Version/s: (was: 0.7.5)
Fix Version/s: 0.8.1
   0.7.6
 Assignee: Richard Low

 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Richard Low
Assignee: Richard Low
Priority: Critical
 Fix For: 0.7.6, 0.8.1

 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


svn commit: r1101941 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/io/sstable/ test/unit/org/apache/cassandra

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 16:09:37 2011
New Revision: 1101941

URL: http://svn.apache.org/viewvc?rev=1101941view=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/io/sstable/SSTableReader.java

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 16:09:37 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1101893
+/cassandra/branches/cassandra-0.7:1026516-1101940
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1101941r1=1101940r2=1101941view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 16:09:37 2011
@@ -3,6 +3,8 @@
(CASSANDRA-2625)
  * Allow removing LocationInfo sstables (CASSANDRA-2632)
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
+ * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
+ * fix counting bloom filter true positives (CASSANDRA-2637)
 
 
 0.8.0-rc1

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 16:09:37 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-1101893
+/cassandra/branches/cassandra-0.7/contrib:1026516-1101940
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 16:09:37 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-1101893
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1101940
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 16:09:37 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-1101893
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1101940
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 

svn commit: r1101946 - in /cassandra/branches/cassandra-0.8.1: ./ contrib/ debian/ drivers/java/src/org/apache/cassandra/cql/jdbc/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/a

2011-05-11 Thread jbellis
Author: jbellis
Date: Wed May 11 16:15:43 2011
New Revision: 1101946

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

Modified:
cassandra/branches/cassandra-0.8.1/   (props changed)
cassandra/branches/cassandra-0.8.1/CHANGES.txt
cassandra/branches/cassandra-0.8.1/build.xml
cassandra/branches/cassandra-0.8.1/contrib/   (props changed)
cassandra/branches/cassandra-0.8.1/debian/cassandra.install
cassandra/branches/cassandra-0.8.1/debian/changelog

cassandra/branches/cassandra-0.8.1/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java

cassandra/branches/cassandra-0.8.1/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java

cassandra/branches/cassandra-0.8.1/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java

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

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

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

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

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

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/db/commitlog/CommitLog.java

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/db/commitlog/ReplayPosition.java

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/db/marshal/AbstractUUIDType.java

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

cassandra/branches/cassandra-0.8.1/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java

Propchange: cassandra/branches/cassandra-0.8.1/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 16:15:43 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
+/cassandra/branches/cassandra-0.7:1026516-1101940
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8:1090935-1101945
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350

Modified: cassandra/branches/cassandra-0.8.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.1/CHANGES.txt?rev=1101946r1=1101945r2=1101946view=diff
==
--- cassandra/branches/cassandra-0.8.1/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.1/CHANGES.txt Wed May 11 16:15:43 2011
@@ -1,6 +1,3 @@
-1.0-dev
-
-
 0.8.1
  * add support for insert, delete in cql BATCH (CASSANDRA-2537)
  * add support for IN to cql SELECT, UPDATE (CASSANDRA-2553)
@@ -14,13 +11,22 @@
 
 
 0.8.0-?
+===
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
+ * Allow removing LocationInfo sstables (CASSANDRA-2632)
+ * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
+ * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
+ * fix counting bloom filter true positives (CASSANDRA-2637)
+
+
+0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
rebuffering in BRAF (CASSANDRA-2581)
- * fix merkle tree splitting exiting early (CASSANDRA-2605)
- * Disable compaction throttling during bootstrap (CASSANDRA-2612) 
  * fix returning null column values in the python cql driver (CASSANDRA-2593)
+ * fix merkle tree splitting exiting early (CASSANDRA-2605)
  * snapshot_before_compaction directory name fix (CASSANDRA-2598)
- 
+ * Disable compaction throttling during bootstrap (CASSANDRA-2612) 
  * fix CQL treatment of  and  operators in range slices (CASSANDRA-2592)
  * fix potential double-application of counter updates on commitlog replay
(CASSANDRA-2419)
@@ -58,9 +64,6 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
- * Fix regression where bootstrapping a node with no schema fails
-   (CASSANDRA-2625)
- * Allow removing LocationInfo sstables (CASSANDRA-2632)
 
 
 0.8.0-beta1

Modified: cassandra/branches/cassandra-0.8.1/build.xml
URL: 

[jira] [Commented] (CASSANDRA-2124) JDBC driver for CQL

2011-05-11 Thread Tony Bringardner (JIRA)

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

Tony Bringardner commented on CASSANDRA-2124:
-

I did not see this issue earlier (my bad) and I have been working on a JDBC 
driver using Cassandra 0.7.4.  It originally used Hector to access Cassandra 
but now uses Cassandra.client. 

It’s not complete by any means but it is fairly functional.  It has support for 
an expanded set of types using a column family to store type info.  It also 
supports Metadata (Database and ResultSet) .

My objective was to introduce Cassandra into our datacenter but have developers 
write code using standard Spring JDBC template.  

Is there any interest?


 JDBC driver for CQL
 ---

 Key: CASSANDRA-2124
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2124
 Project: Cassandra
  Issue Type: New Feature
  Components: API
Reporter: Eric Evans
Assignee: Vivek Mishra
Priority: Minor
  Labels: cql
 Fix For: 0.8 beta 1

 Attachments: Cassandra-2124_v1.0, Cassandra_2124_decoder.patch, 
 cassandra-0.7.1-2124_v2.0, cassandra-0.7.1-2124_v2.1, 
 cassandra_generic_decoder.patch, cassandra_generic_decoder_v1.1.patch, 
 v3-0001-first-pass-at-column-decoding.txt, 
 v3-0002-clean-up-JdbcDriverTest.txt, 
 v3-0003-implements-getXXX-methods-to-return-values-of-the-corr.txt, 
 v3-0004-more-comments-in-ColumnDecoder.txt, 
 v3-0005-move-all-java-cql-into-jdbc-package-and-only-expose-.patch


 A simple connection class and corresponding pool was created for CQL as a 
 part of CASSANDRA-1710, but a JDBC driver (either in addition to, or as a 
 replacement for) would also be interesting.

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


[jira] [Created] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Gary Dusbabek (JIRA)
Migrations announce on startup attempts to set local gossip state before 
gossiper is started.
-

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0 beta 2, 0.7.5
Reporter: Gary Dusbabek


AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
gossiper is initialized (via SS.initServer()).

MM.applyMigrations tries to set the local gossip state before it is initialized 
via G.start().

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


[jira] [Assigned] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Gary Dusbabek (JIRA)

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

Gary Dusbabek reassigned CASSANDRA-2638:


Assignee: Gary Dusbabek

 Migrations announce on startup attempts to set local gossip state before 
 gossiper is started.
 -

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Gary Dusbabek
Assignee: Gary Dusbabek

 AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
 gossiper is initialized (via SS.initServer()).
 MM.applyMigrations tries to set the local gossip state before it is 
 initialized via G.start().

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


[jira] [Commented] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Gary Dusbabek (JIRA)

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

Gary Dusbabek commented on CASSANDRA-2638:
--

java.lang.NullPointerException
at 
org.apache.cassandra.gms.Gossiper.addLocalApplicationState(Gossiper.java:883)
at 
org.apache.cassandra.service.MigrationManager.passiveAnnounce(MigrationManager.java:125)
at 
org.apache.cassandra.service.MigrationManager.applyMigrations(MigrationManager.java:183)
at 
org.apache.cassandra.service.AbstractCassandraDaemon.setup(AbstractCassandraDaemon.java:182)
at 
org.apache.cassandra.service.AbstractCassandraDaemon.activate(AbstractCassandraDaemon.java:313)
at 
org.apache.cassandra.thrift.CassandraDaemon.main(CassandraDaemon.java:80)

 Migrations announce on startup attempts to set local gossip state before 
 gossiper is started.
 -

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Gary Dusbabek
Assignee: Gary Dusbabek

 AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
 gossiper is initialized (via SS.initServer()).
 MM.applyMigrations tries to set the local gossip state before it is 
 initialized via G.start().

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


[jira] [Updated] (CASSANDRA-2639) Make cassandra.yaml seed requirements a small bit clearer

2011-05-11 Thread Joaquin Casares (JIRA)

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

Joaquin Casares updated CASSANDRA-2639:
---

Attachment: 2639.diff

Same as description.

 Make cassandra.yaml seed requirements a small bit clearer
 -

 Key: CASSANDRA-2639
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2639
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8 beta 1
Reporter: Joaquin Casares
Assignee: Joaquin Casares
Priority: Trivial
 Fix For: 0.8.0

 Attachments: 2639.diff


 Just added an example line. Won't make a difference to most, but it cuts down 
 on time for some.
 I've already had 4 conversations about this with other people.

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


[jira] [Updated] (CASSANDRA-2639) Make cassandra.yaml seed requirements a small bit clearer

2011-05-11 Thread Joaquin Casares (JIRA)

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

Joaquin Casares updated CASSANDRA-2639:
---

Attachment: 2639-v2.diff

No spaces between ips

 Make cassandra.yaml seed requirements a small bit clearer
 -

 Key: CASSANDRA-2639
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2639
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8 beta 1
Reporter: Joaquin Casares
Assignee: Joaquin Casares
Priority: Trivial
 Fix For: 0.8.0

 Attachments: 2639-v2.diff, 2639.diff


 Just added an example line. Won't make a difference to most, but it cuts down 
 on time for some.
 I've already had 4 conversations about this with other people.

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


[jira] [Updated] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Gary Dusbabek (JIRA)

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

Gary Dusbabek updated CASSANDRA-2638:
-

Attachment: v1-0001-init-ep-state-when-prior-to-gossiper-start.txt

 Migrations announce on startup attempts to set local gossip state before 
 gossiper is started.
 -

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Gary Dusbabek
Assignee: Gary Dusbabek
 Attachments: v1-0001-init-ep-state-when-prior-to-gossiper-start.txt


 AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
 gossiper is initialized (via SS.initServer()).
 MM.applyMigrations tries to set the local gossip state before it is 
 initialized via G.start().

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


[jira] [Commented] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-2638:
-

+1

 Migrations announce on startup attempts to set local gossip state before 
 gossiper is started.
 -

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Gary Dusbabek
Assignee: Gary Dusbabek
 Attachments: v1-0001-init-ep-state-when-prior-to-gossiper-start.txt


 AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
 gossiper is initialized (via SS.initServer()).
 MM.applyMigrations tries to set the local gossip state before it is 
 initialized via G.start().

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


[jira] [Updated] (CASSANDRA-2526) Add ant support to generate CQL documentation from textile source

2011-05-11 Thread Nate McCall (JIRA)

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

Nate McCall updated CASSANDRA-2526:
---

Attachment: 2526.txt

Attaching patch intended to work with: 
http://github.com/riptano/wikitext-core-ant

This patch will not work unless the above is installed locally. However, this 
project has been submitted for inclusion to maven central and should be 
available thusly in the next few days at which time the package retrieval will 
work.

 Add ant support to generate CQL documentation from textile source
 -

 Key: CASSANDRA-2526
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2526
 Project: Cassandra
  Issue Type: Task
Affects Versions: 0.8 beta 1
Reporter: Jonathan Ellis
Assignee: Nate McCall
Priority: Minor
 Fix For: 0.8.1

 Attachments: 2526.txt


 possibly useful links: 
 - 
 http://help.eclipse.org/helios/topic/org.eclipse.mylyn.wikitext.help.ui/help/Markup-Conversion.html#ConversionusingAntbuildscripts
 - 
 http://www.mvnbrowser.com/artifact-details.html?groupId=org.eclipse.mylyn.wikitextartifactId=wikitext

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


[jira] [Created] (CASSANDRA-2640) `ant clean build test` is broken

2011-05-11 Thread Gary Dusbabek (JIRA)
`ant clean build test` is broken


 Key: CASSANDRA-2640
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2640
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.0 beta 2, 0.7.5
Reporter: Gary Dusbabek
Assignee: Stephen Connolly


`ant clean build` works.
`ant test` works.
`ant clean build test` is broken.

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


svn commit: r1102038 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

2011-05-11 Thread gdusbabek
Author: gdusbabek
Date: Wed May 11 19:23:22 2011
New Revision: 1102038

URL: http://svn.apache.org/viewvc?rev=1102038view=rev
Log:
initialize local ep state prior to gossip startup if needed. patch by 
gdusbabek, reviewed by brandonwilliams. CASSANDRA-2638

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

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1102038r1=1102037r2=1102038view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 19:23:22 2011
@@ -21,7 +21,8 @@
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
  * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
  * fix counting bloom filter true positives (CASSANDRA-2637)
-
+ * initialize local ep state prior to gossip startup if needed (CASSANDRA-2638)
+  
 
 0.7.5
  * improvements/fixes to PIG driver (CASSANDRA-1618, CASSANDRA-2387,

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1102038r1=1102037r2=1102038view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
 Wed May 11 19:23:22 2011
@@ -898,15 +898,8 @@ public class Gossiper implements IFailur
 }
 
 /* initialize the heartbeat state for this localEndpoint */
+maybeInitializeLocalState(generationNbr);
 EndpointState localState = endpointStateMap_.get(localEndpoint_);
-if ( localState == null )
-{
-HeartBeatState hbState = new HeartBeatState(generationNbr);
-localState = new EndpointState(hbState);
-localState.isAlive(true);
-localState.isAGossiper(true);
-endpointStateMap_.put(localEndpoint_, localState);
-}
 
 //notify snitches that Gossiper is about to start
 DatabaseDescriptor.getEndpointSnitch().gossiperStarting();
@@ -916,6 +909,21 @@ public class Gossiper implements IFailur
   
Gossiper.intervalInMillis_,
   
TimeUnit.MILLISECONDS);
 }
+
+// initialize local HB state if needed.
+public void maybeInitializeLocalState(int generationNbr) 
+{
+EndpointState localState = 
endpointStateMap_.get(FBUtilities.getLocalAddress());
+if ( localState == null )
+{
+HeartBeatState hbState = new HeartBeatState(generationNbr);
+localState = new EndpointState(hbState);
+localState.isAlive(true);
+localState.isAGossiper(true);
+endpointStateMap_.put(localEndpoint_, localState);
+}
+}
+
 
 /**
  * Add an endpoint we knew about previously, but whose state is unknown

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1102038r1=1102037r2=1102038view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 Wed May 11 19:23:22 2011
@@ -29,6 +29,7 @@ import java.util.concurrent.SynchronousQ
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.cassandra.gms.Gossiper;
 import org.apache.log4j.PropertyConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -181,6 +182,7 @@ public abstract class AbstractCassandraD
 UUID lastMigration = Migration.getLastMigrationId();
 if ((lastMigration != null)  (lastMigration.timestamp()  
currentMigration.timestamp()))
 {
+
Gossiper.instance.maybeInitializeLocalState(SystemTable.incrementAndGetGeneration());
 MigrationManager.applyMigrations(currentMigration, lastMigration);
 }
 




[jira] [Issue Comment Edited] (CASSANDRA-2526) Add ant support to generate CQL documentation from textile source

2011-05-11 Thread Nate McCall (JIRA)

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

Nate McCall edited comment on CASSANDRA-2526 at 5/11/11 7:29 PM:
-

Attaching patch intended to work with: 
http://github.com/riptano/wikitext-core-ant

This patch will not work unless the above is installed locally. However, this 
project has been submitted for inclusion to maven central and should be 
available thusly in the next few days at which time the package retrieval will 
work.

See: https://issues.sonatype.org/browse/OSSRH-1691 for tracking maven central 
inclusion efforts.

  was (Author: zznate):
Attaching patch intended to work with: 
http://github.com/riptano/wikitext-core-ant

This patch will not work unless the above is installed locally. However, this 
project has been submitted for inclusion to maven central and should be 
available thusly in the next few days at which time the package retrieval will 
work.
  
 Add ant support to generate CQL documentation from textile source
 -

 Key: CASSANDRA-2526
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2526
 Project: Cassandra
  Issue Type: Task
Affects Versions: 0.8 beta 1
Reporter: Jonathan Ellis
Assignee: Nate McCall
Priority: Minor
 Fix For: 0.8.1

 Attachments: 2526.txt


 possibly useful links: 
 - 
 http://help.eclipse.org/helios/topic/org.eclipse.mylyn.wikitext.help.ui/help/Markup-Conversion.html#ConversionusingAntbuildscripts
 - 
 http://www.mvnbrowser.com/artifact-details.html?groupId=org.eclipse.mylyn.wikitextartifactId=wikitext

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


svn commit: r1102050 - in /cassandra/branches/cassandra-0.8.1: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/gms/ src/java/org/apache/cassandra/servi

2011-05-11 Thread gdusbabek
Author: gdusbabek
Date: Wed May 11 19:43:26 2011
New Revision: 1102050

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

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

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

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

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

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

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

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/gms/Gossiper.java

cassandra/branches/cassandra-0.8.1/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

Propchange: cassandra/branches/cassandra-0.8.1/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 19:43:26 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1101940
+/cassandra/branches/cassandra-0.7:1026516-1102046
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090935-1101945
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-0.8.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8.1/CHANGES.txt?rev=1102050r1=1102049r2=1102050view=diff
==
--- cassandra/branches/cassandra-0.8.1/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8.1/CHANGES.txt Wed May 11 19:43:26 2011
@@ -11,13 +11,13 @@
 
 
 0.8.0-?
-===
  * Fix regression where bootstrapping a node with no schema fails
(CASSANDRA-2625)
  * Allow removing LocationInfo sstables (CASSANDRA-2632)
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
  * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
  * fix counting bloom filter true positives (CASSANDRA-2637)
+ * initialize local ep state prior to gossip startup if needed (CASSANDRA-2638)
 
 
 0.8.0-rc1
@@ -64,7 +64,7 @@
  * improve ignoring of obsolete mutations in index maintenance (CASSANDRA-2401)
  * recognize attempt to drop just the index while leaving the column
definition alone (CASSANDRA-2619)
-
+  
 
 0.8.0-beta1
  * remove Avro RPC support (CASSANDRA-926)

Propchange: cassandra/branches/cassandra-0.8.1/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 19:43:26 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-1101940
+/cassandra/branches/cassandra-0.7/contrib:1026516-1102046
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090935-1101945
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 19:43:26 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-1101940
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1102046
 
/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:1090935-1101945
 
/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.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 19:43:26 2011
@@ -1,5 +1,5 @@
 

[jira] [Commented] (CASSANDRA-2637) bloom filter true positives not counted unless key cache is enabled

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2637:
---

Integrated in Cassandra-0.7 #480 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/480/])


 bloom filter true positives not counted unless key cache is enabled
 ---

 Key: CASSANDRA-2637
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2637
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.6, 0.8.1

 Attachments: 2637.txt




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


[jira] [Commented] (CASSANDRA-2633) Keys get lost in bootstrap

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2633:
---

Integrated in Cassandra-0.7 #480 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/480/])


 Keys get lost in bootstrap
 --

 Key: CASSANDRA-2633
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2633
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Richard Low
Assignee: Richard Low
Priority: Critical
 Fix For: 0.7.6, 0.8.1

 Attachments: 0.7-2633.txt, 0001-2633-unit-test.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 When bootstrapping a new node, the key at the upper end of the new node's 
 range can get lost.  To reproduce:
 * Set up one cassandra node, create a keyspace and column family and perform 
 some inserts
 * Read every row back
 * Bootstrap a second node
 * Read every row back
 You find one row is missing, whose row key is exactly equal to the token the 
 new node gets (for OPP - for RP it's the key whose hash is equal to the 
 token).  If you don't do the reads after the inserts, the key is not lost.  I 
 tracked the problem down to o.a.c.io.sstable.SSTableReader in getPosition.  
 The problem is that the cached position is used if it is there (so only if 
 the reads were performed).  But this is incorrect because the cached position 
 is the start of the row, not the end.  This means the end row itself is not 
 transferred.  This causes the last key in the range to get lost.
 Although I haven't seen it, this may occur during antientropy repairs too.
 The attached patch (against the 0.7 branch) fixes it by not using the cache 
 for Operator.GT.  I haven't tested with 0.8 but from looking at the code I 
 think the problem is present.
 This might be related to CASSANDRA-1992

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


[jira] [Commented] (CASSANDRA-2638) Migrations announce on startup attempts to set local gossip state before gossiper is started.

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2638:
---

Integrated in Cassandra-0.7 #480 (See 
[https://builds.apache.org/hudson/job/Cassandra-0.7/480/])
initialize local ep state prior to gossip startup if needed. patch by 
gdusbabek, reviewed by brandonwilliams. CASSANDRA-2638


 Migrations announce on startup attempts to set local gossip state before 
 gossiper is started.
 -

 Key: CASSANDRA-2638
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2638
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.5, 0.8.0 beta 2
Reporter: Gary Dusbabek
Assignee: Gary Dusbabek
 Attachments: v1-0001-init-ep-state-when-prior-to-gossiper-start.txt


 AbstractCassandraDemon calls MigrationManager.applyMigrations() before the 
 gossiper is initialized (via SS.initServer()).
 MM.applyMigrations tries to set the local gossip state before it is 
 initialized via G.start().

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


svn commit: r1102055 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java

2011-05-11 Thread gdusbabek
Author: gdusbabek
Date: Wed May 11 19:56:40 2011
New Revision: 1102055

URL: http://svn.apache.org/viewvc?rev=1102055view=rev
Log:
initialize local ep state prior to gossip startup if needed. patch by 
gdusbabek, reviewed by brandonwilliams. CASSANDRA-2638

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

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

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

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1102055r1=1102054r2=1102055view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed May 11 19:56:40 2011
@@ -5,6 +5,7 @@
  * avoid attempting to replay mutations from dropped keyspaces (CASSANDRA-2631)
  * avoid using cached position of a key when GT is requested (CASSANDRA-2633)
  * fix counting bloom filter true positives (CASSANDRA-2637)
+ * initialize local ep state prior to gossip startup if needed (CASSANDRA-2638)
 
 
 0.8.0-rc1

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1102055r1=1102054r2=1102055view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/gms/Gossiper.java
 Wed May 11 19:56:40 2011
@@ -27,6 +27,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.*;
 
+import org.apache.cassandra.db.SystemTable;
 import org.apache.cassandra.net.MessageProducer;
 import org.apache.cassandra.utils.FBUtilities;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
@@ -838,15 +839,9 @@ public class Gossiper implements IFailur
 }
 
 /* initialize the heartbeat state for this localEndpoint */
+maybeInitializeLocalState(generationNbr);
 EndpointState localState = 
endpointStateMap.get(FBUtilities.getLocalAddress());
-if ( localState == null )
-{
-HeartBeatState hbState = new HeartBeatState(generationNbr);
-localState = new EndpointState(hbState);
-localState.markAlive();
-endpointStateMap.put(FBUtilities.getLocalAddress(), localState);
-}
-
+
 //notify snitches that Gossiper is about to start
 DatabaseDescriptor.getEndpointSnitch().gossiperStarting();
 if (logger.isTraceEnabled())
@@ -857,6 +852,19 @@ public class Gossiper implements IFailur
   
Gossiper.intervalInMillis,
   
TimeUnit.MILLISECONDS);
 }
+
+// initialize local HB state if needed.
+public void maybeInitializeLocalState(int generationNbr) 
+{
+EndpointState localState = 
endpointStateMap.get(FBUtilities.getLocalAddress());
+if ( localState == null )
+{
+HeartBeatState hbState = new HeartBeatState(generationNbr);
+localState = new EndpointState(hbState);
+localState.markAlive();
+endpointStateMap.put(FBUtilities.getLocalAddress(), localState);
+}
+}
 
 /**
  * Add an endpoint we knew about previously, but whose state is unknown

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1102055r1=1102054r2=1102055view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 Wed May 11 19:56:40 2011
@@ -29,6 +29,7 @@ import java.util.concurrent.SynchronousQ
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.cassandra.gms.Gossiper;
 import org.apache.log4j.PropertyConfigurator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -179,6 +180,7 @@ public abstract class AbstractCassandraD
 UUID lastMigration = Migration.getLastMigrationId();
 if ((lastMigration != null)  (lastMigration.timestamp()  
currentMigration.timestamp()))
 {
+
Gossiper.instance.maybeInitializeLocalState(SystemTable.incrementAndGetGeneration());
 MigrationManager.applyMigrations(currentMigration, 

svn commit: r1102059 - in /cassandra/trunk: ./ contrib/ debian/ drivers/java/src/org/apache/cassandra/cql/jdbc/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/

2011-05-11 Thread gdusbabek
Author: gdusbabek
Date: Wed May 11 20:08:38 2011
New Revision: 1102059

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

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/build.xml
cassandra/trunk/contrib/   (props changed)
cassandra/trunk/debian/cassandra.install
cassandra/trunk/debian/changelog

cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/AbstractResultSet.java

cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CResultSet.java

cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java

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/commitlog/ReplayPosition.java

cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractUUIDType.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 20:08:38 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 /cassandra/branches/cassandra-0.7:1026516-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8:1090935-1101773,1101794
 /cassandra/branches/cassandra-0.8.1:1101014-1101613,1101775,1101802
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1102059r1=1102058r2=1102059view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed May 11 20:08:38 2011
@@ -12,6 +12,10 @@
 
 
 0.8.0-?
+* initialize local ep state prior to gossip startup if needed (CASSANDRA-2638)
+
+
+0.8.0-rc1
  * faster flushes and compaction from fixing excessively pessimistic 
rebuffering in BRAF (CASSANDRA-2581)
  * fix merkle tree splitting exiting early (CASSANDRA-2605)

Modified: cassandra/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1102059r1=1102058r2=1102059view=diff
==
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Wed May 11 20:08:38 2011
@@ -25,7 +25,7 @@
 property name=debuglevel value=source,lines,vars/
 
 !-- default version and SCM information (we need the default SCM info as 
people may checkout with git-svn) --
-property name=base.version value=0.8.0-beta2/
+property name=base.version value=0.8.0-rc1/
 property name=scm.default.path 
value=cassandra/branches/cassandra-0.7/
 property name=scm.default.connection 
value=scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}/
 property name=scm.default.developerConnection 
value=scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}/
@@ -64,7 +64,7 @@
 property name=test.long.src value=${test.dir}/long/
 property name=test.distributed.src value=${test.dir}/distributed/
 property name=dist.dir value=${build.dir}/dist/
-property name=cql.driver.version value=1.0.1 /
+property name=cql.driver.version value=1.0.2 /
 condition property=version value=${base.version}
   isset property=release/
 /condition

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 11 20:08:38 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-1100900,1101021,1101772,1101792
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1101597,1101773,1101794
+/cassandra/branches/cassandra-0.8/contrib:1090935-1101773,1101794
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1101613,1101775,1101802
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Modified: cassandra/trunk/debian/cassandra.install
URL: 

buildbot success in ASF Buildbot on cassandra-trunk

2011-05-11 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/1313

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

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1102059
Blamelist: gdusbabek

Build succeeded!

sincerely,
 -The Buildbot



[jira] [Updated] (CASSANDRA-2129) removetoken after removetoken rf error fails to work

2011-05-11 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2129:
--

Fix Version/s: (was: 0.7.6)
   0.8.1

 removetoken after removetoken rf error fails to work
 

 Key: CASSANDRA-2129
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2129
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.0
Reporter: Mike Bulman
Assignee: Brandon Williams
Priority: Minor
 Fix For: 0.8.1

 Attachments: 2129.txt

   Original Estimate: 4h
  Remaining Estimate: 4h

 2 node cluster, a keyspace existed with rf=2.  Tried removetoken and got:
 mbulman@ripcord-maverick1:/usr/src/cassandra/tags/cassandra-0.7.0$ 
 bin/nodetool -h localhost removetoken 159559397954378837828954138596956659794
 Exception in thread main java.lang.IllegalStateException: replication 
 factor (2) exceeds number of endpoints (1)
 Deleted the keyspace, and tried again:
 mbulman@ripcord-maverick1:/usr/src/cassandra/tags/cassandra-0.7.0$ 
 bin/nodetool -h localhost removetoken 159559397954378837828954138596956659794
 Exception in thread main java.lang.UnsupportedOperationException: This node 
 is already processing a removal. Wait for it to complete.

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


[jira] [Commented] (CASSANDRA-2605) Merkle tree splitting can exit early

2011-05-11 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2605:
---

Integrated in Cassandra #892 (See 
[https://builds.apache.org/hudson/job/Cassandra/892/])


 Merkle tree splitting can exit early
 

 Key: CASSANDRA-2605
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2605
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8 beta 1
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.8.0

 Attachments: 0001-Avoid-stopping-merkle-tree-splitting-too-soon.patch

   Original Estimate: 2h
  Remaining Estimate: 2h

 There was a small bug introduced by CASSANDRA-2324 that, depending on the key 
 sample token, can make the merkle tree splitting process exit early, 
 potentially resulting in a unnecessary imprecise tree.

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


[jira] [Commented] (CASSANDRA-2639) Make cassandra.yaml seed requirements a small bit clearer

2011-05-11 Thread Stu Hood (JIRA)

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

Stu Hood commented on CASSANDRA-2639:
-

+1

 Make cassandra.yaml seed requirements a small bit clearer
 -

 Key: CASSANDRA-2639
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2639
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8 beta 1
Reporter: Joaquin Casares
Assignee: Joaquin Casares
Priority: Trivial
 Fix For: 0.8.0

 Attachments: 2639-v2.diff, 2639.diff


 Just added an example line. Won't make a difference to most, but it cuts down 
 on time for some.
 I've already had 4 conversations about this with other people.

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: 0001-move-compaction-code-into-own-package.patch

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: 0002-Pluggable-Compaction-and-Expiration.patch

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Stu Hood (JIRA)

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

Stu Hood updated CASSANDRA-1610:


Reviewer: stuhood

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Commented] (CASSANDRA-2346) Windows: SSTableWriterTest Fails

2011-05-11 Thread Benjamin Coverston (JIRA)

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

Benjamin Coverston commented on CASSANDRA-2346:
---

Ran this with the patch and I'm still getting an failure for this test [1].

I'm also seeing a number of other failures in my tests, so I'm not sure if it's 
an environment issue or what. I'm going to tool around with it a bit more to 
see if it's java that's holding on to the file handles or something else.



https://issues.apache.org/jira/browse/CASSANDRA-2346



 Windows: SSTableWriterTest Fails
 

 Key: CASSANDRA-2346
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2346
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Affects Versions: 0.7.0
 Environment: Windows
Reporter: Benjamin Coverston
Assignee: Jonathan Ellis
Priority: Minor
  Labels: windows
 Fix For: 0.7.6

 Attachments: 2346.txt


 Fails with the following exception[1]
 Which looks like there's a stream keeping this file open somewhere.
 I looked for the culprit, but I was unable to identify it. Following it 
 through it appears that if the following two lines of code are executed from 
 IndexWriter.afterAppend:
 ByteBufferUtil.writeWithShortLength(key.key, indexFile);
 indexFile.writeLong(dataPosition);
 Then the indexFile gets touched and that generally triggers this situation. 
 One thing interesting here is that an index file without any rows will 
 trigger a divide by zero exception [2].
 I looked at this quite a bit without being able to make much progress.
 [1]
 java.io.IOException: Failed to delete 
 C:\Users\Ben\AppData\Local\Temp\Keyspace12505092819180437091Indexed1\Keyspace1\Indexed1-f-0-Index.db
   at 
 org.apache.cassandra.io.util.FileUtils.deleteWithConfirm(FileUtils.java:51)
   at 
 org.apache.cassandra.io.util.FileUtils.deleteWithConfirm(FileUtils.java:41)
   at 
 org.apache.cassandra.io.sstable.SSTableWriterTest.testRecoverAndOpen(SSTableWriterTest.java:79)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at 
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
   at 
 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
   at 
 org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
   at 
 org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
   at 
 org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
   at 
 org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
   at 
 org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
   at 
 org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
   at 
 org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
   at 
 org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:44)
   at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:180)
   at org.junit.runners.ParentRunner.access$000(ParentRunner.java:41)
   at org.junit.runners.ParentRunner$1.evaluate(ParentRunner.java:173)
   at 
 org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
   at 
 org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:31)
   at org.junit.runners.ParentRunner.run(ParentRunner.java:220)
   at org.junit.runner.JUnitCore.run(JUnitCore.java:159)
   at 
 com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:97)
   at 
 com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:196)
   at 
 com.intellij.rt.execution.junit.JUnitStarter.main(JUnitStarter.java:65)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
   at 
 sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
   at com.intellij.rt.execution.application.AppMain.main(AppMain.java:115)
 [2]
 ERROR 16:57:48,119 Error in ThreadPoolExecutor
 java.lang.ArithmeticException: / by zero
   at 
 org.apache.cassandra.io.sstable.SSTable.estimateRowsFromData(SSTable.java:218)
   at 
 org.apache.cassandra.io.sstable.SSTableWriter$Builder.build(SSTableWriter.java:291)
   at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:942)
   at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:935)
   at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
   at java.util.concurrent.FutureTask.run(FutureTask.java:138)
   at 
 

[jira] [Commented] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang commented on CASSANDRA-1610:
---

Some TODOs:
-add mockito dependency to test build only
-determine why DatabaseDescriptorTest#serDe() fails
-validation of compaction_strategy_options
-more tests for expiration of files

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: (was: 0002-Pluggable-Compaction-and-Expiration.patch)

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: (was: 0001-move-compaction-code-into-own-package.patch)

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: 0002-Pluggable-Compaction-and-Expiration.patch

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Updated] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang updated CASSANDRA-1610:
--

Attachment: 0001-move-compaction-code-into-own-package.patch

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


[jira] [Commented] (CASSANDRA-1610) Pluggable Compaction

2011-05-11 Thread Alan Liang (JIRA)

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

Alan Liang commented on CASSANDRA-1610:
---

Updated patch files.

 Pluggable Compaction
 

 Key: CASSANDRA-1610
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1610
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Chris Goffinet
Assignee: Alan Liang
Priority: Minor
  Labels: compaction
 Fix For: 1.0

 Attachments: 0001-move-compaction-code-into-own-package.patch, 
 0002-Pluggable-Compaction-and-Expiration.patch


 In CASSANDRA-1608, I proposed some changes on how compaction works. I think 
 it also makes sense to allow the ability to have pluggable compaction per CF. 
 There could be many types of workloads where this makes sense. One example we 
 had at Digg was to completely throw away certain SSTables after N days. 

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


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

2011-05-11 Thread Stu Hood (JIRA)
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: 1.0


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