svn commit: r1094481 - in /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra: db/ColumnFamilyStore.java io/PrecompactedRow.java io/sstable/SSTableWriter.java streaming/OperationType.java

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 10:46:26 2011
New Revision: 1094481

URL: http://svn.apache.org/viewvc?rev=1094481view=rev
Log:
Update row cache post streaming
patch by slebresne; reviewed by jbellis for CASSANDRA-2420

Modified:

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

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

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

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

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1094481r1=1094480r2=1094481view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Mon Apr 18 10:46:26 2011
@@ -735,6 +735,20 @@ public class ColumnFamilyStore implement
 submitFlush(binaryMemtable.get(), new CountDownLatch(1));
 }
 
+public void updateRowCache(DecoratedKey key, ColumnFamily columnFamily)
+{
+if (rowCache.isPutCopying())
+{
+invalidateCachedRow(key);
+}
+else
+{
+ColumnFamily cachedRow = getRawCachedRow(key);
+if (cachedRow != null)
+cachedRow.addAll(columnFamily);
+}
+}
+
 /**
  * Insert/Update the column family for this key.
  * Caller is responsible for acquiring Table.flusherLock!
@@ -749,17 +763,8 @@ public class ColumnFamilyStore implement
 Memtable mt = getMemtableThreadSafe();
 boolean flushRequested = mt.isThresholdViolated();
 mt.put(key, columnFamily);
-if (rowCache.isPutCopying())
-{
-invalidateCachedRow(key);
-}
-else
-{
-ColumnFamily cachedRow = getRawCachedRow(key);
-if (cachedRow != null)
-cachedRow.addAll(columnFamily);
-writeStats.addNano(System.nanoTime() - start);
-}
+updateRowCache(key, columnFamily);
+writeStats.addNano(System.nanoTime() - start);
 
 if (DatabaseDescriptor.estimatesRealMemtableSize())
 {

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java?rev=1094481r1=1094480r2=1094481view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java
 Mon Apr 18 10:46:26 2011
@@ -131,4 +131,15 @@ public class PrecompactedRow extends Abs
 {
 return compactedCf == null ? 0 : compactedCf.getColumnCount();
 }
+
+/**
+ * @return the full column family represented by this compacted row.
+ *
+ * We do not provide this method for other AbstractCompactedRow, because 
this fits the whole row into
+ * memory and don't make sense for those other implementations.
+ */
+public ColumnFamily getFullColumnFamily()  throws IOException
+{
+return compactedCf;
+}
 }

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1094481r1=1094480r2=1094481view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 Mon Apr 18 10:46:26 2011
@@ -285,9 +285,9 @@ public class SSTableWriter extends SSTab
 try
 {
 if (cfs.metadata.getDefaultValidator().isCommutative())
-indexer = new CommutativeRowIndexer(desc, cfs.metadata);
+indexer = new CommutativeRowIndexer(desc, cfs, type);
 else
-indexer = new RowIndexer(desc, cfs.metadata);
+indexer = new RowIndexer(desc, cfs, type);
 }
 catch (IOException e)
 {
@@ -320,20 +320,22 @@ public class SSTableWriter extends SSTab
 {
 protected final Descriptor desc;
 public final BufferedRandomAccessFile dfile;
+private final OperationType type;
 
 protected 

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

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 10:59:39 2011
New Revision: 1094484

URL: http://svn.apache.org/viewvc?rev=1094484view=rev
Log:
Merge CASSANDRA-2420 from 0.8

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/contrib/   (props changed)

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

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

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

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

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/OperationType.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:59:39 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
 /cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1094085
+/cassandra/branches/cassandra-0.8:1090935-1094085,1094481
 /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

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:59:39 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-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094481
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1094085
+/cassandra/branches/cassandra-0.8/contrib:1090935-1094085,1094481
 /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 Mon Apr 18 10:59:39 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-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1094481
 
/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-1094085
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1094085,1094481
 
/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: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 10:59:39 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094481
 

[jira] [Commented] (CASSANDRA-2491) A new config parameter, broadcast_address

2011-04-18 Thread superfc (JIRA)

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

superfc commented on CASSANDRA-2491:


I think a lot of people are interested in having this feature. If you could 
apply this patch to the cassandra trunk that would be great!

 A new config parameter, broadcast_address
 -

 Key: CASSANDRA-2491
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2491
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: x86_64 GNU/Linux
Reporter: Khee Chin
Priority: Trivial
  Labels: patch
 Attachments: 2491_broadcast_address.patch

   Original Estimate: 336h
  Remaining Estimate: 336h

 A new config parameter, broadcast_address
 In a cluster setup where one or more nodes is behind a firewall and has a 
 private ip address, listen_address does not allow the hosts behind the 
 firewalls to be discovered by other nodes.
 Attached is a patch that introduces a new config parameter broadcast_address 
 which allows Cassandra nodes to explicitly specify their external ip address. 
 In addition, this allows listen_address to be set to 0.0.0.0 on the already 
 firewalled node.
 broadcast_address fallsback to listen_address when it is not stated.

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


[jira] [Updated] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2405:
---

Attachment: CASSANDRA-2405.patch

Should we also share this using nodetool?

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


buildbot failure in ASF Buildbot on cassandra-trunk

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

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

Buildslave for this Build: isis_ubuntu

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

BUILD FAILED: failed compile

sincerely,
 -The Buildbot



[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2420:
---

Integrated in Cassandra #854 (See 
[https://hudson.apache.org/hudson/job/Cassandra/854/])
Merge CASSANDRA-2420 from 0.8


 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2420:
---

Integrated in Cassandra-0.8 #13 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.8/13/])
Update row cache post streaming
patch by slebresne; reviewed by jbellis for CASSANDRA-2420


 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Peter Schuller (JIRA)

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

Peter Schuller commented on CASSANDRA-2405:
---

IMO yes, since the aim was to make it easy to write a script. Poking JMX in a 
shell script != easy unless you happen to have crossed that threshold already; 
nodetool is one way to do that.

Also: From brief inspection it seems it's storing the time of the *completion* 
of the last successful repair. It needs to store the time of the *commencement* 
of the last successful repair in order to be useful for monitoring for gc grace 
seconds purposes since that it what determines at what point in the timeline 
the node is guaranteed to have seen writes.

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-2405:


I will make time [Keyspace] [ColumnFamily, ...] command for the nodetool...

By *commencement* do you mean the moment in the Differencer.run() were it 
decides: do we need a repair or not for each CF (line 492 of AES, right after 
logger.info())?

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2420:
-

Committed to 0.8 and trunk.
Was should we do about 0.7 ? I realized that we do not differentiate between 
the different reason for streaming in 0.7, so the simplest way to deal with 
this would probably be to just blindly invalidate the cache. Sounds reasonable ?

 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2420:
---

Yes.

 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


[jira] [Created] (CASSANDRA-2495) Add a proper retry mechanism for counters in case of failed request

2011-04-18 Thread Sylvain Lebresne (JIRA)
Add a proper retry mechanism for counters in case of failed request
---

 Key: CASSANDRA-2495
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2495
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8
Reporter: Sylvain Lebresne


Contrarily to standard insert, counter increments are not idempotent. As such, 
replaying a counter mutation when a TimeoutException occurs could lead to an 
over-count. This alone limits the use cases for which counters are a viable 
solution, so we should try to come up with a mechanism that allow the replay of 
a failed counter mutation without the risk of over-count. 

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


[jira] [Commented] (CASSANDRA-1902) Migrate cached pages during compaction

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-1902:


What I want here is to use the same data source for compaction and reads and 
though use a memory mapping cache instead of adding normal I/O via BRAF. 
MADV_RANDOM flag could be used for SegmentedFile to avoid read-ahead, seeks on 
mmaped files aren't as expensive as using normal I/O, also using madvice and 
information from mincore we can leave page cache almost untouched during 
compaction.

 Migrate cached pages during compaction 
 ---

 Key: CASSANDRA-1902
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1902
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.7.1
Reporter: T Jake Luciani
Assignee: Pavel Yaskevich
 Fix For: 1.0

 Attachments: 
 0001-CASSANDRA-1902-cache-migration-impl-with-config-option.txt, 
 1902-BufferedSegmentedFile-logandsleep.txt, 1902-formatted.txt, 
 1902-per-column-migration-rebase2.txt, 1902-per-column-migration.txt, 
 CASSANDRA-1902-v3.patch, CASSANDRA-1902-v4.patch, CASSANDRA-1902-v5.patch, 
 CASSANDRA-1902-v6.patch, CASSANDRA-1902-v7.patch, CASSANDRA-1902-v8.patch, 
 CASSANDRA-1902-v9-trunk-rebased.patch, 
 CASSANDRA-1902-v9-trunk-with-jmx.patch, CASSANDRA-1902-v9-trunk.patch, 
 CASSANDRA-1902-v9.patch

   Original Estimate: 32h
  Time Spent: 56h
  Remaining Estimate: 0h

 Post CASSANDRA-1470 there is an opportunity to migrate cached pages from a 
 pre-compacted CF during the compaction process.  This is now important since 
 CASSANDRA-1470 caches effectively nothing.  
 For example an active CF being compacted hurts reads since nothing is cached 
 in the new SSTable. 
 The purpose of this ticket then is to make sure SOME data is cached from 
 active CFs. This can be done my monitoring which Old SSTables are in the page 
 cache and caching active rows in the New SStable.
 A simpler yet similar approach is described here: 
 http://insights.oetiker.ch/linux/fadvise/

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


[Cassandra Wiki] Update of Counters by SylvainLebresne

2011-04-18 Thread Apache Wiki
Dear Wiki user,

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

The Counters page has been changed by SylvainLebresne.
http://wiki.apache.org/cassandra/Counters?action=diffrev1=10rev2=11

--

  
  And read it back
  {{{
- rv = client.get_counter('key1', ColumnPath(column_family='Counter1', 
column='c1'), ConsistencyLevel.ONE)
+ rv = client.get('key1', ColumnPath(column_family='Counter1', column='c1'), 
ConsistencyLevel.ONE).counter_column.value
  }}}
  
  Please read the rest of this wiki page, especially Technical limitations and 
Operational considerations to make sure this actually does what you need.
@@ -39, +39 @@

  == Interface ==
  
  The interface follows the main API.  The main differences are:
-  * CounterColumn requires an i64 value (can be negative) and no timestamp, and
+  * CounterColumn requires an i64 value (can be negative) and no timestamp,
+  * Counter can be used inside super columns using the CounterSuperColumn 
structure, and
   * Deletion, when used on a counter column family, does not use a timestamp.
  Internally, the data store generates timestamps on the server to determine 
priority of deletion.
  
@@ -55, +56 @@

  2: required listCounterColumn columns
  }
  
- struct Counter {
+ struct ColumnOrSuperColumn {
- 1: optional CounterColumn column,
+ 1: optional Column column,
- 2: optional CounterSuperColumn super_column
+ 2: optional SuperColumn super_column,
+ 3: optional CounterColumn counter_column,
+ 4: optional CounterSuperColumn counter_super_column
  }
  }}}
+ where the pre-existing ColumnOrSuperColumn has the two new fields, specific 
to counters, `counter_column` and `counter_super_column`.
- Moreover, as mentioned previously, then timestamp field of Deletion is now 
optional (but
- remain mandatory for non counter column family operation).
  
- The Mutation has also been updated with a new `counter` field for batch 
increment/decrement.
+ Moreover, as mentioned previously, the timestamp field of Deletion is now 
optional (but remain mandatory for non counter column family operation).
  
- The counter operation comprise `batch_mutate` and the following new 
operations:
+ The counter operations comprise the usual `batch_mutate`, `get`, `get_slice`, 
`multiget_slice`, `multiget_count` and `get_range_slice` (secondary indexes on 
counter column family is not supported at the moment), as well as the following 
new operations for access to a single counter:
  {{{
# counter methods
  
@@ -79, +81 @@

 throws (1:InvalidRequestException ire, 2:UnavailableException ue, 
3:TimedOutException te),
  
/**
-* Return the counter at the specified column path.
-*/
-   Counter get_counter(1:required binary key,
-   2:required ColumnPath path,
-   3:required ConsistencyLevel 
consistency_level=ConsistencyLevel.ONE)
-   throws (1:InvalidRequestException ire, 2:NotFoundException nfe, 
3:UnavailableException ue, 4:TimedOutException te),
- 
-   /**
-* Get a list of counters from the specified columns.
-*/
-   listCounter get_counter_slice(1:required binary key,
-   2:required ColumnParent column_parent,
-   3:required SlicePredicate predicate,
-   4:required ConsistencyLevel 
consistency_level=ConsistencyLevel.ONE)
-   throws (1:InvalidRequestException ire, 2:UnavailableException ue, 
3:TimedOutException te),
- 
-   /**
-* Get counter slices from multiple keys.
-*/
-   mapbinary,listCounter multiget_counter_slice(1:required listbinary 
keys,
-2:required ColumnParent 
column_parent,
-3:required SlicePredicate 
predicate,
-4:required 
ConsistencyLevel consistency_level=ConsistencyLevel.ONE)
-   throws (1:InvalidRequestException ire, 2:UnavailableException ue, 
3:TimedOutException te),
- 
-   /**
 * Remove a counter at the specified location.
 */
void remove_counter(1:required binary key,
@@ -115, +91 @@

  
  == Technical limitations ==
  
-   * If a write fails unexpectedly (timeout or loss of connection to the 
coordinator node) the client will not know if the operation has been performed. 
A retry can result in an over count.
+   * If a write fails unexpectedly (timeout or loss of connection to the 
coordinator node) the client will not know if the operation has been performed. 
A retry can result in an over count 
[[https://issues.apache.org/jira/browse/CASSANDRA-2495|CASSANDRA-2495]].
-   * Range slices on counter column family is not yet supported 
(https://issues.apache.org/jira/browse/CASSANDRA-2342).
  
  == Further reading ==
  See [[https://issues.apache.org/jira/browse/CASSANDRA-1072|CASSANDRA-1072]] 
and 

svn commit: r1094586 - /cassandra/tags/cassandra-0.6.13/

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 14:21:08 2011
New Revision: 1094586

URL: http://svn.apache.org/viewvc?rev=1094586view=rev
Log:
tagging 0.6.13 release

Added:
cassandra/tags/cassandra-0.6.13/
  - copied from r1091922, cassandra/branches/cassandra-0.6/



[jira] [Updated] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2420:


Attachment: 2420-for-0.7.patch

Attaching simple patch targeting 0.7. I put it for review individually because 
it's different enough from previous patch (but it's a one-liner, so should be 
too long to review anyway)

 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch, 2420-for-0.7.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2420:
---

+1

 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch, 2420-for-0.7.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


svn commit: r1094604 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 14:44:17 2011
New Revision: 1094604

URL: http://svn.apache.org/viewvc?rev=1094604view=rev
Log:
Invalidate cache for streamed rows
patch by slebresne; reviewed by jbellis for CASSANDRA-2420

Modified:

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

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1094604r1=1094603r2=1094604view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
 Mon Apr 18 14:44:17 2011
@@ -309,6 +309,11 @@ public class SSTableWriter extends SSTab
 while (rowPosition  dfile.length())
 {
 key = 
SSTableReader.decodeKey(StorageService.getPartitioner(), desc, 
ByteBufferUtil.readWithShortLength(dfile));
+
+// If the key is in (row) cache, we need the cache to be 
aware of the streamed row. To keep this simple, we
+// simply invalidate the row (we always invalidate but 
invalidating a key not in the cache is a no-op).
+cfs.invalidateCachedRow(key);
+
 iwriter.afterAppend(key, rowPosition);
 
 long dataSize = SSTableReader.readRowSize(dfile, desc);




[jira] [Commented] (CASSANDRA-2420) row cache / streaming aren't aware of each other

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2420:
---

Integrated in Cassandra-0.7 #437 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/437/])
Invalidate cache for streamed rows
patch by slebresne; reviewed by jbellis for CASSANDRA-2420


 row cache / streaming aren't aware of each other
 

 Key: CASSANDRA-2420
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2420
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.6
Reporter: Matthew F. Dennis
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5, 0.8

 Attachments: 0001-Handle-the-row-cache-for-streamed-row-v2.patch, 
 0001-Handle-the-row-cache-for-streamed-row.patch, 2420-for-0.7.patch


 SSTableWriter.Builder.build() takes tables that resulted from streaming, 
 repair, bootstrapping, et cetera and builds the indexes and bloom filters 
 before adding it so the current node is aware of it.
 However, if there is data present in the cache for a row that is also present 
 in the streamed table the row cache can over shadow the data in the newly 
 built table.  In other words, until the row in row cache is removed from the 
 cache (e.g. because it's pushed out because of size, the node is restarted, 
 the cache is manually cleared) the data in the newly built table will never 
 be returned to clients.
 The solution that seems most reasonable at this point is to have 
 SSTableWriter.Builder.build() (or something below it) update the row cache if 
 the row key in the table being built is also present in the cache.

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


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

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 15:09:28 2011
New Revision: 1094611

URL: http://svn.apache.org/viewvc?rev=1094611view=rev
Log:
maven-central pulishing

Patch by Stephen Connolly; reviewed by eevans for CASSANDRA-1851

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

Modified: cassandra/branches/cassandra-0.7/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/build.xml?rev=1094611r1=1094610r2=1094611view=diff
==
--- cassandra/branches/cassandra-0.7/build.xml (original)
+++ cassandra/branches/cassandra-0.7/build.xml Mon Apr 18 15:09:28 2011
@@ -23,6 +23,14 @@
 property file=build.properties /
 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.7.5/
+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}/
+property name=scm.default.url 
value=http://svn.apache.org/viewvc/${scm.default.path}/
+
+!-- directory details --
 property name=basedir value=./
 property name=build.src value=${basedir}/src/
 property name=build.src.java value=${basedir}/src/java/
@@ -49,17 +57,30 @@
 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=base.version value=0.7.4/
 condition property=version value=${base.version}
   isset property=release/
 /condition
 property name=version value=${base.version}-SNAPSHOT/
 property name=version.properties.dir 
value=${build.classes}/org/apache/cassandra/config//
 property name=final.name value=${ant.project.name}-${version}/
-property name=maven-ant-tasks.version value=2.1.1 /
+
+!-- details of what version of Maven ANT Tasks to fetch --
+property name=maven-ant-tasks.version value=2.1.3 /
+property name=maven-ant-tasks.local 
value=${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks/
 property name=maven-ant-tasks.url
   
value=http://repo2.maven.org/maven2/org/apache/maven/maven-ant-tasks; /
 
+!-- details of how and which Maven repository we publish to --
+property name=maven.version value=3.0.3 /
+condition property=maven-repository-url 
value=https://repository.apache.org/service/local/staging/deploy/maven2;
+  isset property=release/
+/condition
+condition property=maven-repository-id value=apache.releases.https
+  isset property=release/
+/condition
+property name=maven-repository-url 
value=https://repository.apache.org/content/repositories/snapshots/
+property name=maven-repository-id value=apache.snapshots.https/
+
 !-- http://cobertura.sourceforge.net/ --
 property name=cobertura.version value=1.9.4.1/
 property name=cobertura.build.dir value=${build.dir}/cobertura/
@@ -71,10 +92,22 @@
   available 
file=${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar /
 /condition
 
+condition property=maven-ant-tasks.jar.local
+  available 
file=${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar
 /
+/condition
+
 condition property=is.source.artifact
   available file=${build.src.java} type=dir /
 /condition
 
+condition property=scm.provider.git-svn
+  available file=${basedir}/.git type=dir/
+/condition
+
+condition property=scm.provider.svn
+  available file=${basedir}/.svn type=dir/
+/condition
+
 !--
  Add all the dependencies.
 --
@@ -137,20 +170,55 @@
   /java
 /target
 
+target name=scm-svn-info description=Determines the current Subversion 
URL with peg revision
+if=scm.provider.svn
+  exec executable=svn dir=${basedir} 
output=${build.dir}/svn-info.xml
+arg line=info --xml/
+  /exec
+  xmlproperty file=${build.dir}/svn-info.xml collapseAttributes=true 
prefix=svn keepRoot=false/
+  echo file=${build.dir}/scm.properties
+connection=scm:svn:${svn.entry.url}@${svn.entry.commit.revision}
+developerConnection=scm:svn:${svn.entry.url}@${svn.entry.commit.revision}
+url=${svn.entry.url}?pathrev=${svn.entry.commit.revision}
+  /echo
+  replace file=${build.dir}/scm.properties
+replacefilter token=connection=scm:svn:https: 
value=connection=scm:svn:http:/
+replacefilter token=Connection=scm:svn:http: 
value=Connection=scm:svn:https:/
+replacefilter token=url=${svn.entry.repository.root} 
value=url=http://svn.apache.org/viewvc/
+  /replace
+  property 

[jira] [Commented] (CASSANDRA-1851) Publish cassandra artifacts to the maven central repository

2011-04-18 Thread Eric Evans (JIRA)

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

Eric Evans commented on CASSANDRA-1851:
---

OK, this has been committed to 0.7; If you want to forward-port to the 0.8 
branch, go ahead.

 Publish cassandra artifacts to the maven central repository
 ---

 Key: CASSANDRA-1851
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1851
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.0 rc 2, 0.7.0 rc 3, 0.7.1, 0.8
Reporter: Stephen Connolly
Priority: Minor
 Fix For: 0.7.5

 Attachments: MVN-PUBLISH-v2.patch, MVN-PUBLISH-v3.patch, 
 MVN-PUBLISH.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 See 
 http://markmail.org/search/?q=list:org.apache.incubator.cassandra-dev#query:list%3Aorg.apache.incubator.cassandra-dev+page:1+mid:bmcd3ir33p3psqze+state:results
 I will be attaching a patch to this issue once I have got the ANT build to a 
 state where it can push the cassandra artifacts to the maven central 
 repository.

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


svn commit: r1094613 - in /cassandra/site: publish/download/index.html src/settings.py

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 15:17:49 2011
New Revision: 1094613

URL: http://svn.apache.org/viewvc?rev=1094613view=rev
Log:
update site versioning for 0.6.13 release

Modified:
cassandra/site/publish/download/index.html
cassandra/site/src/settings.py

Modified: cassandra/site/publish/download/index.html
URL: 
http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1094613r1=1094612r2=1094613view=diff
==
--- cassandra/site/publish/download/index.html (original)
+++ cassandra/site/publish/download/index.html Mon Apr 18 15:17:49 2011
@@ -52,22 +52,22 @@
   p
   The previous stable branch of Cassandra continues to see periodic maintenance
   for some time after a new release is made. The lastest oldstable release is
-  0.6.12 (released on 
-  2011-02-21).
+  0.6.13 (released on 
+  2011-04-18).
   /p
 
   ul
 li
-a class=filename 
href=http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.6.12/apache-cassandra-0.6.12-bin.tar.gz;apache-cassandra-0.6.12-bin.tar.gz/a
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-bin.tar.gz.asc;PGP/a]
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-bin.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-bin.tar.gz.sha;SHA1/a]
+a class=filename 
href=http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz;apache-cassandra-0.6.13-bin.tar.gz/a
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz.asc;PGP/a]
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz.sha;SHA1/a]
 /li
 li
-a class=filename 
href=http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.6.12/apache-cassandra-0.6.12-src.tar.gz;apache-cassandra-0.6.12-src.tar.gz/a
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-src.tar.gz.asc;PGP/a]
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-src.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/cassandra/0.6.12/apache-cassandra-0.6.12-src.tar.gz.sha;SHA1/a]
+a class=filename 
href=http://www.apache.org/dyn/closer.cgi?path=/cassandra/0.6.13/apache-cassandra-0.6.13-src.tar.gz;apache-cassandra-0.6.13-src.tar.gz/a
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-src.tar.gz.asc;PGP/a]
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-src.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-src.tar.gz.sha;SHA1/a]
 /li
   /ul
   

Modified: cassandra/site/src/settings.py
URL: 
http://svn.apache.org/viewvc/cassandra/site/src/settings.py?rev=1094613r1=1094612r2=1094613view=diff
==
--- cassandra/site/src/settings.py (original)
+++ cassandra/site/src/settings.py Mon Apr 18 15:17:49 2011
@@ -92,8 +92,8 @@ SITE_POST_PROCESSORS = {
 }
 
 class CassandraDef(object):
-oldstable_version = '0.6.12'
-oldstable_release_date = '2011-02-21'
+oldstable_version = '0.6.13'
+oldstable_release_date = '2011-04-18'
 oldstable_exists = True
 stable_version = '0.7.4'
 stable_release_date = '2011-03-15'




[jira] [Commented] (CASSANDRA-1851) Publish cassandra artifacts to the maven central repository

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-1851:
---

Integrated in Cassandra-0.7 #438 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/438/])
maven-central pulishing

Patch by Stephen Connolly; reviewed by eevans for CASSANDRA-1851


 Publish cassandra artifacts to the maven central repository
 ---

 Key: CASSANDRA-1851
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1851
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.0 rc 2, 0.7.0 rc 3, 0.7.1, 0.8
Reporter: Stephen Connolly
Priority: Minor
 Fix For: 0.7.5

 Attachments: MVN-PUBLISH-v2.patch, MVN-PUBLISH-v3.patch, 
 MVN-PUBLISH.patch

   Original Estimate: 0h
  Remaining Estimate: 0h

 See 
 http://markmail.org/search/?q=list:org.apache.incubator.cassandra-dev#query:list%3Aorg.apache.incubator.cassandra-dev+page:1+mid:bmcd3ir33p3psqze+state:results
 I will be attaching a patch to this issue once I have got the ANT build to a 
 state where it can push the cassandra artifacts to the maven central 
 repository.

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


[jira] [Updated] (CASSANDRA-2457) Batch_mutate is broken for counters

2011-04-18 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2457:


Attachment: 0001-Fix-batch_mutate-for-counters-v2.patch

 Batch_mutate is broken for counters
 ---

 Key: CASSANDRA-2457
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2457
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
 Fix For: 0.8

 Attachments: 0001-Fix-batch_mutate-for-counters-v2.patch, 
 0001-Fix-batch_mutate-for-counters.patch

   Original Estimate: 4h
  Remaining Estimate: 4h

 CASSANDRA-2384 allowed for batch_mutate to take counter and non counter 
 operation, but the code was not updated correctly to handle that case. As it 
 is, the code will use the first mutation in the batch list to decide whether 
 to apply the write code path of counter or not, and will thus break if those 
 are mixed.

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


[jira] [Commented] (CASSANDRA-2457) Batch_mutate is broken for counters

2011-04-18 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2457:
-

Attached rebased version (post-CASSANDRA-2454 in particular)

bq. writeLocallyAndReplicate doesn't always perform a local mutation, so it 
should probably be renamed

Renamed it to performWrite (since it mostly simply imply a so-called 
writePerformer).

bq. Since mutateCounter and writeLocallyAndReplicate are symmetrical and are 
called depending on whether an IMutation is an instance of CounterMutation, 
could we move them onto IMutation, and polymorphically decide the behavior?

Hum, they are not really so symmetrical. In particular writeLocallyAndReplicate 
(or performWrite as it is called nowadays) really is polymorphic over the 
IMutation used.
So the only seem we we could do (at least easily) is moving some of 
mutateCounter in CounterMutation, but not sure it will look so great. Also, it 
is probably nice to keep all the code related to the write/read protocol in 
StorageProxy (doing otherwise would be like moving the query code out of 
CFStore, nobody wants that :D)

bq. I'm fine with this, since a counter is as real a write as any other. But 
I do think we should record the latencies for the replicate-on-write stage like 
we do for the read and mutation stages on a per column family basis. I can 
tackle it in a separate ticket if you'd like.

Make sense, but I'm also in favor of moving this to some other ticket. 

 Batch_mutate is broken for counters
 ---

 Key: CASSANDRA-2457
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2457
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
 Fix For: 0.8

 Attachments: 0001-Fix-batch_mutate-for-counters-v2.patch, 
 0001-Fix-batch_mutate-for-counters.patch

   Original Estimate: 4h
  Remaining Estimate: 4h

 CASSANDRA-2384 allowed for batch_mutate to take counter and non counter 
 operation, but the code was not updated correctly to handle that case. As it 
 is, the code will use the first mutation in the batch list to decide whether 
 to apply the write code path of counter or not, and will thus break if those 
 are mixed.

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


svn commit: r1094628 - in /cassandra/branches/cassandra-0.8: drivers/py/cql/cassandra/ drivers/txpy/txcql/cassandra/ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apac

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 15:51:47 2011
New Revision: 1094628

URL: http://svn.apache.org/viewvc?rev=1094628view=rev
Log:
add optional replication_factor fields to KsDef to make supporting both 0.8 and 
0.7 easier for client devs
patch by jbellis; reviewed by Nate McCall for CASSANDRA-2481

Modified:
cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/constants.py
cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/ttypes.py
cassandra/branches/cassandra-0.8/drivers/txpy/txcql/cassandra/constants.py
cassandra/branches/cassandra-0.8/drivers/txpy/txcql/cassandra/ttypes.py
cassandra/branches/cassandra-0.8/interface/cassandra.thrift

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java

cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java

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

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java
cassandra/branches/cassandra-0.8/test/system/__init__.py
cassandra/branches/cassandra-0.8/test/system/test_thrift_server.py

Modified: cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/constants.py
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/constants.py?rev=1094628r1=1094627r2=1094628view=diff
==
--- cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/constants.py 
(original)
+++ cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/constants.py Mon 
Apr 18 15:51:47 2011
@@ -7,4 +7,4 @@
 from thrift.Thrift import *
 from ttypes import *
 
-VERSION = 20.1.0
+VERSION = 19.10.0

Modified: cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/ttypes.py
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/ttypes.py?rev=1094628r1=1094627r2=1094628view=diff
==
--- cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/ttypes.py 
(original)
+++ cassandra/branches/cassandra-0.8/drivers/py/cql/cassandra/ttypes.py Mon Apr 
18 15:51:47 2011
@@ -246,10 +246,6 @@ class Column:
 def validate(self):
   if self.name is None:
 raise TProtocol.TProtocolException(message='Required field name is 
unset!')
-  if self.value is None:
-raise TProtocol.TProtocolException(message='Required field value is 
unset!')
-  if self.timestamp is None:
-raise TProtocol.TProtocolException(message='Required field timestamp 
is unset!')
   return
 
 
@@ -2666,6 +2662,7 @@ class KsDef:
- name
- strategy_class
- strategy_options
+   - replication_factor: deprecated
- cf_defs
   
 
@@ -2674,13 +2671,15 @@ class KsDef:
 (1, TType.STRING, 'name', None, None, ), # 1
 (2, TType.STRING, 'strategy_class', None, None, ), # 2
 (3, TType.MAP, 'strategy_options', (TType.STRING,None,TType.STRING,None), 
None, ), # 3
-(4, TType.LIST, 'cf_defs', (TType.STRUCT,(CfDef, CfDef.thrift_spec)), 
None, ), # 4
+(4, TType.I32, 'replication_factor', None, None, ), # 4
+(5, TType.LIST, 'cf_defs', (TType.STRUCT,(CfDef, CfDef.thrift_spec)), 
None, ), # 5
   )
 
-  def __init__(self, name=None, strategy_class=None, strategy_options=None, 
cf_defs=None,):
+  def __init__(self, name=None, strategy_class=None, strategy_options=None, 
replication_factor=None, cf_defs=None,):
 self.name = name
 self.strategy_class = strategy_class
 self.strategy_options = strategy_options
+self.replication_factor = replication_factor
 self.cf_defs = cf_defs
 
   def read(self, iprot):
@@ -2714,6 +2713,11 @@ class KsDef:
 else:
   iprot.skip(ftype)
   elif fid == 4:
+if ftype == TType.I32:
+  self.replication_factor = iprot.readI32();
+else:
+  iprot.skip(ftype)
+  elif fid == 5:
 if ftype == TType.LIST:
   self.cf_defs = []
   (_etype68, _size65) = iprot.readListBegin()
@@ -2750,8 +2754,12 @@ class KsDef:
 oprot.writeString(viter72)
   oprot.writeMapEnd()
   oprot.writeFieldEnd()
+if self.replication_factor != None:
+  oprot.writeFieldBegin('replication_factor', TType.I32, 4)
+  oprot.writeI32(self.replication_factor)
+  oprot.writeFieldEnd()
 if self.cf_defs != None:
-  oprot.writeFieldBegin('cf_defs', TType.LIST, 4)
+  oprot.writeFieldBegin('cf_defs', TType.LIST, 5)
   oprot.writeListBegin(TType.STRUCT, len(self.cf_defs))
   for iter73 in self.cf_defs:
 iter73.write(oprot)

Modified: 
cassandra/branches/cassandra-0.8/drivers/txpy/txcql/cassandra/constants.py
URL: 

[jira] [Resolved] (CASSANDRA-2400) Resolve Maven Ant Tasks from local Maven repository if present

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-2400.
---

   Resolution: Duplicate
Fix Version/s: (was: 0.7.5)
 Assignee: (was: Stephen Connolly)

subsumed by CASSANDRA-1851

 Resolve Maven Ant Tasks from local Maven repository if present
 --

 Key: CASSANDRA-2400
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2400
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 0.7.4
Reporter: Stephen Connolly
Priority: Minor
 Attachments: MCASSANDRA-tweaks.patch


 To aid with testing using newer versions of Maven ANT Tasks it can be helpful 
 to copy the version from the local repository if present rather than always 
 downloading

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


[jira] [Updated] (CASSANDRA-2416) NullPointerException in CacheWriter.saveCache()

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2416:
--

Attachment: 2416-v2.txt

Because attempting to cache a DK that is really just a token is a semantic 
error that we shouldn't just paper over.  v2 adds an assert to make that clear.

 NullPointerException in CacheWriter.saveCache()
 ---

 Key: CASSANDRA-2416
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2416
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
 Environment: linux
Reporter: Shotaro Kamio
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.5

 Attachments: 2416-v2.txt, 2416.txt


 I've seen NullPointerException of CacheWriter in our cluster (replication 3).
 ERROR [CompactionExecutor:1] 2011-04-05 09:57:42,968 
 AbstractCassandraDaemon.java (line 112) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.lang.RuntimeException: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 Caused by: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.ByteBufferUtil.writeWithLength(ByteBufferUtil.java:275)
 at 
 org.apache.cassandra.io.sstable.CacheWriter.saveCache(CacheWriter.java:84)
 at 
 org.apache.cassandra.db.CompactionManager$10.runMayThrow(CompactionManager.java:960)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 ... 6 more

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


[Cassandra Wiki] Update of Counters by SylvainLebresne

2011-04-18 Thread Apache Wiki
Dear Wiki user,

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

The Counters page has been changed by SylvainLebresne.
http://wiki.apache.org/cassandra/Counters?action=diffrev1=11rev2=12

--

  == Technical limitations ==
  
* If a write fails unexpectedly (timeout or loss of connection to the 
coordinator node) the client will not know if the operation has been performed. 
A retry can result in an over count 
[[https://issues.apache.org/jira/browse/CASSANDRA-2495|CASSANDRA-2495]].
+   * Counter removal is intrinsically limited. For instance, if you issue very 
quickly the sequence increment, remove, increment it is possible for the 
removal to be lost (if for some reason the remove happens to be the last 
received messages). Hence, removal of counters is provided for definitive 
removal, that is when the deleted counter is not increment afterwards. Note 
that if you need to reset a counter, you can read its ''value'' and insert 
''-value''. 
  
  == Further reading ==
  See [[https://issues.apache.org/jira/browse/CASSANDRA-1072|CASSANDRA-1072]] 
and especially the 
[[https://issues.apache.org/jira/secure/attachment/12459754/Partitionedcountersdesigndoc.pdf|design
 doc]] for further information about how this works internally.


[jira] [Commented] (CASSANDRA-2481) C* .deb installs C* init.d scripts such that C* comes up before mdadm and related

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2481:
---

Integrated in Cassandra-0.8 #14 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.8/14/])
add optional replication_factor fields to KsDef to make supporting both 0.8 
and 0.7 easier for client devs
patch by jbellis; reviewed by Nate McCall for CASSANDRA-2481


 C* .deb installs C* init.d scripts such that C* comes up before mdadm and 
 related
 -

 Key: CASSANDRA-2481
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2481
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.7.0
Reporter: Matthew F. Dennis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.7.5


 the C* .deb packages install the init.d scripts at S20 which is before mdadm 
 and various other services.  This means that when a node reboots that C* is 
 started before the RAID sets are up and mounted causing C* to think it has no 
 data and attempt bootstrapping again.

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


[jira] [Commented] (CASSANDRA-2416) NullPointerException in CacheWriter.saveCache()

2011-04-18 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2416:
-

+1

 NullPointerException in CacheWriter.saveCache()
 ---

 Key: CASSANDRA-2416
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2416
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
 Environment: linux
Reporter: Shotaro Kamio
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.5

 Attachments: 2416-v2.txt, 2416.txt


 I've seen NullPointerException of CacheWriter in our cluster (replication 3).
 ERROR [CompactionExecutor:1] 2011-04-05 09:57:42,968 
 AbstractCassandraDaemon.java (line 112) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.lang.RuntimeException: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 Caused by: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.ByteBufferUtil.writeWithLength(ByteBufferUtil.java:275)
 at 
 org.apache.cassandra.io.sstable.CacheWriter.saveCache(CacheWriter.java:84)
 at 
 org.apache.cassandra.db.CompactionManager$10.runMayThrow(CompactionManager.java:960)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 ... 6 more

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


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

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 16:56:57 2011
New Revision: 1094647

URL: http://svn.apache.org/viewvc?rev=1094647view=rev
Log:
avoid caching token-only decoratedkeys
patch by jbellis; reviewed by slebresne for CASSANDRA-2416

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=1094647r1=1094646r2=1094647view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Mon Apr 18 16:56:57 2011
@@ -29,6 +29,7 @@
  * re-set bootstrapped flag after move finishes (CASSANDRA-2435)
  * use 64KB flush buffer instead of in_memory_compaction_limit (CASSANDRA-2463)
  * fix duplicate results from CFS.scan (CASSANDRA-2406)
+ * avoid caching token-only decoratedkeys (CASSANDRA-2416)
 
 
 0.7.4

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=1094647r1=1094646r2=1094647view=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
 Mon Apr 18 16:56:57 2011
@@ -417,8 +417,9 @@ public class SSTableReader extends SSTab
 
 public void cacheKey(DecoratedKey key, Long info)
 {
+assert key.key != null;
 // avoid keeping a permanent reference to the original key buffer
-DecoratedKey copiedKey = new DecoratedKey(key.token, key.key == null ? 
null : ByteBufferUtil.clone(key.key));
+DecoratedKey copiedKey = new DecoratedKey(key.token, 
ByteBufferUtil.clone(key.key));
 keyCache.put(new PairDescriptor, DecoratedKey(descriptor, 
copiedKey), info);
 }
 
@@ -487,7 +488,8 @@ public class SSTableReader extends SSTab
 if (op == Operator.EQ)
 bloomFilterTracker.addTruePositive();
 // store exact match for the key
-cacheKey(decoratedKey, dataPosition);
+if (decoratedKey.key != null)
+cacheKey(decoratedKey, dataPosition);
 }
 return dataPosition;
 }




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

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 17:00:35 2011
New Revision: 1094651

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 17:00:35 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647
 /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=1094651r1=1094650r2=1094651view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Apr 18 17:00:35 2011
@@ -55,6 +55,7 @@
  * Try harder to close files after compaction (CASSANDRA-2431)
  * re-set bootstrapped flag after move finishes (CASSANDRA-2435)
  * use 64KB flush buffer instead of in_memory_compaction_limit (CASSANDRA-2463)
+ * avoid caching token-only decoratedkeys (CASSANDRA-2416)
 
 
 0.7.4

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 17:00:35 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-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094604,1094647
 /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 Mon Apr 18 17:00:35 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-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647
 
/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 Mon Apr 18 17:00:35 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-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647
 

svn commit: r1094652 - /cassandra/branches/cassandra-0.8/NEWS.txt

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 17:00:59 2011
New Revision: 1094652

URL: http://svn.apache.org/viewvc?rev=1094652view=rev
Log:
r/m merge artifact

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

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1094652r1=1094651r2=1094652view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Mon Apr 18 17:00:59 2011
@@ -55,7 +55,6 @@ Upgrading
   data files before rebuilding, just in case.
 
 
- .merge-right.r1073884
 0.7.1
 =
 




svn commit: r1094654 - in /cassandra/branches/cassandra-0.8: CHANGES.txt build.xml debian/changelog

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 17:07:47 2011
New Revision: 1094654

URL: http://svn.apache.org/viewvc?rev=1094654view=rev
Log:
update versioning for 0.8 beta1 release

Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/build.xml
cassandra/branches/cassandra-0.8/debian/changelog

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1094654r1=1094653r2=1094654view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Apr 18 17:07:47 2011
@@ -1,4 +1,4 @@
-0.8-dev
+0.8.0-beta1
  * remove Avro RPC support (CASSANDRA-926)
  * adds support for columns that act as incr/decr counters 
(CASSANDRA-1072, 1937, 1944, 1936, 2101, 2093, 2288, 2105, 2384, 2236, 2342,

Modified: cassandra/branches/cassandra-0.8/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1094654r1=1094653r2=1094654view=diff
==
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Mon Apr 18 17:07:47 2011
@@ -55,7 +55,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=base.version value=0.8.0/
+property name=base.version value=0.8.0-beta1/
 property name=cql.driver.version value=1.0.0 /
 condition property=version value=${base.version}
   isset property=release/

Modified: cassandra/branches/cassandra-0.8/debian/changelog
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/changelog?rev=1094654r1=1094653r2=1094654view=diff
==
--- cassandra/branches/cassandra-0.8/debian/changelog (original)
+++ cassandra/branches/cassandra-0.8/debian/changelog Mon Apr 18 17:07:47 2011
@@ -1,3 +1,9 @@
+cassandra (0.8.0~beta1) unstable; urgency=low
+
+  * New beta release.
+
+ -- Eric Evans eev...@apache.org  Mon, 18 Apr 2011 11:41:09 -0500
+
 cassandra (0.7.4) unstable; urgency=low
 
   * New stable point release.




svn commit: r1094655 - in /cassandra/branches/cassandra-0.8: ./ doc/cql/ drivers/java/src/org/apache/cassandra/cql/jdbc/ drivers/java/test/org/apache/cassandra/cql/jdbc/ src/java/org/apache/cassandra/

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 17:08:06 2011
New Revision: 1094655

URL: http://svn.apache.org/viewvc?rev=1094655view=rev
Log:
prepend missing license headers

Patch by eevans

Modified:
cassandra/branches/cassandra-0.8/.rat-excludes
cassandra/branches/cassandra-0.8/doc/cql/CQL.html

cassandra/branches/cassandra-0.8/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraPreparedStatement.java

cassandra/branches/cassandra-0.8/drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/FreeableMemory.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/ICache.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/IRowCacheProvider.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/SerializingCache.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java

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

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

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

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/util/MemoryInputStream.java

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/util/MemoryOutputStream.java

cassandra/branches/cassandra-0.8/src/resources/org/apache/cassandra/cli/CliHelp.yaml

cassandra/branches/cassandra-0.8/test/long/org/apache/cassandra/db/MeteredFlusherTest.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cache/CacheProviderTest.java

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

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

Modified: cassandra/branches/cassandra-0.8/.rat-excludes
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/.rat-excludes?rev=1094655r1=1094654r2=1094655view=diff
==
--- cassandra/branches/cassandra-0.8/.rat-excludes (original)
+++ cassandra/branches/cassandra-0.8/.rat-excludes Mon Apr 18 17:08:06 2011
@@ -2,7 +2,8 @@
 debian/**
 .classpath
 .rat-excludes
-.project
+**/.project
+**/.pydevproject
 CHANGES.txt
 .git/**
 **/*.json

Modified: cassandra/branches/cassandra-0.8/doc/cql/CQL.html
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/doc/cql/CQL.html?rev=1094655r1=1094654r2=1094655view=diff
==
--- cassandra/branches/cassandra-0.8/doc/cql/CQL.html (original)
+++ cassandra/branches/cassandra-0.8/doc/cql/CQL.html Mon Apr 18 17:08:06 2011
@@ -1,3 +1,24 @@
+!--
+ 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ License); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ 
+--
+
 ?xml version='1.0' encoding='utf-8' ?!DOCTYPE html PUBLIC -//W3C//DTD 
XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;html 
xmlns=http://www.w3.org/1999/xhtml;headmeta http-equiv=Content-Type 
content=text/html; charset=utf-8//headbodyh1 
id=CassandraQueryLanguageCQLv1.0.0Cassandra Query Language (CQL) 
v1.0.0/h1h2 id=TableofContentsTable of Contents/h2ol 
style=list-style: none;lia 
href=#CassandraQueryLanguageCQLv1.0.0Cassandra Query Language (CQL) 
v1.0.0/aol style=list-style: none;lia href=#TableofContentsTable of 
Contents/a/lilia href=#USEUSE/a/lilia 
href=#SELECTSELECT/aol style=list-style: none;lia 
href=#SpecifyingColumnsSpecifying Columns/a/lilia 
href=#ColumnFamilyColumn Family/a/lilia 
href=#ConsistencyLevelConsistency Level/a/lilia 
href=#FilteringrowsFiltering rows/a/lilia 
href=#LimitsLimits/a/li/ol/lili
 a href=#UPDATEUPDATE/aol style=list-style: none;lia 
href=#ColumnFamily2Column Family/a/lilia 
href=#ConsistencyLevel2Consistency Level/a/lilia 
href=#SpecifyingColumnsandRowSpecifying Columns and 

svn commit: r1094659 - in /cassandra/branches/cassandra-0.8: NEWS.txt conf/cassandra.yaml

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 17:10:49 2011
New Revision: 1094659

URL: http://svn.apache.org/viewvc?rev=1094659view=rev
Log:
update NEWS

Modified:
cassandra/branches/cassandra-0.8/NEWS.txt
cassandra/branches/cassandra-0.8/conf/cassandra.yaml

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1094659r1=1094658r2=1094659view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Mon Apr 18 17:10:49 2011
@@ -3,15 +3,29 @@
 
 Upgrading
 -
-Avro record classes used in map/reduce and Hadoop streaming code have
-moved from org.apache.cassandra.avro to org.apache.cassandra.hadoop.avro,
-applications using these classes will need to be updated accordingly.
+- Upgrading from version 0.7.1 or later can be done with a rolling
+  restart, one node at a time.  You do not need to bring down the
+  whole cluster.
+- Avro record classes used in map/reduce and Hadoop streaming code have
+  moved from org.apache.cassandra.avro to org.apache.cassandra.hadoop.avro,
+  applications using these classes will need to be updated accordingly.
+- The loadbalance command has been removed from nodetool.  For similar
+  behavior, decommission then rebootstrap with empty initial_token.
+- repair now works on a token range, rather than the entire ring. This
+  means that run repair against each node will now repair the ring with
+  no redundant work.
 
-   Upgrading from version 0.7.1 or later can be done with a rolling 
restart,
-   one node at a time.  You do not need to bring down the whole cluster.
-
-The loadbalance command has been removed from nodetool.  For similar
-behavior, decommission then rebootstrap with empty initial_token.
+Features
+
+- added CQL client API and JDBC/DBAPI2-compliant drivers for Java and
+  Python, respectively (see: drivers/ subdirectory and doc/cql)
+- added distributed Counters feature; 
+  see http://wiki.apache.org/cassandra/Counters
+- optional intranode encryption; see comments around 'encryption_options'
+  in cassandra.yaml
+- compaction multithreading and rate-limiting; see 
+  'compaction_multithreading' and 'compaction_throughput_mb_per_sec' in
+  cassandra.yaml
 
 Other
 -

Modified: cassandra/branches/cassandra-0.8/conf/cassandra.yaml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/conf/cassandra.yaml?rev=1094659r1=1094658r2=1094659view=diff
==
--- cassandra/branches/cassandra-0.8/conf/cassandra.yaml (original)
+++ cassandra/branches/cassandra-0.8/conf/cassandra.yaml Mon Apr 18 17:10:49 
2011
@@ -252,7 +252,7 @@ in_memory_compaction_limit_in_mb: 64
 # Enables multiple compactions to execute at once. This is highly recommended
 # for preserving read performance in a mixed read/write workload as this
 # avoids sstables from accumulating during long running compactions.
-compaction_multithreading: true
+compaction_multithreading: false
 
 # Throttles compaction to the given total throughput across the entire
 # system. The faster you insert data, the faster you need to compact in




[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Peter Schuller (JIRA)

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

Peter Schuller commented on CASSANDRA-2405:
---

A further complication: Since the intent here is to enable people to set up 
alarms to trigger whenever the time-since-last is not within an acceptable 
range, it raises the issue of whether to keep this information persistent in 
system tables or just in-memory. Keeping in mind that:

(1) For large amounts of data the act of doing another round of AES just in 
case if a node was restarted is significant
(2) If the alarm were to triggered on the information not being available, that 
would instantly lead to false positive alarms when nodes are restarted, 
instantly rendering alarms useless to operations.
(3) If the alarm were to ignore the case where the information is not yet 
available, that is a very dangerous silent failure and effectively means the 
alarm is not functioning properly.

... I get the feeling one wants this information persistent.

I guess this all makes the ticket non-trivial, but I think the need for an 
easy way for operators to ensure sufficient AES frequency is important.

(I'm actually kind of surprised issues with this do not crop up more often on 
the mailing lists... am I missing something that mitigates the impact here, or 
are people just using sufficiently long grace periods relative to repair 
frequency that they're not hitting these things in practice?)

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


svn commit: r1094668 - /cassandra/branches/cassandra-0.8/debian/cassandra.install

2011-04-18 Thread eevans
Author: eevans
Date: Mon Apr 18 17:32:05 2011
New Revision: 1094668

URL: http://svn.apache.org/viewvc?rev=1094668view=rev
Log:
remove schematool from debian packaging

Patch by eevans

Modified:
cassandra/branches/cassandra-0.8/debian/cassandra.install

Modified: cassandra/branches/cassandra-0.8/debian/cassandra.install
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/cassandra.install?rev=1094668r1=1094667r2=1094668view=diff
==
--- cassandra/branches/cassandra-0.8/debian/cassandra.install (original)
+++ cassandra/branches/cassandra-0.8/debian/cassandra.install Mon Apr 18 
17:32:05 2011
@@ -10,6 +10,5 @@ bin/clustertool usr/bin
 bin/json2sstable usr/bin
 bin/sstable2json usr/bin
 bin/sstablekeys usr/bin
-bin/schematool usr/bin
 lib/*.jar usr/share/cassandra
 lib/licenses usr/share/doc/cassandra




[jira] [Commented] (CASSANDRA-2416) NullPointerException in CacheWriter.saveCache()

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2416:
---

Integrated in Cassandra-0.7 #439 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/439/])
avoid caching token-only decoratedkeys
patch by jbellis; reviewed by slebresne for CASSANDRA-2416


 NullPointerException in CacheWriter.saveCache()
 ---

 Key: CASSANDRA-2416
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2416
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.0
 Environment: linux
Reporter: Shotaro Kamio
Assignee: Jonathan Ellis
Priority: Minor
 Fix For: 0.7.5

 Attachments: 2416-v2.txt, 2416.txt


 I've seen NullPointerException of CacheWriter in our cluster (replication 3).
 ERROR [CompactionExecutor:1] 2011-04-05 09:57:42,968 
 AbstractCassandraDaemon.java (line 112) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.lang.RuntimeException: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 Caused by: java.lang.NullPointerException
 at 
 org.apache.cassandra.utils.ByteBufferUtil.writeWithLength(ByteBufferUtil.java:275)
 at 
 org.apache.cassandra.io.sstable.CacheWriter.saveCache(CacheWriter.java:84)
 at 
 org.apache.cassandra.db.CompactionManager$10.runMayThrow(CompactionManager.java:960)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 ... 6 more

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


[jira] [Commented] (CASSANDRA-2491) A new config parameter, broadcast_address

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2491:
---

why wouldn't you just set listen_address=external ip?

 A new config parameter, broadcast_address
 -

 Key: CASSANDRA-2491
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2491
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
 Environment: x86_64 GNU/Linux
Reporter: Khee Chin
Priority: Trivial
  Labels: patch
 Attachments: 2491_broadcast_address.patch

   Original Estimate: 336h
  Remaining Estimate: 336h

 A new config parameter, broadcast_address
 In a cluster setup where one or more nodes is behind a firewall and has a 
 private ip address, listen_address does not allow the hosts behind the 
 firewalls to be discovered by other nodes.
 Attached is a patch that introduces a new config parameter broadcast_address 
 which allows Cassandra nodes to explicitly specify their external ip address. 
 In addition, this allows listen_address to be set to 0.0.0.0 on the already 
 firewalled node.
 broadcast_address fallsback to listen_address when it is not stated.

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


[jira] [Updated] (CASSANDRA-2484) CassandraStorage LoadPushDown implementation causes heisenbugs

2011-04-18 Thread Jeremy Hanna (JIRA)

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

Jeremy Hanna updated CASSANDRA-2484:


Attachment: 2484-trunk.txt

Attaching a patch for trunk - not sure why the other one didn't apply.

 CassandraStorage LoadPushDown implementation causes heisenbugs
 --

 Key: CASSANDRA-2484
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2484
 Project: Cassandra
  Issue Type: Bug
Reporter: Jeremy Hanna
Assignee: Jeremy Hanna
  Labels: hadoop, pig
 Fix For: 0.7.5

 Attachments: 2484-trunk.txt, 2484.txt


 After pulling hair out about why weird errors were happening loading data 
 from cassandra with seemingly irrelevant changes to the pig scripts (mostly 
 changing the script trying to debug other problems), it looks like the weird 
 errors were because of the implementation we currently have for LoadPushDaown 
 in CassandraStorage.  Unless there is a good reason to implement it, I feel 
 like we should just remove the few lines that are in there until we can spend 
 some serious time doing an implementation of it.

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


svn commit: r1094694 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java

2011-04-18 Thread brandonwilliams
Author: brandonwilliams
Date: Mon Apr 18 18:57:23 2011
New Revision: 1094694

URL: http://svn.apache.org/viewvc?rev=1094694view=rev
Log:
Revert Keep endpoint state until aVeryLongTime when not a fat client

This reverts commit db9164ffd96ebc7752fc5789c90c7211ba323ad2.

For CASSANDRA-2371.

Modified:

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

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=1094694r1=1094693r2=1094694view=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
 Mon Apr 18 18:57:23 2011
@@ -237,18 +237,17 @@ public class Gossiper implements IFailur
 }
 
 /**
- * Removes the endpoint from gossip completely
+ * Removes the endpoint from unreachable endpoint set
  *
  * @param endpoint endpoint to be removed from the current membership.
 */
 void evictFromMembership(InetAddress endpoint)
 {
 unreachableEndpoints_.remove(endpoint);
-endpointStateMap_.remove(endpoint);
 }
 
 /**
- * Removes the endpoint from Gossip but retains endpoint state
+ * Removes the endpoint completely from Gossip
  */
 public void removeEndpoint(InetAddress endpoint)
 {
@@ -258,7 +257,7 @@ public class Gossiper implements IFailur
 
 liveEndpoints_.remove(endpoint);
 unreachableEndpoints_.remove(endpoint);
-// do not remove endpointState until aVeryLongTime
+// do not remove endpointState until the quarantine expires
 FailureDetector.instance.remove(endpoint);
 justRemovedEndpoints_.put(endpoint, System.currentTimeMillis());
 }
@@ -428,15 +427,20 @@ public class Gossiper implements IFailur
 {
 long duration = now - epState.getUpdateTimestamp();
 
-if 
(StorageService.instance.getTokenMetadata().isMember(endpoint))
-epState.setHasToken(true);
 // check if this is a fat client. fat clients are removed 
automatically from
 // gosip after FatClientTimeout
-if (!epState.getHasToken()  !epState.isAlive()  
!justRemovedEndpoints_.containsKey(endpoint)  (duration  FatClientTimeout_))
+if (!epState.getHasToken()  !epState.isAlive()  (duration 
 FatClientTimeout_))
 {
-logger_.info(FatClient  + endpoint +  has been silent 
for  + FatClientTimeout_ + ms, removing from gossip);
-removeEndpoint(endpoint); // will put it in 
justRemovedEndpoints to respect quarantine delay
-evictFromMembership(endpoint); // can get rid of the state 
immediately
+if 
(StorageService.instance.getTokenMetadata().isMember(endpoint))
+epState.setHasToken(true);
+else
+{
+if (!justRemovedEndpoints_.containsKey(endpoint)) // 
if the node was decommissioned, it will have been removed but still appear as a 
fat client
+{
+logger_.info(FatClient  + endpoint +  has been 
silent for  + FatClientTimeout_ + ms, removing from gossip);
+removeEndpoint(endpoint); // after quarantine 
justRemoveEndpoints will remove the state
+}
+}
 }
 
 if ( !epState.isAlive()  (duration  aVeryLongTime_) )
@@ -456,6 +460,7 @@ public class Gossiper implements IFailur
 if (logger_.isDebugEnabled())
 logger_.debug(QUARANTINE_DELAY +  elapsed,  + 
entry.getKey() +  gossip quarantine over);
 justRemovedEndpoints_.remove(entry.getKey());
+endpointStateMap_.remove(entry.getKey());
 }
 }
 }




[jira] [Assigned] (CASSANDRA-2496) Gossip should handle 'dead' states

2011-04-18 Thread Brandon Williams (JIRA)

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

Brandon Williams reassigned CASSANDRA-2496:
---

Assignee: Brandon Williams

 Gossip should handle 'dead' states
 --

 Key: CASSANDRA-2496
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2496
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams

 For background, see CASSANDRA-2371

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


[jira] [Created] (CASSANDRA-2496) Gossip should handle 'dead' states

2011-04-18 Thread Brandon Williams (JIRA)
Gossip should handle 'dead' states
--

 Key: CASSANDRA-2496
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2496
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams


For background, see CASSANDRA-2371

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


[jira] [Resolved] (CASSANDRA-2371) Removed/Dead Node keeps reappearing

2011-04-18 Thread Brandon Williams (JIRA)

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

Brandon Williams resolved CASSANDRA-2371.
-

Resolution: Fixed

Reverted CASSANDRA-2115 and created CASSANDRA-2496 to fix this correctly.

 Removed/Dead Node keeps reappearing
 ---

 Key: CASSANDRA-2371
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2371
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.7.3, 0.7.4
 Environment: Large Amazon EC2 instances. Ubuntu 10.04.2 
Reporter: techlabs
Assignee: Brandon Williams
Priority: Minor
 Fix For: 0.7.5

 Attachments: 2371.txt


 The removetoken option does not seem to work. The original node 10.240.50.63 
 comes back into the ring, even after the EC2 instance is no longer in 
 existence. Originally I tried to add a new node 10.214.103.224 with the same 
 token, but there were some complications with that. I have pasted below all 
 the INFO log entries found with greping the system log files.
 Seems to be a similar issue seen with 
 http://cassandra-user-incubator-apache-org.3065146.n2.nabble.com/Ghost-node-showing-up-in-the-ring-td6198180.html
  
 INFO [GossipStage:1] 2011-03-16 00:54:31,590 StorageService.java (line 745) 
 Nodes /10.214.103.224 and /10.240.50.63 have the same token 
 957044156965139000.  /10.214.103.224 is the new owner
  INFO [GossipStage:1] 2011-03-16 17:26:51,083 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:27:24,767 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:29:30,191 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:31:35,609 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:33:39,440 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-23 17:22:55,520 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.240.50.63
  INFO [GossipStage:1] 2011-03-10 03:52:37,299 Gossiper.java (line 608) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-10 03:52:37,545 Gossiper.java (line 600) 
 InetAddress /10.240.50.63 is now UP
  INFO [HintedHandoff:1] 2011-03-10 03:53:36,168 HintedHandOffManager.java 
 (line 304) Started hinted handoff for endpoint /10.240.50.63
  INFO [HintedHandoff:1] 2011-03-10 03:53:36,169 HintedHandOffManager.java 
 (line 360) Finished hinted handoff of 0 rows to endpoint /10.240.50.63
  INFO [GossipStage:1] 2011-03-15 23:23:43,770 Gossiper.java (line 623) Node 
 /10.240.50.63 has restarted, now UP again
  INFO [GossipStage:1] 2011-03-15 23:23:43,771 StorageService.java (line 726) 
 Node /10.240.50.63 state jump to normal
  INFO [HintedHandoff:1] 2011-03-15 23:28:48,957 HintedHandOffManager.java 
 (line 304) Started hinted handoff for endpoint /10.240.50.63
  INFO [HintedHandoff:1] 2011-03-15 23:28:48,958 HintedHandOffManager.java 
 (line 360) Finished hinted handoff of 0 rows to endpoint /10.240.50.63
  INFO [ScheduledTasks:1] 2011-03-15 23:37:25,071 Gossiper.java (line 226) 
 InetAddress /10.240.50.63 is now dead.
  INFO [GossipStage:1] 2011-03-16 00:54:31,590 StorageService.java (line 745) 
 Nodes /10.214.103.224 and /10.240.50.63 have the same token 
 957044156965139000.  /10.214.103.224 is the new owner
  WARN [GossipStage:1] 2011-03-16 00:54:31,590 TokenMetadata.java (line 115) 
 Token 957044156965139000 changing ownership from 
 /10.240.50.63 to /10.214.103.224
  INFO [GossipStage:1] 2011-03-18 23:37:09,158 Gossiper.java (line 610) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-21 23:37:10,421 Gossiper.java (line 610) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-21 23:37:10,421 StorageService.java (line 726) 
 Node /10.240.50.63 state jump to normal
  INFO [GossipStage:1] 2011-03-23 17:22:55,520 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.240.50.63
  INFO [ScheduledTasks:1] 2011-03-23 17:22:55,521 HintedHandOffManager.java 
 (line 210) Deleting any stored hints for 10.240.50.63

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


[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-2405:


Thanks for your comment Peter, I agree on both - timestamp should be stored 
right before validation compaction is started (AES line 618) which is flushing 
data btw and that this information should be persisted into system tables. 
Another question is open for consideration - what should we return if we don't 
have any information about given KS/CF: -1 or throw an exception?

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Commented] (CASSANDRA-2470) Secondary Indexes Build Very Slowly

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2470:
---

I'm thinking that our best bet here is CASSANDRA-2324 (if repair doesn't 
transfer a lot more data than necessary, index building will also be faster).

 Secondary Indexes Build Very Slowly
 ---

 Key: CASSANDRA-2470
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2470
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benjamin Coverston
  Labels: repair, secondary_index

 While running repair I noticed that the time it took to run was easily 
 dominated by building the secondary indexes. They currently build at a rate 
 of  200KB/Second. This means that indexing a 500MB file takes nearly an hour 
 to index the file.
 Because this happens on the compaction thread it also causes repair to back 
 up in general, which for very active systems is a very bad thing.
 I suggest we look at it in the hope that we can improve the rate in which we 
 build the indexes by an order of magnitude.

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


[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Peter Schuller (JIRA)

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

Peter Schuller commented on CASSANDRA-2405:
---

The best solution I can think of is to populate the information on CF creation 
with the timestamp that represents the time the CF was created on the node. If 
the node was bootstrapped as usual, that would have happened after the local CF 
creation. If it was not (e.g. forcefully inserted into the ring), then some 
operator has explicitly made the choice of entering it into the ring 
inconsistently anyway so it doesn't matter.

If this is easy to do, I think it would make for a really clean solution from 
the point of view of the user. The nodetool command would always return valid 
data except if something is truly broken; not even a single edge case to deal 
with. Simplicity rocks for this type of thing (for writing a monitoring script 
to trigger an alarm).

If that's overkill/non-easy, I dunno - slight preference for throwing an 
exception just because I really dislike silent failures and returning an 
out-of-band integer seems more likely to go unnoticed if somehow it never 
changes because repair is *never* run, for example. I.e, either your monitoring 
script treats -1 as an error anyway (so it's no worse in terms of triggering 
the alarm unnecessarily than an exception), or it doesn't - in which case you 
have a silent failure mode in the case of perpetual lack of repair running.

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Commented] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-2405:


SGTM, I will try to stick with the first scenario populating data on the CF 
creation.

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Commented] (CASSANDRA-1497) Add input support for Hadoop Streaming

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-1497:
---

The main reason for going with a binary format initially instead of plaintext 
was that, at the time, we had limited information about
column types.

Now that we have column_metadata we've been moving towards more human-readable 
formats (e.g. https://issues.apache.org/jira/browse/CASSANDRA-1933).  Key types 
are newer (https://issues.apache.org/jira/browse/CASSANDRA-2311) but the same 
principle applies.

Sure feels like (typed) json would be a better fit today than Avro or Thrift.

 Add input support for Hadoop Streaming
 --

 Key: CASSANDRA-1497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1497
 Project: Cassandra
  Issue Type: New Feature
  Components: Hadoop
Reporter: Jeremy Hanna
 Attachments: 0001-An-updated-avro-based-input-streaming-solution.patch


 related to CASSANDRA-1368 - create similar functionality for input streaming.

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


[jira] [Updated] (CASSANDRA-2497) Issues with Update Column Family and adding a key_validation_class

2011-04-18 Thread Cathy Daw (JIRA)

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

Cathy Daw updated CASSANDRA-2497:
-

Environment: 
* Single Node instance on MacOSX

* Nightly Compiled Build from 4/18/2011

* Installed from: 
https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz

 Issues with Update Column Family and adding a key_validation_class
 --

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Priority: Critical

 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


[jira] [Created] (CASSANDRA-2497) Issues with Update Column Family and adding a key_validation_class

2011-04-18 Thread Cathy Daw (JIRA)
Issues with Update Column Family and adding a key_validation_class
--

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
Reporter: Cathy Daw
Priority: Critical


*Reproduction Steps*
{code}
create column family users with comparator = UTF8Type 
and column_metadata = [{column_name: password, validation_class: UTF8Type}];

update column family users with key_validation_class=UTF8Type;

set users['jsmith']['password']='ch@ngem3';  
{code}


*EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
through successfully.


*ACTUAL RESULT:*  The SET statement gives the same error message, regardless of 
the UPDATE statement: 
{code}
org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as hex 
bytes
{code}


*Output from describe keyspace*
{code}
ColumnFamily: users
  Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
  Default column value validator: org.apache.cassandra.db.marshal.BytesType
  Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
  Row cache size / save period in seconds: 0.0/0
  Key cache size / save period in seconds: 20.0/14400
  Memtable thresholds: 0.290624997/62/1440 (millions of 
ops/MB/minutes)
  GC grace seconds: 864000
  Compaction min/max thresholds: 4/32
  Read repair chance: 1.0
  Replicate on write: false
  Built indexes: []
  Column Metadata:
Column Name: password
  Validation Class: org.apache.cassandra.db.marshal.UTF8Type

{code}


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


[jira] [Commented] (CASSANDRA-2371) Removed/Dead Node keeps reappearing

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2371:
---

Integrated in Cassandra-0.7 #440 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/440/])
Revert Keep endpoint state until aVeryLongTime when not a fat client

This reverts commit db9164ffd96ebc7752fc5789c90c7211ba323ad2.

For CASSANDRA-2371.


 Removed/Dead Node keeps reappearing
 ---

 Key: CASSANDRA-2371
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2371
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.7.3, 0.7.4
 Environment: Large Amazon EC2 instances. Ubuntu 10.04.2 
Reporter: techlabs
Assignee: Brandon Williams
Priority: Minor
 Fix For: 0.7.5

 Attachments: 2371.txt


 The removetoken option does not seem to work. The original node 10.240.50.63 
 comes back into the ring, even after the EC2 instance is no longer in 
 existence. Originally I tried to add a new node 10.214.103.224 with the same 
 token, but there were some complications with that. I have pasted below all 
 the INFO log entries found with greping the system log files.
 Seems to be a similar issue seen with 
 http://cassandra-user-incubator-apache-org.3065146.n2.nabble.com/Ghost-node-showing-up-in-the-ring-td6198180.html
  
 INFO [GossipStage:1] 2011-03-16 00:54:31,590 StorageService.java (line 745) 
 Nodes /10.214.103.224 and /10.240.50.63 have the same token 
 957044156965139000.  /10.214.103.224 is the new owner
  INFO [GossipStage:1] 2011-03-16 17:26:51,083 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:27:24,767 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:29:30,191 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:31:35,609 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-19 17:33:39,440 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.214.103.224
  INFO [GossipStage:1] 2011-03-23 17:22:55,520 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.240.50.63
  INFO [GossipStage:1] 2011-03-10 03:52:37,299 Gossiper.java (line 608) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-10 03:52:37,545 Gossiper.java (line 600) 
 InetAddress /10.240.50.63 is now UP
  INFO [HintedHandoff:1] 2011-03-10 03:53:36,168 HintedHandOffManager.java 
 (line 304) Started hinted handoff for endpoint /10.240.50.63
  INFO [HintedHandoff:1] 2011-03-10 03:53:36,169 HintedHandOffManager.java 
 (line 360) Finished hinted handoff of 0 rows to endpoint /10.240.50.63
  INFO [GossipStage:1] 2011-03-15 23:23:43,770 Gossiper.java (line 623) Node 
 /10.240.50.63 has restarted, now UP again
  INFO [GossipStage:1] 2011-03-15 23:23:43,771 StorageService.java (line 726) 
 Node /10.240.50.63 state jump to normal
  INFO [HintedHandoff:1] 2011-03-15 23:28:48,957 HintedHandOffManager.java 
 (line 304) Started hinted handoff for endpoint /10.240.50.63
  INFO [HintedHandoff:1] 2011-03-15 23:28:48,958 HintedHandOffManager.java 
 (line 360) Finished hinted handoff of 0 rows to endpoint /10.240.50.63
  INFO [ScheduledTasks:1] 2011-03-15 23:37:25,071 Gossiper.java (line 226) 
 InetAddress /10.240.50.63 is now dead.
  INFO [GossipStage:1] 2011-03-16 00:54:31,590 StorageService.java (line 745) 
 Nodes /10.214.103.224 and /10.240.50.63 have the same token 
 957044156965139000.  /10.214.103.224 is the new owner
  WARN [GossipStage:1] 2011-03-16 00:54:31,590 TokenMetadata.java (line 115) 
 Token 957044156965139000 changing ownership from 
 /10.240.50.63 to /10.214.103.224
  INFO [GossipStage:1] 2011-03-18 23:37:09,158 Gossiper.java (line 610) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-21 23:37:10,421 Gossiper.java (line 610) Node 
 /10.240.50.63 is now part of the cluster
  INFO [GossipStage:1] 2011-03-21 23:37:10,421 StorageService.java (line 726) 
 Node /10.240.50.63 state jump to normal
  INFO [GossipStage:1] 2011-03-23 17:22:55,520 StorageService.java (line 865) 
 Removing token 957044156965139000 for /10.240.50.63
  INFO [ScheduledTasks:1] 2011-03-23 17:22:55,521 HintedHandOffManager.java 
 (line 210) Deleting any stored hints for 10.240.50.63

--
This message is automatically generated by JIRA.
For more information on JIRA, see: 

[jira] [Commented] (CASSANDRA-2497) Issues with Update Column Family and adding a key_validation_class

2011-04-18 Thread Cathy Daw (JIRA)

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

Cathy Daw commented on CASSANDRA-2497:
--

This may not be related to the UPDATE.
I dropped and recreated the CF and still had the same issue.

{code}
[default@cathy] drop column family users;
72a86490-69f4-11e0--242d50cf1fd4
Waiting for schema agreement...
... schemas agree across the cluster

[default@cathy] create column family users with comparator = UTF8Type and 
key_validation_class=UTF8Type and column_metadata = [{column_name: password, 
validation_class: UTF8Type}];
8a09a720-69f4-11e0--242d50cf1fd4
Waiting for schema agreement...
... schemas agree across the cluster

[default@cathy] set users['jsmith']['password']='ch@ngem3';
org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as hex 
bytes

{code}


*Output from describe keyspace after drop/create*
{code}
ColumnFamily: users
  Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
  Default column value validator: org.apache.cassandra.db.marshal.BytesType
  Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
  Row cache size / save period in seconds: 0.0/0
  Key cache size / save period in seconds: 20.0/14400
  Memtable thresholds: 0.290624997/62/1440 (millions of 
ops/MB/minutes)
  GC grace seconds: 864000
  Compaction min/max thresholds: 4/32
  Read repair chance: 1.0
  Replicate on write: false
  Built indexes: []
  Column Metadata:
Column Name: password
  Validation Class: org.apache.cassandra.db.marshal.UTF8Type
{code}

 Issues with Update Column Family and adding a key_validation_class
 --

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Priority: Critical

 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


[jira] [Updated] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Cathy Daw (JIRA)

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

Cathy Daw updated CASSANDRA-2497:
-

Description: 
*Original Summary*: Issues with Update Column Family and adding a 
key_validation_class
_Changed summary because the issue repros on drop/create.  see comment._

*Reproduction Steps*
{code}
create column family users with comparator = UTF8Type 
and column_metadata = [{column_name: password, validation_class: UTF8Type}];

update column family users with key_validation_class=UTF8Type;

set users['jsmith']['password']='ch@ngem3';  
{code}


*EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
through successfully.


*ACTUAL RESULT:*  The SET statement gives the same error message, regardless of 
the UPDATE statement: 
{code}
org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as hex 
bytes
{code}


*Output from describe keyspace*
{code}
ColumnFamily: users
  Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
  Default column value validator: org.apache.cassandra.db.marshal.BytesType
  Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
  Row cache size / save period in seconds: 0.0/0
  Key cache size / save period in seconds: 20.0/14400
  Memtable thresholds: 0.290624997/62/1440 (millions of 
ops/MB/minutes)
  GC grace seconds: 864000
  Compaction min/max thresholds: 4/32
  Read repair chance: 1.0
  Replicate on write: false
  Built indexes: []
  Column Metadata:
Column Name: password
  Validation Class: org.apache.cassandra.db.marshal.UTF8Type

{code}


  was:
*Reproduction Steps*
{code}
create column family users with comparator = UTF8Type 
and column_metadata = [{column_name: password, validation_class: UTF8Type}];

update column family users with key_validation_class=UTF8Type;

set users['jsmith']['password']='ch@ngem3';  
{code}


*EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
through successfully.


*ACTUAL RESULT:*  The SET statement gives the same error message, regardless of 
the UPDATE statement: 
{code}
org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as hex 
bytes
{code}


*Output from describe keyspace*
{code}
ColumnFamily: users
  Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
  Default column value validator: org.apache.cassandra.db.marshal.BytesType
  Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
  Row cache size / save period in seconds: 0.0/0
  Key cache size / save period in seconds: 20.0/14400
  Memtable thresholds: 0.290624997/62/1440 (millions of 
ops/MB/minutes)
  GC grace seconds: 864000
  Compaction min/max thresholds: 4/32
  Read repair chance: 1.0
  Replicate on write: false
  Built indexes: []
  Column Metadata:
Column Name: password
  Validation Class: org.apache.cassandra.db.marshal.UTF8Type

{code}


Summary: CLI: issue with keys being interpreted as hex and causing SET 
statement to fail  (was: Issues with Update Column Family and adding a 
key_validation_class)

 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Priority: Critical

 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns 

[jira] [Updated] (CASSANDRA-2405) should expose 'time since last successful repair' for easier aes monitoring

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2405:
---

Component/s: Core

 should expose 'time since last successful repair' for easier aes monitoring
 ---

 Key: CASSANDRA-2405
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2405
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Peter Schuller
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.5

 Attachments: CASSANDRA-2405.patch


 The practical implementation issues of actually ensuring repair runs is 
 somewhat of an undocumented/untreated issue.
 One hopefully low hanging fruit would be to at least expose the time since 
 last successful repair for a particular column family, to make it easier to 
 write a correct script to monitor for lack of repair in a non-buggy fashion.

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


[jira] [Created] (CASSANDRA-2498) Improve read performance in update-intensive workload

2011-04-18 Thread Jonathan Ellis (JIRA)
Improve read performance in update-intensive workload
-

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


Read performance in an update-heavy environment relies heavily on compaction to 
maintain good throughput. (This is not the case for workloads where rows are 
only inserted once, because the bloom filter keeps us from having to check 
sstables unnecessarily.)

Very early versions of Cassandra attempted to mitigate this by checking 
sstables in descending generation order (mostly equivalent to descending 
mtime): once all the requested columns were found, it would not check any older 
sstables.

This was incorrect, because data timestamp will not correspond to sstable 
timestamp, both because compaction has the side effect of refreshing data to 
a newer sstable, and because hintead handoff may send us data older than what 
we already have.

Instead, we could create a per-sstable piece of metadata containing the most 
recent (client-specified) timestamp for any column in the sstable.  We could 
then sort sstables by this timestamp instead, and perform a similar 
optimization (if the remaining sstable client-timestamps are older than the 
oldest column found in the desired result set so far, we don't need to look 
further). Since under almost every workload, client timestamps of data in a 
given sstable will tend to be similar, we expect this to cut the number of 
sstables down proportionally to how frequently each column in the row is 
updated. (If each column is updated with each write, we only have to check a 
single sstable.)

This may also be useful information when deciding which SSTables to compact.

(Note that this optimization is only appropriate for named-column queries, not 
slice queries, since we don't know what non-overlapping columns may exist in 
older sstables.)

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


[jira] [Commented] (CASSANDRA-2470) Secondary Indexes Build Very Slowly

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2470:
---

CASSANDRA-2498 may also help, but I caution that it is tagged ponies. :)

 Secondary Indexes Build Very Slowly
 ---

 Key: CASSANDRA-2470
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2470
 Project: Cassandra
  Issue Type: Improvement
Reporter: Benjamin Coverston
  Labels: repair, secondary_index

 While running repair I noticed that the time it took to run was easily 
 dominated by building the secondary indexes. They currently build at a rate 
 of  200KB/Second. This means that indexing a 500MB file takes nearly an hour 
 to index the file.
 Because this happens on the compaction thread it also causes repair to back 
 up in general, which for very active systems is a very bad thing.
 I suggest we look at it in the hope that we can improve the rate in which we 
 build the indexes by an order of magnitude.

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


[jira] [Commented] (CASSANDRA-2498) Improve read performance in update-intensive workload

2011-04-18 Thread Peter Schuller (JIRA)

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

Peter Schuller commented on CASSANDRA-2498:
---

Sounds good; a trade-off to keep in mind is that it optimizes for throughput 
(number of sstables touched) at the cost of latency (because of the inability 
to submit read requests concurrently since they become dependent). Probably 
makes sense for most workloads.

 Improve read performance in update-intensive workload
 -

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


 Read performance in an update-heavy environment relies heavily on compaction 
 to maintain good throughput. (This is not the case for workloads where rows 
 are only inserted once, because the bloom filter keeps us from having to 
 check sstables unnecessarily.)
 Very early versions of Cassandra attempted to mitigate this by checking 
 sstables in descending generation order (mostly equivalent to descending 
 mtime): once all the requested columns were found, it would not check any 
 older sstables.
 This was incorrect, because data timestamp will not correspond to sstable 
 timestamp, both because compaction has the side effect of refreshing data 
 to a newer sstable, and because hintead handoff may send us data older than 
 what we already have.
 Instead, we could create a per-sstable piece of metadata containing the most 
 recent (client-specified) timestamp for any column in the sstable.  We could 
 then sort sstables by this timestamp instead, and perform a similar 
 optimization (if the remaining sstable client-timestamps are older than the 
 oldest column found in the desired result set so far, we don't need to look 
 further). Since under almost every workload, client timestamps of data in a 
 given sstable will tend to be similar, we expect this to cut the number of 
 sstables down proportionally to how frequently each column in the row is 
 updated. (If each column is updated with each write, we only have to check a 
 single sstable.)
 This may also be useful information when deciding which SSTables to compact.
 (Note that this optimization is only appropriate for named-column queries, 
 not slice queries, since we don't know what non-overlapping columns may exist 
 in older sstables.)

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


[jira] [Commented] (CASSANDRA-2498) Improve read performance in update-intensive workload

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2498:
---

We've always been pretty up front about optimizing for throughput over latency, 
so this is nothing new...  But I think this wins on latency, too (as long as 
our architecture remains single-thread per read request), even on a best-case 
system where i/o is free, since deserializing + merging takes CPU too.  

 Improve read performance in update-intensive workload
 -

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


 Read performance in an update-heavy environment relies heavily on compaction 
 to maintain good throughput. (This is not the case for workloads where rows 
 are only inserted once, because the bloom filter keeps us from having to 
 check sstables unnecessarily.)
 Very early versions of Cassandra attempted to mitigate this by checking 
 sstables in descending generation order (mostly equivalent to descending 
 mtime): once all the requested columns were found, it would not check any 
 older sstables.
 This was incorrect, because data timestamp will not correspond to sstable 
 timestamp, both because compaction has the side effect of refreshing data 
 to a newer sstable, and because hintead handoff may send us data older than 
 what we already have.
 Instead, we could create a per-sstable piece of metadata containing the most 
 recent (client-specified) timestamp for any column in the sstable.  We could 
 then sort sstables by this timestamp instead, and perform a similar 
 optimization (if the remaining sstable client-timestamps are older than the 
 oldest column found in the desired result set so far, we don't need to look 
 further). Since under almost every workload, client timestamps of data in a 
 given sstable will tend to be similar, we expect this to cut the number of 
 sstables down proportionally to how frequently each column in the row is 
 updated. (If each column is updated with each write, we only have to check a 
 single sstable.)
 This may also be useful information when deciding which SSTables to compact.
 (Note that this optimization is only appropriate for named-column queries, 
 not slice queries, since we don't know what non-overlapping columns may exist 
 in older sstables.)

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


[jira] [Created] (CASSANDRA-2499) cassandra-env.sh pattern matching for OpenJDK broken in some cases

2011-04-18 Thread Tyler Hobbs (JIRA)
cassandra-env.sh pattern matching for OpenJDK broken in some cases
--

 Key: CASSANDRA-2499
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2499
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
Reporter: Tyler Hobbs


With bash version 4.1.5, the section of cassandra-env that tries to match the 
JDK distribution seems to have some kind of syntax error.  I get the following 
message when running bin/cassandra:

{noformat}
bin/../conf/cassandra-env.sh: 99: [[: not found
{noformat}

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


[jira] [Commented] (CASSANDRA-2494) Quorum reads are not consistent

2011-04-18 Thread Jeremiah Jordan (JIRA)

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

Jeremiah Jordan commented on CASSANDRA-2494:


I would think that reads at QUORUM should never go backwards.  Even if the 
Write was at ZERO.  If there were writes to the cluster of a=1 time=5, a=2 
time=10, a=3 time=15, and I do a read at QUORUM which tells me a=3 time=15, I 
should not be able to do another read at QUORUM and get a=2 time=10.

 Quorum reads are not consistent
 ---

 Key: CASSANDRA-2494
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2494
 Project: Cassandra
  Issue Type: Bug
Reporter: Sean Bridges

 As discussed in this thread,
 http://www.mail-archive.com/user@cassandra.apache.org/msg12421.html
 Quorum reads should be consistent.  Assume we have a cluster of 3 nodes 
 (X,Y,Z) and a replication factor of 3. If a write of N is committed to X, but 
 not Y and Z, then a read from X should not return N unless the read is 
 committed to at  least two nodes.  To ensure this, a read from X should wait 
 for an ack of the read repair write from either Y or Z before returning.
 Are there system tests for cassandra?  If so, there should be a test similar 
 to the original post in the email thread.  One thread should write 1,2,3... 
 at consistency level ONE.  Another thread should read at consistency level 
 QUORUM from a random host, and verify that each read is = the last read.

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


[jira] [Created] (CASSANDRA-2500) Ruby dbi client (for CQL) that conforms to AR:ConnectionAdapter

2011-04-18 Thread Jon Hermes (JIRA)
Ruby dbi client (for CQL) that conforms to AR:ConnectionAdapter
---

 Key: CASSANDRA-2500
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2500
 Project: Cassandra
  Issue Type: Task
Reporter: Jon Hermes
Assignee: Jon Hermes


Create a ruby driver for CQL.
Lacking something standard (such as py-dbapi), going with something common 
instead -- RoR ActiveRecord Connection Adapter 
(http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/AbstractAdapter.html).


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


[jira] [Commented] (CASSANDRA-2498) Improve read performance in update-intensive workload

2011-04-18 Thread Ryan King (JIRA)

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

Ryan King commented on CASSANDRA-2498:
--

In addition to update-heavy operations. Column Families with wide rows need 
some love on the latency side too.

 Improve read performance in update-intensive workload
 -

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


 Read performance in an update-heavy environment relies heavily on compaction 
 to maintain good throughput. (This is not the case for workloads where rows 
 are only inserted once, because the bloom filter keeps us from having to 
 check sstables unnecessarily.)
 Very early versions of Cassandra attempted to mitigate this by checking 
 sstables in descending generation order (mostly equivalent to descending 
 mtime): once all the requested columns were found, it would not check any 
 older sstables.
 This was incorrect, because data timestamp will not correspond to sstable 
 timestamp, both because compaction has the side effect of refreshing data 
 to a newer sstable, and because hintead handoff may send us data older than 
 what we already have.
 Instead, we could create a per-sstable piece of metadata containing the most 
 recent (client-specified) timestamp for any column in the sstable.  We could 
 then sort sstables by this timestamp instead, and perform a similar 
 optimization (if the remaining sstable client-timestamps are older than the 
 oldest column found in the desired result set so far, we don't need to look 
 further). Since under almost every workload, client timestamps of data in a 
 given sstable will tend to be similar, we expect this to cut the number of 
 sstables down proportionally to how frequently each column in the row is 
 updated. (If each column is updated with each write, we only have to check a 
 single sstable.)
 This may also be useful information when deciding which SSTables to compact.
 (Note that this optimization is only appropriate for named-column queries, 
 not slice queries, since we don't know what non-overlapping columns may exist 
 in older sstables.)

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


[jira] [Updated] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2497:
--

 Priority: Minor  (was: Critical)
Fix Version/s: 0.8

 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8


 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


[jira] [Issue Comment Edited] (CASSANDRA-2498) Improve read performance in update-intensive workload

2011-04-18 Thread Stu Hood (JIRA)

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

Stu Hood edited comment on CASSANDRA-2498 at 4/18/11 9:22 PM:
--

Linking to 1608, which proposed some related approaches:
# Partitioning by key/column so that the data size per partition is lower and 
requires less sstables
# Implementing Lucene-like deletes/supersedes, which would be written in newer 
files to prevent reads to older files at a key/block level

  was (Author: stuhood):
Linking to 1608, which proposed some related approaches:
# Partitioning by key/column so that the data size per partition is lower and 
requires less sstables
# Implementing Lucene-like deletes/supercedes, which would be written in newer 
files to prevent reads to older files at a key/block level
  
 Improve read performance in update-intensive workload
 -

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


 Read performance in an update-heavy environment relies heavily on compaction 
 to maintain good throughput. (This is not the case for workloads where rows 
 are only inserted once, because the bloom filter keeps us from having to 
 check sstables unnecessarily.)
 Very early versions of Cassandra attempted to mitigate this by checking 
 sstables in descending generation order (mostly equivalent to descending 
 mtime): once all the requested columns were found, it would not check any 
 older sstables.
 This was incorrect, because data timestamp will not correspond to sstable 
 timestamp, both because compaction has the side effect of refreshing data 
 to a newer sstable, and because hintead handoff may send us data older than 
 what we already have.
 Instead, we could create a per-sstable piece of metadata containing the most 
 recent (client-specified) timestamp for any column in the sstable.  We could 
 then sort sstables by this timestamp instead, and perform a similar 
 optimization (if the remaining sstable client-timestamps are older than the 
 oldest column found in the desired result set so far, we don't need to look 
 further). Since under almost every workload, client timestamps of data in a 
 given sstable will tend to be similar, we expect this to cut the number of 
 sstables down proportionally to how frequently each column in the row is 
 updated. (If each column is updated with each write, we only have to check a 
 single sstable.)
 This may also be useful information when deciding which SSTables to compact.
 (Note that this optimization is only appropriate for named-column queries, 
 not slice queries, since we don't know what non-overlapping columns may exist 
 in older sstables.)

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


[jira] [Commented] (CASSANDRA-2221) 'show create' commands on the CLI to export schema

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2221:
---

at this point is probably best to target CQL-style schema.

 'show create' commands on the CLI to export schema
 --

 Key: CASSANDRA-2221
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2221
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Jeremy Hanna
Assignee: Aaron Morton
Priority: Minor
  Labels: cli
 Fix For: 0.7.5


 It would be nice to have 'show create' type of commands on the command-line 
 so that it would generate the DDL for the schema.
 A scenario that would make this useful is where a team works out a data model 
 over time with a dev cluster.  They want to use parts of that schema for new 
 clusters that they create, like a staging/prod cluster.  It would be very 
 handy in this scenario to have some sort of export mechanism.
 Another use case is for testing purposes - you want to replicate a problem.
 We currently have schematool for import/export but that is deprecated and it 
 exports into yaml.
 This new feature would just be able to 'show' - or export if they want the 
 entire keyspace - into a script or commands that could be used in a cli 
 script.  It would need to be able to regenerate everything about the keyspace 
 including indexes and metadata.

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


[jira] [Commented] (CASSANDRA-1497) Add input support for Hadoop Streaming

2011-04-18 Thread Jeremy Hanna (JIRA)

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

Jeremy Hanna commented on CASSANDRA-1497:
-

The patch that I had submitted moves everything about the RecordReader into an 
abstract class except the actual marshalling/unmarshalling of the data.  So it 
could be used to build a typed json impl.  It would also make it so people 
could make their own serialization mechanisms - say for Dumbo, the python based 
MR programs.

 Add input support for Hadoop Streaming
 --

 Key: CASSANDRA-1497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1497
 Project: Cassandra
  Issue Type: New Feature
  Components: Hadoop
Reporter: Jeremy Hanna
 Attachments: 0001-An-updated-avro-based-input-streaming-solution.patch


 related to CASSANDRA-1368 - create similar functionality for input streaming.

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


svn commit: r1094780 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: db/Column.java db/ColumnFamily.java db/DeletedColumn.java db/ExpiringColumn.java db/IColumn.java db/SuperColu

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 21:44:00 2011
New Revision: 1094780

URL: http://svn.apache.org/viewvc?rev=1094780view=rev
Log:
Make scrub validate column fields
patch by slebresne; reviewed by jbellis for CASSANDRA-2460

Modified:

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

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

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

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

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

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

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

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Column.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Column.java?rev=1094780r1=1094779r2=1094780view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Column.java 
(original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Column.java 
Mon Apr 18 21:44:00 2011
@@ -26,7 +26,9 @@ import java.util.Collection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.io.util.DataOutputBuffer;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
@@ -232,5 +234,19 @@ public class Column implements IColumn
 {
 return !isMarkedForDelete();
 }
+
+protected void validateName(CFMetaData metadata) throws MarshalException
+{
+AbstractType nameValidator = metadata.cfType == ColumnFamilyType.Super 
? metadata.subcolumnComparator : metadata.comparator;
+nameValidator.validate(name());
+}
+
+public void validateFields(CFMetaData metadata) throws MarshalException
+{
+validateName(metadata);
+AbstractType valueValidator = metadata.getValueValidator(name());
+if (valueValidator != null)
+valueValidator.validate(value());
+}
 }
 

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1094780r1=1094779r2=1094780view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamily.java
 Mon Apr 18 21:44:00 2011
@@ -35,6 +35,7 @@ import org.apache.cassandra.config.CFMet
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.io.IColumnSerializer;
 import org.apache.cassandra.io.util.IIterableColumns;
 import org.apache.cassandra.utils.FBUtilities;
@@ -424,4 +425,18 @@ public class ColumnFamily implements ICo
 remove(column.name());
 addColumn(column.deepCopy());
 }
+
+/**
+ * Goes over all columns and check the fields are valid (as far as we can
+ * tell).
+ * This is used to detect corruption after deserialization.
+ */
+public void validateColumnFields() throws MarshalException
+{
+CFMetaData metadata = metadata();
+for (IColumn column : getSortedColumns())
+{
+column.validateFields(metadata);
+}
+}
 }

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DeletedColumn.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DeletedColumn.java?rev=1094780r1=1094779r2=1094780view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DeletedColumn.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/DeletedColumn.java
 Mon Apr 18 21:44:00 2011
@@ -23,6 +23,8 @@ import java.nio.ByteBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.db.marshal.MarshalException;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class DeletedColumn extends Column
@@ -62,4 +64,14 @@ public class DeletedColumn extends Colum
 {
 return new DeletedColumn(ByteBufferUtil.clone(name), 

[jira] [Issue Comment Edited] (CASSANDRA-1497) Add input support for Hadoop Streaming

2011-04-18 Thread Jeremy Hanna (JIRA)

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

Jeremy Hanna edited comment on CASSANDRA-1497 at 4/18/11 9:45 PM:
--

The patch that I had submitted moves everything about the RecordReader into an 
abstract class except the actual marshalling/unmarshalling of the data.  So it 
could be used to build a typed json impl.  It would also make it so people 
could make their own serialization mechanisms - say for Dumbo, a python way to 
do hadoop MR.

  was (Author: jeromatron):
The patch that I had submitted moves everything about the RecordReader into 
an abstract class except the actual marshalling/unmarshalling of the data.  So 
it could be used to build a typed json impl.  It would also make it so people 
could make their own serialization mechanisms - say for Dumbo, the python based 
MR programs.
  
 Add input support for Hadoop Streaming
 --

 Key: CASSANDRA-1497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1497
 Project: Cassandra
  Issue Type: New Feature
  Components: Hadoop
Reporter: Jeremy Hanna
 Attachments: 0001-An-updated-avro-based-input-streaming-solution.patch


 related to CASSANDRA-1368 - create similar functionality for input streaming.

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


[jira] [Commented] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Cathy Daw (JIRA)

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

Cathy Daw commented on CASSANDRA-2497:
--

Restarting the CLI did not fix the issue.
Adding an assume for the key type did.

{code}
[default@cathy] set users['jsmith']['password']='ch@ngem3';
org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as hex 
bytes

[default@cathy] assume users keys as ascii;
Assumption for column family 'users' added successfully.

[default@cathy] set users['jsmith']['password']='ch@ngem3';
Value inserted.
{code}


 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8


 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


svn commit: r1094789 - in /cassandra/branches/cassandra-0.7: ./ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/streaming/ test/unit/org/apache/cassandra/streaming/

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 21:58:20 2011
New Revision: 1094789

URL: http://svn.apache.org/viewvc?rev=1094789view=rev
Log:
preserve version when streaming data from old sstables
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2283

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

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

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamIn.java

cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/BootstrapTest.java

cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/SerializationsTest.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1094789r1=1094788r2=1094789view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Mon Apr 18 21:58:20 2011
@@ -30,6 +30,7 @@
  * use 64KB flush buffer instead of in_memory_compaction_limit (CASSANDRA-2463)
  * fix duplicate results from CFS.scan (CASSANDRA-2406)
  * avoid caching token-only decoratedkeys (CASSANDRA-2416)
+ * preserve version when streaming data from old sstables (CASSANDRA-2283)
 
 
 0.7.4

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1094789r1=1094788r2=1094789view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Mon Apr 18 21:58:20 2011
@@ -657,23 +657,29 @@ public class ColumnFamilyStore implement
 return columnFamily;
 }
 
+public String getFlushPath()
+{
+return getFlushPath(Descriptor.CURRENT_VERSION);
+}
+
 /*
  * @return a temporary file name for an sstable.
  * When the sstable object is closed, it will be renamed to a non-temporary
  * format, so incomplete sstables can be recognized and removed on startup.
  */
-public String getFlushPath()
+public String getFlushPath(String version)
 {
 long guessedSize = 2L * memsize.value() * 1024*1024; // 2* adds room 
for keys, column indexes
 String location = 
DatabaseDescriptor.getDataFileLocationForTable(table.name, guessedSize);
 if (location == null)
 throw new RuntimeException(Insufficient disk space to flush);
-return getTempSSTablePath(location);
+return getTempSSTablePath(location, version);
 }
 
-public String getTempSSTablePath(String directory)
+public String getTempSSTablePath(String directory, String version)
 {
-Descriptor desc = new Descriptor(new File(directory),
+Descriptor desc = new Descriptor(version,
+ new File(directory),
  table.name,
  columnFamily,
  fileIndexGenerator.incrementAndGet(),
@@ -681,6 +687,11 @@ public class ColumnFamilyStore implement
 return desc.filenameFor(Component.DATA);
 }
 
+public String getTempSSTablePath(String directory)
+{
+return getTempSSTablePath(directory, Descriptor.CURRENT_VERSION);
+}
+
 /** flush the given memtable and swap in a new one for its CFS, if it 
hasn't been frozen already.  threadsafe. */
 Future? maybeSwitchMemtable(Memtable oldMemtable, final boolean 
writeCommitLog)
 {

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamIn.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamIn.java?rev=1094789r1=1094788r2=1094789view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamIn.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/streaming/StreamIn.java
 Mon Apr 18 21:58:20 2011
@@ -49,11 +49,6 @@ public class StreamIn
 /**
  * Request ranges to be transferred from source to local node
  */
-public static void requestRanges(InetAddress source, String tableName, 
CollectionRange ranges)
-{
-requestRanges(source, tableName, ranges, null);
-}
-
 public static void requestRanges(InetAddress source, String tableName, 
CollectionRange ranges, Runnable callback)
 {
 assert ranges.size()  0;
@@ -74,7 +69,7 @@ public class StreamIn
 // new local sstable
 Table 

[jira] [Commented] (CASSANDRA-2460) Make scrub validate deserialized columns

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2460:
---

Integrated in Cassandra-0.7 #441 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/441/])
Make scrub validate column fields
patch by slebresne; reviewed by jbellis for CASSANDRA-2460


 Make scrub validate deserialized columns
 

 Key: CASSANDRA-2460
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2460
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
 Fix For: 0.7.5

 Attachments: 0001-Make-scrub-check-column-fields-v2.patch, 
 0001-Make-scrub-check-column-fields.patch

   Original Estimate: 4h
  Remaining Estimate: 4h

 Right now, scrub deserialize the columns but don't validate the fields, and 
 such there is a number of errors it could fix (or at least corrupted rows it 
 could skip) but don't.
 This ticket proposes to handle those errors.

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


[jira] [Commented] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-2497:


Than it seems to be a problem in the core as CLI always runs 
system_update(add)_column_family with the newest attributes passed in the 
executeUpdate(Add)ColumnFamily and then re-caches CF by calling 
describe_keyspace. Looks like value from the key_validation_class is not stored 
properly on the cassandra end (just tested that). 

 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8


 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


[jira] [Updated] (CASSANDRA-1740) Nodetool commands to query and stop compaction, repair, cleanup and scrub

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-1740:
--

Fix Version/s: (was: 0.7.5)
   0.7.6

Stu, are you planning to multithreadify this, then?

 Nodetool commands to query and stop compaction, repair, cleanup and scrub
 -

 Key: CASSANDRA-1740
 URL: https://issues.apache.org/jira/browse/CASSANDRA-1740
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Reporter: Chip Salzenberg
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.7.6

 Attachments: CASSANDRA-1740.patch

   Original Estimate: 24h
  Remaining Estimate: 24h

 The only way to stop compaction, repair, cleanup, or scrub in progress is to 
 stop and restart the entire Cassandra server.  Please provide nodetool 
 commands to query whether such things are running, and stop them if they are.

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


[jira] [Commented] (CASSANDRA-2290) Repair hangs if one of the neighbor is dead

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2290:
---

+1 the check-neighbors patch

 Repair hangs if one of the neighbor is dead
 ---

 Key: CASSANDRA-2290
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2290
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.6
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 0.7.5

 Attachments: 0001-Don-t-start-repair-if-a-neighbor-is-dead.patch

   Original Estimate: 1h
  Remaining Estimate: 1h

 Repair don't cope well with dead/dying neighbors. There is 2 problems:
   # Repair don't check if a node is dead before sending a TreeRequest; this 
 is easily fixable.
   # If a neighbor dies mid-repair, the repair will also hang forever.
 The second point is not easy to deal with. The best approach is probably 
 CASSANDRA-1740 however. That is, if we add a way to query the state of a 
 repair, and that this query correctly check all neighbors and also add a way 
 to cancel a repair, this would probably be enough.

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


[jira] [Updated] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2497:
---

Comment: was deleted

(was: Than it seems to be a problem in the core as CLI always runs 
system_update(add)_column_family with the newest attributes passed in the 
executeUpdate(Add)ColumnFamily and then re-caches CF by calling 
describe_keyspace. Looks like value from the key_validation_class is not stored 
properly on the cassandra end (just tested that). )

 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8


 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


[jira] [Commented] (CASSANDRA-2316) NoSuchElement exception on node which is streaming a repair

2011-04-18 Thread Stu Hood (JIRA)

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

Stu Hood commented on CASSANDRA-2316:
-

+1 For the assert.

 NoSuchElement exception on node which is streaming a repair
 ---

 Key: CASSANDRA-2316
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2316
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.6
Reporter: Jason Harvey
Assignee: Stu Hood
  Labels: repair
 Fix For: 0.7.5

 Attachments: 2316-assert.txt


 Running latest SVN snapshot of 0.7.
 When I ran a repair on a node, that node's neighbor threw the following 
 exception. Let me know what other info could be helpful.
 {code}
  INFO 23:43:44,358 Streaming to /10.251.166.15
 ERROR 23:50:21,321 Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.util.NoSuchElementException
 at 
 com.google.common.collect.AbstractIterator.next(AbstractIterator.java:146)
 at 
 org.apache.cassandra.service.AntiEntropyService$Validator.add(AntiEntropyService.java:366)
 at 
 org.apache.cassandra.db.CompactionManager.doValidationCompaction(CompactionManager.java:825)
 at 
 org.apache.cassandra.db.CompactionManager.access$800(CompactionManager.java:56)
 at 
 org.apache.cassandra.db.CompactionManager$6.call(CompactionManager.java:358)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
 at java.util.concurrent.FutureTask.run(FutureTask.java:166)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 {code}

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


svn commit: r1094796 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 22:16:29 2011
New Revision: 1094796

URL: http://svn.apache.org/viewvc?rev=1094796view=rev
Log:
Check for dead neighbors before starting repair
patch by slebresne; reviewed by jbellis for CASSANDRA-2290

Modified:

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

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1094796r1=1094795r2=1094796view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
 Mon Apr 18 22:16:29 2011
@@ -39,6 +39,7 @@ import org.apache.cassandra.db.Decorated
 import org.apache.cassandra.db.Table;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.gms.FailureDetector;
 import org.apache.cassandra.io.AbstractCompactedRow;
 import org.apache.cassandra.io.ICompactSerializer;
 import org.apache.cassandra.io.sstable.SSTableReader;
@@ -753,6 +754,16 @@ public class AntiEntropyService
 return;
 }
 
+// Checking all nodes are live
+for (InetAddress endpoint : endpoints)
+{
+if (!FailureDetector.instance.isAlive(endpoint))
+{
+logger.info(Could not proceed on repair because a 
neighbor ( + endpoint + ) is dead:  + getName() +  failed.);
+return;
+}
+}
+
 // begin a repair session
 Callback callback = new Callback();
 AntiEntropyService.this.sessions.put(getName(), callback);




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

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 22:19:13 2011
New Revision: 1094797

URL: http://svn.apache.org/viewvc?rev=1094797view=rev
Log:
merge CASSANDRA-2290 from 0.7

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:19:13 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:19:13 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-1091087,1091503,1091542,1091654,1094604,1094647
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796
 /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 Mon Apr 18 22:19:13 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-1091087,1091503,1091542,1091654,1094604,1094647
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796
 
/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 Mon Apr 18 22:19:13 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-1091087,1091503,1091542,1091654,1094604,1094647
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796
 
/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
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:19:13 2011
@@ -1,5 +1,5 @@
 

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

2011-04-18 Thread slebresne
Author: slebresne
Date: Mon Apr 18 22:21:26 2011
New Revision: 1094798

URL: http://svn.apache.org/viewvc?rev=1094798view=rev
Log:
merger CASSANDRA-2290 from 0.8

Modified:
cassandra/trunk/   (props changed)
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/AntiEntropyService.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:21:26 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094796
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090935-1094085,1094481
+/cassandra/branches/cassandra-0.8:1090935-1094085,1094481,1094797
 /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

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:21:26 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-1091087,1091503,1091542,1091654,1094481
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094481,1094796
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090935-1094085,1094481
+/cassandra/branches/cassandra-0.8/contrib:1090935-1094085,1094481,1094797
 /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 Mon Apr 18 22:21:26 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-1091087,1091503,1091542,1091654,1094481
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1094481,1094796
 
/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-1094085,1094481
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090935-1094085,1094481,1094797
 
/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: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 22:21:26 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094481
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094481,1094796
 

[jira] [Commented] (CASSANDRA-2283) Streaming Old Format Data Fails in 0.7.3 after upgrade from 0.6.8

2011-04-18 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2283:
---

Integrated in Cassandra-0.7 #442 (See 
[https://hudson.apache.org/hudson/job/Cassandra-0.7/442/])
preserve version when streaming data from old sstables
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2283


 Streaming Old Format Data Fails in 0.7.3 after upgrade from 0.6.8
 -

 Key: CASSANDRA-2283
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2283
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.7.1
 Environment: 0.7.3 upgraded from 0.6.8, Linux Java HotSpot(TM) 64-Bit 
 Server VM (build 17.1-b03, mixed mode)
Reporter: Erik Onnen
Assignee: Jonathan Ellis
 Fix For: 0.7.5

 Attachments: 2283.txt


 After successfully upgrading a 0.6.8 ring to 0.7.3, we needed to bootstrap in 
 a new node relatively quickly. When starting the new node with an assigned 
 token in auto bootstrap mode, we see the following exceptions on the new node:
 INFO [main] 2011-03-07 10:37:32,671 StorageService.java (line 505) Joining: 
 sleeping 3 ms for pending range setup
  INFO [main] 2011-03-07 10:38:02,679 StorageService.java (line 505) 
 Bootstrapping
  INFO [HintedHandoff:1] 2011-03-07 10:38:02,899 HintedHandOffManager.java 
 (line 304) Started hinted handoff for endpoint /10.211.14.200
  INFO [HintedHandoff:1] 2011-03-07 10:38:02,900 HintedHandOffManager.java 
 (line 360) Finished hinted handoff of 0 rows to endpoint /10.211.14.200
  INFO [CompactionExecutor:1] 2011-03-07 10:38:04,924 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuff-f-1
  INFO [CompactionExecutor:1] 2011-03-07 10:38:05,390 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuff-f-2
  INFO [CompactionExecutor:1] 2011-03-07 10:38:05,768 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuffid-f-1
  INFO [CompactionExecutor:1] 2011-03-07 10:38:06,389 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuffid-f-2
  INFO [CompactionExecutor:1] 2011-03-07 10:38:06,581 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuffid-f-3
 ERROR [CompactionExecutor:1] 2011-03-07 10:38:07,056 
 AbstractCassandraDaemon.java (line 114) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.io.EOFException
 at 
 org.apache.cassandra.io.sstable.IndexHelper.skipIndex(IndexHelper.java:65)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter$Builder.build(SSTableWriter.java:303)
 at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:923)
 at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:916)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
  INFO [CompactionExecutor:1] 2011-03-07 10:38:08,480 SSTableReader.java (line 
 154) Opening /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuffid-f-5
  INFO [CompactionExecutor:1] 2011-03-07 10:38:08,582 SSTableReader.java (line 
 154) Opening 
 /mnt/services/cassandra/var/data/0.7.3/data/Stuff/stuffid_reg_idx-f-1
 ERROR [CompactionExecutor:1] 2011-03-07 10:38:08,635 
 AbstractCassandraDaemon.java (line 114) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.io.EOFException
 at 
 org.apache.cassandra.io.sstable.IndexHelper.skipIndex(IndexHelper.java:65)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter$Builder.build(SSTableWriter.java:303)
 at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:923)
 at 
 org.apache.cassandra.db.CompactionManager$9.call(CompactionManager.java:916)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 ERROR [CompactionExecutor:1] 2011-03-07 10:38:08,666 
 AbstractCassandraDaemon.java (line 114) Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.io.EOFException
 at 
 

[jira] [Created] (CASSANDRA-2501) Error running cqlsh from .tar file -- global name 'SchemaDisagreementException' is not defined

2011-04-18 Thread Cathy Daw (JIRA)
Error running cqlsh from .tar file -- global name 'SchemaDisagreementException' 
is not defined
--

 Key: CASSANDRA-2501
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2501
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8
 Environment: Running on 3-node Centos 5.5. The cql package was 
installed with Python 2.6 and prior to installation, I downloaded and installed 
thrift05-0.5.0.
Reporter: Cathy Daw


*Error when running cqlsh*
{code}
[cassandra@cdaw-qa1 cql-1.0.0]$ cqlsh cdaw-qa1
Traceback (most recent call last):
  File /usr/bin/cqlsh, line 212, in module
password=options.password)
  File /usr/bin/cqlsh, line 55, in __init__
self.conn = cql.connect(hostname, port, user=username, password=password)
  File /usr/lib/python2.6/site-packages/cql/__init__.py, line 51, in connect
return connection.Connection(host, port, keyspace, user, password)
  File /usr/lib/python2.6/site-packages/cql/connection.py, line 53, in 
__init__
c.execute('USE %s;' % keyspace)
  File /usr/lib/python2.6/site-packages/cql/cursor.py, line 126, in execute
except SchemaDisagreementException, sde:
NameError: global name 'SchemaDisagreementException' is not defined
{code}


*Build*
* Install the cassandra binary from the nightly build
wget 
https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz

* Install cql from .tar file on nightly build
wget 
https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/cql-1.0.0.tar.gz

*CQL Install Output*
{code}
[cassandra@cdaw-qa1 cql-1.0.0]$ sudo python2.6 ./setup.py install
[sudo] password for cassandra: 
running install
running build
running build_py
running build_scripts
creating build/scripts-2.6
copying and adjusting cqlsh - build/scripts-2.6
changing mode of build/scripts-2.6/cqlsh from 644 to 755
running install_lib
creating /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/results.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/marshal.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/connection.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/cursor.py - /usr/lib/python2.6/site-packages/cql
creating /usr/lib/python2.6/site-packages/cql/cassandra
copying build/lib/cql/cassandra/__init__.py - 
/usr/lib/python2.6/site-packages/cql/cassandra
copying build/lib/cql/cassandra/Cassandra.py - 
/usr/lib/python2.6/site-packages/cql/cassandra
copying build/lib/cql/cassandra/constants.py - 
/usr/lib/python2.6/site-packages/cql/cassandra
copying build/lib/cql/cassandra/ttypes.py - 
/usr/lib/python2.6/site-packages/cql/cassandra
copying build/lib/cql/decoders.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/__init__.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/errors.py - /usr/lib/python2.6/site-packages/cql
copying build/lib/cql/connection_pool.py - /usr/lib/python2.6/site-packages/cql
byte-compiling /usr/lib/python2.6/site-packages/cql/results.py to results.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/marshal.py to marshal.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/connection.py to 
connection.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/cursor.py to cursor.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/__init__.py to 
__init__.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/Cassandra.py to 
Cassandra.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/constants.py to 
constants.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/ttypes.py to 
ttypes.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/decoders.py to decoders.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/__init__.py to __init__.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/errors.py to errors.pyc
byte-compiling /usr/lib/python2.6/site-packages/cql/connection_pool.py to 
connection_pool.pyc
running install_scripts
copying build/scripts-2.6/cqlsh - /usr/bin
changing mode of /usr/bin/cqlsh to 755
running install_egg_info
Writing /usr/lib/python2.6/site-packages/cql-1.0.0-py2.6.egg-info

{code}


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


[jira] [Updated] (CASSANDRA-2497) CLI: issue with keys being interpreted as hex and causing SET statement to fail

2011-04-18 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-2497:
---

Attachment: CASSANDRA-2497.patch

 CLI: issue with keys being interpreted as hex and causing SET statement to 
 fail
 ---

 Key: CASSANDRA-2497
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2497
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8
 Environment: * Single Node instance on MacOSX
 * Nightly Compiled Build from 4/18/2011
 * Installed from: 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
Reporter: Cathy Daw
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8

 Attachments: CASSANDRA-2497.patch


 *Original Summary*: Issues with Update Column Family and adding a 
 key_validation_class
 _Changed summary because the issue repros on drop/create.  see comment._
 *Reproduction Steps*
 {code}
 create column family users with comparator = UTF8Type 
 and column_metadata = [{column_name: password, validation_class: UTF8Type}];
 update column family users with key_validation_class=UTF8Type;
 set users['jsmith']['password']='ch@ngem3';  
 {code}
 *EXPECTED RESULT:* After the UPDATE statement, the SET statement should go 
 through successfully.
 *ACTUAL RESULT:*  The SET statement gives the same error message, regardless 
 of the UPDATE statement: 
 {code}
 org.apache.cassandra.db.marshal.MarshalException: cannot parse 'jsmith' as 
 hex bytes
 {code}
 *Output from describe keyspace*
 {code}
 ColumnFamily: users
   Key Validation Class: org.apache.cassandra.db.marshal.UTF8Type
   Default column value validator: 
 org.apache.cassandra.db.marshal.BytesType
   Columns sorted by: org.apache.cassandra.db.marshal.UTF8Type
   Row cache size / save period in seconds: 0.0/0
   Key cache size / save period in seconds: 20.0/14400
   Memtable thresholds: 0.290624997/62/1440 (millions of 
 ops/MB/minutes)
   GC grace seconds: 864000
   Compaction min/max thresholds: 4/32
   Read repair chance: 1.0
   Replicate on write: false
   Built indexes: []
   Column Metadata:
 Column Name: password
   Validation Class: org.apache.cassandra.db.marshal.UTF8Type
 {code}

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


svn commit: r1094809 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 22:57:57 2011
New Revision: 1094809

URL: http://svn.apache.org/viewvc?rev=1094809view=rev
Log:
add assert that repair keys arrive in-order
patch by jbellis; reviewed by stuhood for CASSANDRA-2316

Modified:

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

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1094809r1=1094808r2=1094809view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/AntiEntropyService.java
 Mon Apr 18 22:57:57 2011
@@ -272,6 +272,7 @@ public class AntiEntropyService
 private transient long validated;
 private transient MerkleTree.TreeRange range;
 private transient MerkleTree.TreeRangeIterator ranges;
+private transient DecoratedKey lastKey;
 
 public final static MerkleTree.RowHash EMPTY_ROW = new 
MerkleTree.RowHash(null, new byte[0]);
 
@@ -342,6 +343,10 @@ public class AntiEntropyService
  */
 public void add(AbstractCompactedRow row)
 {
+assert lastKey == null || lastKey.compareTo(row.key)  0
+   : row  + row.key +  received out of order wrt  + 
lastKey;
+lastKey = row.key;
+
 if (mintoken != null)
 {
 assert ranges != null : Validator was not prepared();




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

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 23:05:04 2011
New Revision: 1094810

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

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:05:04 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:05:04 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-1091087,1091503,1091542,1091654,1094604,1094647,1094796
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
 /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 Mon Apr 18 23:05:04 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-1091087,1091503,1091542,1091654,1094604,1094647,1094796
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
 
/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 Mon Apr 18 23:05:04 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-1091087,1091503,1091542,1091654,1094604,1094647,1094796
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
 
/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
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090978-1090979

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:05:04 2011
@@ -1,5 +1,5 @@
 

[jira] [Resolved] (CASSANDRA-2316) NoSuchElement exception on node which is streaming a repair

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-2316.
---

Resolution: Fixed
  Reviewer: stu
  Assignee: Jonathan Ellis  (was: Stu Hood)

 NoSuchElement exception on node which is streaming a repair
 ---

 Key: CASSANDRA-2316
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2316
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.6
Reporter: Jason Harvey
Assignee: Jonathan Ellis
  Labels: repair
 Fix For: 0.7.5

 Attachments: 2316-assert.txt


 Running latest SVN snapshot of 0.7.
 When I ran a repair on a node, that node's neighbor threw the following 
 exception. Let me know what other info could be helpful.
 {code}
  INFO 23:43:44,358 Streaming to /10.251.166.15
 ERROR 23:50:21,321 Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.util.NoSuchElementException
 at 
 com.google.common.collect.AbstractIterator.next(AbstractIterator.java:146)
 at 
 org.apache.cassandra.service.AntiEntropyService$Validator.add(AntiEntropyService.java:366)
 at 
 org.apache.cassandra.db.CompactionManager.doValidationCompaction(CompactionManager.java:825)
 at 
 org.apache.cassandra.db.CompactionManager.access$800(CompactionManager.java:56)
 at 
 org.apache.cassandra.db.CompactionManager$6.call(CompactionManager.java:358)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
 at java.util.concurrent.FutureTask.run(FutureTask.java:166)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 {code}

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


[jira] [Updated] (CASSANDRA-2316) NoSuchElement exception on node which is streaming a repair

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2316:
--

Reviewer: stuhood  (was: stu)

 NoSuchElement exception on node which is streaming a repair
 ---

 Key: CASSANDRA-2316
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2316
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.6
Reporter: Jason Harvey
Assignee: Jonathan Ellis
  Labels: repair
 Fix For: 0.7.5

 Attachments: 2316-assert.txt


 Running latest SVN snapshot of 0.7.
 When I ran a repair on a node, that node's neighbor threw the following 
 exception. Let me know what other info could be helpful.
 {code}
  INFO 23:43:44,358 Streaming to /10.251.166.15
 ERROR 23:50:21,321 Fatal exception in thread 
 Thread[CompactionExecutor:1,1,main]
 java.util.NoSuchElementException
 at 
 com.google.common.collect.AbstractIterator.next(AbstractIterator.java:146)
 at 
 org.apache.cassandra.service.AntiEntropyService$Validator.add(AntiEntropyService.java:366)
 at 
 org.apache.cassandra.db.CompactionManager.doValidationCompaction(CompactionManager.java:825)
 at 
 org.apache.cassandra.db.CompactionManager.access$800(CompactionManager.java:56)
 at 
 org.apache.cassandra.db.CompactionManager$6.call(CompactionManager.java:358)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
 at java.util.concurrent.FutureTask.run(FutureTask.java:166)
 at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
 at java.lang.Thread.run(Thread.java:636)
 {code}

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


[jira] [Assigned] (CASSANDRA-2501) Error running cqlsh from .tar file -- global name 'SchemaDisagreementException' is not defined

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-2501:
-

Assignee: Jonathan Ellis

 Error running cqlsh from .tar file -- global name 
 'SchemaDisagreementException' is not defined
 --

 Key: CASSANDRA-2501
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2501
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8
 Environment: Running on 3-node Centos 5.5. The cql package was 
 installed with Python 2.6 and prior to installation, I downloaded and 
 installed thrift05-0.5.0.
Reporter: Cathy Daw
Assignee: Jonathan Ellis

 *Error when running cqlsh*
 {code}
 [cassandra@cdaw-qa1 cql-1.0.0]$ cqlsh cdaw-qa1
 Traceback (most recent call last):
   File /usr/bin/cqlsh, line 212, in module
 password=options.password)
   File /usr/bin/cqlsh, line 55, in __init__
 self.conn = cql.connect(hostname, port, user=username, password=password)
   File /usr/lib/python2.6/site-packages/cql/__init__.py, line 51, in connect
 return connection.Connection(host, port, keyspace, user, password)
   File /usr/lib/python2.6/site-packages/cql/connection.py, line 53, in 
 __init__
 c.execute('USE %s;' % keyspace)
   File /usr/lib/python2.6/site-packages/cql/cursor.py, line 126, in execute
 except SchemaDisagreementException, sde:
 NameError: global name 'SchemaDisagreementException' is not defined
 {code}
 *Build*
 * Install the cassandra binary from the nightly build
 wget 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
 * Install cql from .tar file on nightly build
 wget 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/cql-1.0.0.tar.gz
 *CQL Install Output*
 {code}
 [cassandra@cdaw-qa1 cql-1.0.0]$ sudo python2.6 ./setup.py install
 [sudo] password for cassandra: 
 running install
 running build
 running build_py
 running build_scripts
 creating build/scripts-2.6
 copying and adjusting cqlsh - build/scripts-2.6
 changing mode of build/scripts-2.6/cqlsh from 644 to 755
 running install_lib
 creating /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/results.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/marshal.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/connection.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/cursor.py - /usr/lib/python2.6/site-packages/cql
 creating /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/__init__.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/Cassandra.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/constants.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/ttypes.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/decoders.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/__init__.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/errors.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/connection_pool.py - 
 /usr/lib/python2.6/site-packages/cql
 byte-compiling /usr/lib/python2.6/site-packages/cql/results.py to results.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/marshal.py to marshal.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/connection.py to 
 connection.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cursor.py to cursor.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/__init__.py to 
 __init__.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/Cassandra.py to 
 Cassandra.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/constants.py to 
 constants.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/ttypes.py to 
 ttypes.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/decoders.py to 
 decoders.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/__init__.py to 
 __init__.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/errors.py to errors.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/connection_pool.py to 
 connection_pool.pyc
 running install_scripts
 copying build/scripts-2.6/cqlsh - /usr/bin
 changing mode of /usr/bin/cqlsh to 755
 running install_egg_info
 Writing /usr/lib/python2.6/site-packages/cql-1.0.0-py2.6.egg-info
 {code}

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


[jira] [Updated] (CASSANDRA-2501) Error running cqlsh from .tar file -- global name 'SchemaDisagreementException' is not defined

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-2501:
--

Attachment: 2501.txt

i think the SDE error is masking another problem -- try with this patch (ant 
release to build the same artifacts hudson does) and see if that exposes 
something else.

 Error running cqlsh from .tar file -- global name 
 'SchemaDisagreementException' is not defined
 --

 Key: CASSANDRA-2501
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2501
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8
 Environment: Running on 3-node Centos 5.5. The cql package was 
 installed with Python 2.6 and prior to installation, I downloaded and 
 installed thrift05-0.5.0.
Reporter: Cathy Daw
Assignee: Jonathan Ellis
 Attachments: 2501.txt


 *Error when running cqlsh*
 {code}
 [cassandra@cdaw-qa1 cql-1.0.0]$ cqlsh cdaw-qa1
 Traceback (most recent call last):
   File /usr/bin/cqlsh, line 212, in module
 password=options.password)
   File /usr/bin/cqlsh, line 55, in __init__
 self.conn = cql.connect(hostname, port, user=username, password=password)
   File /usr/lib/python2.6/site-packages/cql/__init__.py, line 51, in connect
 return connection.Connection(host, port, keyspace, user, password)
   File /usr/lib/python2.6/site-packages/cql/connection.py, line 53, in 
 __init__
 c.execute('USE %s;' % keyspace)
   File /usr/lib/python2.6/site-packages/cql/cursor.py, line 126, in execute
 except SchemaDisagreementException, sde:
 NameError: global name 'SchemaDisagreementException' is not defined
 {code}
 *Build*
 * Install the cassandra binary from the nightly build
 wget 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-2011-04-18_11-02-29-bin.tar.gz
 * Install cql from .tar file on nightly build
 wget 
 https://builds.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/cql-1.0.0.tar.gz
 *CQL Install Output*
 {code}
 [cassandra@cdaw-qa1 cql-1.0.0]$ sudo python2.6 ./setup.py install
 [sudo] password for cassandra: 
 running install
 running build
 running build_py
 running build_scripts
 creating build/scripts-2.6
 copying and adjusting cqlsh - build/scripts-2.6
 changing mode of build/scripts-2.6/cqlsh from 644 to 755
 running install_lib
 creating /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/results.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/marshal.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/connection.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/cursor.py - /usr/lib/python2.6/site-packages/cql
 creating /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/__init__.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/Cassandra.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/constants.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/cassandra/ttypes.py - 
 /usr/lib/python2.6/site-packages/cql/cassandra
 copying build/lib/cql/decoders.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/__init__.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/errors.py - /usr/lib/python2.6/site-packages/cql
 copying build/lib/cql/connection_pool.py - 
 /usr/lib/python2.6/site-packages/cql
 byte-compiling /usr/lib/python2.6/site-packages/cql/results.py to results.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/marshal.py to marshal.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/connection.py to 
 connection.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cursor.py to cursor.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/__init__.py to 
 __init__.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/Cassandra.py to 
 Cassandra.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/constants.py to 
 constants.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/cassandra/ttypes.py to 
 ttypes.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/decoders.py to 
 decoders.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/__init__.py to 
 __init__.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/errors.py to errors.pyc
 byte-compiling /usr/lib/python2.6/site-packages/cql/connection_pool.py to 
 connection_pool.pyc
 running install_scripts
 copying build/scripts-2.6/cqlsh - /usr/bin
 changing mode of /usr/bin/cqlsh to 755
 running install_egg_info
 Writing /usr/lib/python2.6/site-packages/cql-1.0.0-py2.6.egg-info
 {code}

--
This message is automatically generated by JIRA.
For more information 

[jira] [Issue Comment Edited] (CASSANDRA-2429) Silence non-errors while reconnecting

2011-04-18 Thread Joaquin Casares (JIRA)

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

Joaquin Casares edited comment on CASSANDRA-2429 at 4/18/11 11:31 PM:
--

It compiles and runs in standalone mode and in a cluster, but I couldn't get it 
to print out the same errors using a few runs of the stress tool.

I don't know if I've actually ever seen these statements on my own cluster, 
just in many other logs.

+1 based on logic, code, and compilation.

  was (Author: j.casares):
It compiles and runs in standalone mode and in a cluster, but i couldn't 
get it to print out the same errors. 

I don't know if I've actually ever seen these statements on my own cluster, 
just in many other logs.

+1 based on logic, code, and compilation.
  
 Silence non-errors while reconnecting
 -

 Key: CASSANDRA-2429
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2429
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.6
Reporter: Joaquin Casares
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.5

 Attachments: 2429.txt


 This is from 0.6.3:
  INFO [Timer-0] 2010-10-28 18:49:08,714 Gossiper.java (line 181) InetAddress 
 /192.168.80.17 is now dead.
  INFO [WRITE-/192.168.80.17] 2010-10-28 18:49:48,719 
 OutboundTcpConnection.java (line 102) error writing to /192.168.80.17
  INFO [GC inspection] 2010-10-28 18:50:18,425 GCInspector.java (line 110) GC 
 for ConcurrentMarkSweep: 3463 ms, 77366288 reclaimed leaving 1006804528 used; 
 max is 1207828480
  INFO [GC inspection] 2010-10-28 18:50:29,792 GCInspector.java (line 110) GC 
 for ConcurrentMarkSweep: 3465 ms, 71343920 reclaimed leaving 1013965608 used; 
 max is 1207828480
  INFO [GMFD:1] 2010-10-28 18:50:32,713 Gossiper.java (line 593) Node 
 /192.168.80.17 has restarted, now UP again
  INFO [HINTED-HANDOFF-POOL:1] 2010-10-28 18:50:32,713 
 HintedHandOffManager.java (line 153) Started hinted handoff for endPoint 
 /192.168.80.17
  INFO [GMFD:1] 2010-10-28 18:50:32,713 StorageService.java (line 548) Node 
 /192.168.80.17 state jump to normal
 This is from 0.7.1:
  INFO [ScheduledTasks:1] 2011-02-25 17:54:41,445 Gossiper.java (line 224) 
 InetAddress /10.240.17.235 is now dead.
  INFO [GossipStage:1] 2011-02-25 17:54:41,449 Gossiper.java (line 605) 
 InetAddress /10.240.17.235 is now UP
  INFO [GossipStage:1] 2011-02-25 17:55:05,570 Gossiper.java (line 619) Node 
 /10.241.103.223 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,581 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.240.17.235
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.240.17.235
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 272) Sleeping 56493ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,077 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.253.202.128
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,077 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.253.202.128
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,078 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,078 HintedHandOffManager.java 
 (line 272) Sleeping 8680ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:56:25,758 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.241.103.223
  INFO [HintedHandoff:1] 2011-02-25 17:56:25,759 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.241.103.223
  INFO [GossipStage:1] 2011-02-25 17:58:30,021 Gossiper.java (line 619) Node 
 /10.253.183.111 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 17:58:30,022 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:58:30,022 HintedHandOffManager.java 
 (line 272) Sleeping 43058ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:59:13,080 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.253.183.111
  INFO [HintedHandoff:1] 2011-02-25 17:59:13,081 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.253.183.111
  INFO [GossipStage:1] 2011-02-25 18:00:27,827 Gossiper.java (line 619) Node 
 /10.194.249.140 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 18:00:27,827 

[jira] [Commented] (CASSANDRA-2429) Silence non-errors while reconnecting

2011-04-18 Thread Joaquin Casares (JIRA)

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

Joaquin Casares commented on CASSANDRA-2429:


It compiles and runs in standalone mode and in a cluster, but i couldn't get it 
to print out the same errors. 

I don't know if I've actually ever seen these statements on my own cluster, 
just in many other logs.

+1 based on logic, code, and compilation.

 Silence non-errors while reconnecting
 -

 Key: CASSANDRA-2429
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2429
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.6
Reporter: Joaquin Casares
Assignee: Jonathan Ellis
Priority: Trivial
 Fix For: 0.7.5

 Attachments: 2429.txt


 This is from 0.6.3:
  INFO [Timer-0] 2010-10-28 18:49:08,714 Gossiper.java (line 181) InetAddress 
 /192.168.80.17 is now dead.
  INFO [WRITE-/192.168.80.17] 2010-10-28 18:49:48,719 
 OutboundTcpConnection.java (line 102) error writing to /192.168.80.17
  INFO [GC inspection] 2010-10-28 18:50:18,425 GCInspector.java (line 110) GC 
 for ConcurrentMarkSweep: 3463 ms, 77366288 reclaimed leaving 1006804528 used; 
 max is 1207828480
  INFO [GC inspection] 2010-10-28 18:50:29,792 GCInspector.java (line 110) GC 
 for ConcurrentMarkSweep: 3465 ms, 71343920 reclaimed leaving 1013965608 used; 
 max is 1207828480
  INFO [GMFD:1] 2010-10-28 18:50:32,713 Gossiper.java (line 593) Node 
 /192.168.80.17 has restarted, now UP again
  INFO [HINTED-HANDOFF-POOL:1] 2010-10-28 18:50:32,713 
 HintedHandOffManager.java (line 153) Started hinted handoff for endPoint 
 /192.168.80.17
  INFO [GMFD:1] 2010-10-28 18:50:32,713 StorageService.java (line 548) Node 
 /192.168.80.17 state jump to normal
 This is from 0.7.1:
  INFO [ScheduledTasks:1] 2011-02-25 17:54:41,445 Gossiper.java (line 224) 
 InetAddress /10.240.17.235 is now dead.
  INFO [GossipStage:1] 2011-02-25 17:54:41,449 Gossiper.java (line 605) 
 InetAddress /10.240.17.235 is now UP
  INFO [GossipStage:1] 2011-02-25 17:55:05,570 Gossiper.java (line 619) Node 
 /10.241.103.223 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,581 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.240.17.235
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.240.17.235
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:55:20,583 HintedHandOffManager.java 
 (line 272) Sleeping 56493ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,077 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.253.202.128
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,077 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.253.202.128
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,078 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:56:17,078 HintedHandOffManager.java 
 (line 272) Sleeping 8680ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:56:25,758 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.241.103.223
  INFO [HintedHandoff:1] 2011-02-25 17:56:25,759 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.241.103.223
  INFO [GossipStage:1] 2011-02-25 17:58:30,021 Gossiper.java (line 619) Node 
 /10.253.183.111 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 17:58:30,022 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 17:58:30,022 HintedHandOffManager.java 
 (line 272) Sleeping 43058ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 17:59:13,080 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.253.183.111
  INFO [HintedHandoff:1] 2011-02-25 17:59:13,081 HintedHandOffManager.java 
 (line 342) Finished hinted handoff of 0 rows to endpoint /10.253.183.111
  INFO [GossipStage:1] 2011-02-25 18:00:27,827 Gossiper.java (line 619) Node 
 /10.194.249.140 has restarted, now UP again
  INFO [HintedHandoff:1] 2011-02-25 18:00:27,827 HintedHandOffManager.java 
 (line 266) Checking remote schema before delivering hints
  INFO [HintedHandoff:1] 2011-02-25 18:00:27,827 HintedHandOffManager.java 
 (line 272) Sleeping 43035ms to stagger hint delivery
  INFO [HintedHandoff:1] 2011-02-25 18:01:10,863 HintedHandOffManager.java 
 (line 286) Started hinted handoff for endpoint /10.194.249.140
  INFO [HintedHandoff:1] 

svn commit: r1094818 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: db/HintedHandOffManager.java net/OutboundTcpConnection.java

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 23:58:07 2011
New Revision: 1094818

URL: http://svn.apache.org/viewvc?rev=1094818view=rev
Log:
move some INFO log messages in HH and tcp to DEBUG
patch by jbellis; reviewed by Joaquin Casares for CASSANDRA-2429

Modified:

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

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/OutboundTcpConnection.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1094818r1=1094817r2=1094818view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/HintedHandOffManager.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/HintedHandOffManager.java
 Mon Apr 18 23:58:07 2011
@@ -281,13 +281,13 @@ public class HintedHandOffManager implem
 {
 try
 {
-logger_.info(Checking remote schema before delivering hints);
+logger_.debug(Checking remote schema before delivering hints);
 int waited = waitForSchemaAgreement(endpoint);
 // sleep a random amount to stagger handoff delivery from 
different replicas.
 // (if we had to wait, then gossiper randomness took care of that 
for us already.)
 if (waited == 0) {
 int sleep = new Random().nextInt(6);
-logger_.info(Sleeping {}ms to stagger hint delivery, sleep);
+logger_.debug(Sleeping {}ms to stagger hint delivery, sleep);
 Thread.sleep(sleep);
 }
 if 
(!Gossiper.instance.getEndpointStateForEndpoint(endpoint).isAlive())

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=1094818r1=1094817r2=1094818view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 Mon Apr 18 23:58:07 2011
@@ -114,8 +114,8 @@ public class OutboundTcpConnection exten
 }
 catch (IOException e)
 {
-logger.info(error writing to  + endpoint);
-logger.debug(error was , e);
+if (logger.isDebugEnabled())
+logger.debug(error writing to  + endpoint, e);
 disconnect();
 }
 }




[jira] [Created] (CASSANDRA-2502) disable cache saving on system CFs

2011-04-18 Thread Ryan King (JIRA)
disable cache saving on system CFs
--

 Key: CASSANDRA-2502
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2502
 Project: Cassandra
  Issue Type: Improvement
Reporter: Ryan King
Assignee: Ryan King
Priority: Minor
 Attachments: 0001-disable-cache-saving-on-system-tables.patch



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


[jira] [Updated] (CASSANDRA-2502) disable cache saving on system CFs

2011-04-18 Thread Ryan King (JIRA)

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

Ryan King updated CASSANDRA-2502:
-

Attachment: 0001-disable-cache-saving-on-system-tables.patch

 disable cache saving on system CFs
 --

 Key: CASSANDRA-2502
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2502
 Project: Cassandra
  Issue Type: Improvement
Reporter: Ryan King
Assignee: Ryan King
Priority: Minor
 Attachments: 0001-disable-cache-saving-on-system-tables.patch




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


svn commit: r1094819 - in /cassandra/branches/cassandra-0.8: ./ contrib/ contrib/pig/src/java/org/apache/cassandra/hadoop/pig/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apach

2011-04-18 Thread jbellis
Author: jbellis
Date: Mon Apr 18 23:59:35 2011
New Revision: 1094819

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

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

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

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

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

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

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

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

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

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/OutboundTcpConnection.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:59:35 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:59:35 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-1091087,1091503,1091542,1091654,1094604,1094647,1094796,1094809
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Modified: 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java?rev=1094819r1=1094818r2=1094819view=diff
==
--- 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 Mon Apr 18 23:59:35 2011
@@ -56,11 +56,11 @@ import org.apache.thrift.transport.TTran
 import org.apache.thrift.transport.TTransportException;
 
 /**
- * A LoadFunc wrapping ColumnFamilyInputFormat.
+ * A LoadStoreFunc for retrieving data from and storing data to Cassandra
  *
  * A row from a standard CF will be returned as nested tuples: (key, ((name1, 
val1), (name2, val2))).
  */
-public class CassandraStorage extends LoadFunc implements StoreFuncInterface, 
LoadPushDown
+public class CassandraStorage extends LoadFunc implements StoreFuncInterface
 {
 // system environment variables that can be set to configure connection 
info:
 // alternatively, Hadoop JobConf variables can be set using keys from 
ConfigHelper
@@ -428,18 +428,6 @@ public class CassandraStorage extends Lo
 {
 }
 
-/* LoadPushDown methods */
-
-public ListOperatorSet getFeatures() {
-return Arrays.asList(LoadPushDown.OperatorSet.PROJECTION);
-}
-
-public RequiredFieldResponse pushProjection(RequiredFieldList 
requiredFieldList) throws FrontendException
-{
-return new RequiredFieldResponse(true);
-}
-
-
 /* Methods to get the column family schema from Cassandra */
 
 private void initSchema()

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 23:59:35 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

svn commit: r1094820 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ tools/stress/src/org/apache/cassandra/stress/ tools/stress/src/org/apach

2011-04-18 Thread jbellis
Author: jbellis
Date: Tue Apr 19 00:04:22 2011
New Revision: 1094820

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

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

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

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

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

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

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

cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java

cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java

cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/util/Operation.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 00:04:22 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/trunk:1090978-1090979

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 00:04:22 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-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7/contrib:1026516-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
 /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 Tue Apr 19 00:04:22 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-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
 
/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 Tue Apr 19 00:04:22 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-1091087,1091503,1091542,1091654,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
 
/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: r1094822 - in /cassandra/branches/cassandra-0.8: ./ contrib/ contrib/pig/src/java/org/apache/cassandra/hadoop/pig/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apach

2011-04-18 Thread jbellis
Author: jbellis
Date: Tue Apr 19 00:05:56 2011
New Revision: 1094822

URL: http://svn.apache.org/viewvc?rev=1094822view=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/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java

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

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 00:05:56 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1081914,1083000
-/cassandra/branches/cassandra-0.7:1026516-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7:1026516-1094195,1094604,1094647,1094796,1094809,1094818
 /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=1094822r1=1094821r2=1094822view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Apr 19 00:05:56 2011
@@ -55,6 +55,7 @@
  * Try harder to close files after compaction (CASSANDRA-2431)
  * re-set bootstrapped flag after move finishes (CASSANDRA-2435)
  * use 64KB flush buffer instead of in_memory_compaction_limit (CASSANDRA-2463)
+ * fix duplicate results from CFS.scan (CASSANDRA-2406)
  * avoid caching token-only decoratedkeys (CASSANDRA-2416)
 
 

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 19 00:05:56 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-1091087,1091503,1091542,1091654,1091911,1094195,1094604,1094647,1094796,1094809,1094818
+/cassandra/branches/cassandra-0.7/contrib:1026516-1094195,1094604,1094647,1094796,1094809,1094818
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/trunk/contrib:1090978-1090979

Modified: 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java?rev=1094822r1=1094821r2=1094822view=diff
==
--- 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/contrib/pig/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
 Tue Apr 19 00:05:56 2011
@@ -68,7 +68,7 @@ public class CassandraStorage extends Lo
 public final static String PIG_INITIAL_ADDRESS = PIG_INITIAL_ADDRESS;
 public final static String PIG_PARTITIONER = PIG_PARTITIONER;
 
-private static String UDFCONTEXT_SCHEMA_KEY = cassandra.schema;
+private static String UDFCONTEXT_SCHEMA_KEY_PREFIX = cassandra.schema;
 
 private final static ByteBuffer BOUND = ByteBufferUtil.EMPTY_BYTE_BUFFER;
 private static final Log logger = 
LogFactory.getLog(CassandraStorage.class);
@@ -169,7 +169,7 @@ public class CassandraStorage extends Lo
 {
 UDFContext context = UDFContext.getUDFContext();
 Properties property = context.getUDFProperties(CassandraStorage.class);
-return cfdefFromString(property.getProperty(UDFCONTEXT_SCHEMA_KEY));
+return 

[jira] [Commented] (CASSANDRA-2326) stress.java indexed range slicing is broken

2011-04-18 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2326:
---

(rebased + committed trunk version)

 stress.java indexed range slicing is broken
 ---

 Key: CASSANDRA-2326
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2326
 Project: Cassandra
  Issue Type: Bug
  Components: Contrib
Affects Versions: 0.7.4
Reporter: Brandon Williams
Assignee: Pavel Yaskevich
Priority: Trivial
 Fix For: 0.7.5, 0.8

 Attachments: CASSANDRA-2326-trunk.patch, CASSANDRA-2326.patch


 I probably broke it when I fixed the build that CASSANDRA-2312 broke.  Now it 
 compiles, but never works.

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


  1   2   >