[jira] [Created] (CASSANDRA-5234) Table created through CQL3 are not accessble to Pig 0.10

2013-02-08 Thread Shamim Ahmed (JIRA)
Shamim Ahmed created CASSANDRA-5234:
---

 Summary: Table created through CQL3 are not accessble to Pig 0.10
 Key: CASSANDRA-5234
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5234
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Affects Versions: 1.2.1
 Environment: Red hat linux 5
Reporter: Shamim Ahmed
 Fix For: 1.2.2


Hi,
  i have faced a bug when creating table through CQL3 and trying to load data 
through pig 0.10 as follows:
java.lang.RuntimeException: Column family 'abc' not found in keyspace 'XYZ'
at 
org.apache.cassandra.hadoop.pig.CassandraStorage.initSchema(CassandraStorage.java:1112)
at 
org.apache.cassandra.hadoop.pig.CassandraStorage.setLocation(CassandraStorage.java:615).
This effects from Simple table to table with compound key. 

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Shamim Ahmed (JIRA)
Shamim Ahmed created CASSANDRA-5235:
---

 Summary: Error when executing a file contains CQL statement in 
cqlsh
 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Priority: Minor
 Fix For: 1.2.2


When executing a file contains CQL statement returns following error:
cqlsh source '/tmp/src/xyz.cql';
Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5228) Track minimum ttl and use to expire entire sstables

2013-02-08 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-5228:
-

bq. I'm skeptical that this would be useful with our general-purpose compaction 
strategies

For the record, I don't fully share that pessimism :). Just to say that imo 
it's worth separating what the title says (and doing that first) from creating 
a new compaction strategy. Could be you didn't intended otherwise anyway but 
just wanted to chime in.

 Track minimum ttl and use to expire entire sstables
 ---

 Key: CASSANDRA-5228
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5228
 Project: Cassandra
  Issue Type: Bug
Reporter: Jonathan Ellis
Priority: Minor

 It would be nice to be able to throw away entire sstables worth of data when 
 we know that it's all expired.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5225) Missing columns, errors when requesting specific columns from wide rows

2013-02-08 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-5225:
-

Are you sure you applied the patch correctly? I just tested the 
pycassa-repro.py test above and it fails every time without the patch but 
haven't failed once with the patch.

 Missing columns, errors when requesting specific columns from wide rows
 ---

 Key: CASSANDRA-5225
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5225
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Tyler Hobbs
Priority: Critical
 Fix For: 1.2.2

 Attachments: 5225.txt, pycassa-repro.py


 With Cassandra 1.2.1 (and probably 1.2.0), I'm seeing some problems with 
 Thrift queries that request a set of specific column names when the row is 
 very wide.
 To reproduce, I'm inserting 10 million columns into a single row and then 
 randomly requesting three columns by name in a loop.  It's common for only 
 one or two of the three columns to be returned.  I'm also seeing stack traces 
 like the following in the Cassandra log:
 {noformat}
 ERROR 13:12:01,017 Exception in thread Thread[ReadStage:76,5,main]
 java.lang.RuntimeException: 
 org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1576)
   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: org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.db.columniterator.SSTableNamesIterator.init(SSTableNamesIterator.java:69)
   at 
 org.apache.cassandra.db.filter.NamesQueryFilter.getSSTableColumnIterator(NamesQueryFilter.java:81)
   at 
 org.apache.cassandra.db.filter.QueryFilter.getSSTableColumnIterator(QueryFilter.java:68)
   at 
 org.apache.cassandra.db.CollationController.collectTimeOrderedData(CollationController.java:133)
   at 
 org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:65)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1358)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1215)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1127)
   at org.apache.cassandra.db.Table.getRow(Table.java:355)
   at 
 org.apache.cassandra.db.SliceByNamesReadCommand.getRow(SliceByNamesReadCommand.java:64)
   at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1052)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1572)
   ... 3 more
 {noformat}
 This doesn't seem to happen when the row is smaller, so it might have 
 something to do with incremental large row compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5225) Missing columns, errors when requesting specific columns from wide rows

2013-02-08 Thread Mukund (JIRA)

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

Mukund commented on CASSANDRA-5225:
---

Yes..The patch works with my test code too..


 Missing columns, errors when requesting specific columns from wide rows
 ---

 Key: CASSANDRA-5225
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5225
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Tyler Hobbs
Priority: Critical
 Fix For: 1.2.2

 Attachments: 5225.txt, pycassa-repro.py


 With Cassandra 1.2.1 (and probably 1.2.0), I'm seeing some problems with 
 Thrift queries that request a set of specific column names when the row is 
 very wide.
 To reproduce, I'm inserting 10 million columns into a single row and then 
 randomly requesting three columns by name in a loop.  It's common for only 
 one or two of the three columns to be returned.  I'm also seeing stack traces 
 like the following in the Cassandra log:
 {noformat}
 ERROR 13:12:01,017 Exception in thread Thread[ReadStage:76,5,main]
 java.lang.RuntimeException: 
 org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1576)
   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: org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.db.columniterator.SSTableNamesIterator.init(SSTableNamesIterator.java:69)
   at 
 org.apache.cassandra.db.filter.NamesQueryFilter.getSSTableColumnIterator(NamesQueryFilter.java:81)
   at 
 org.apache.cassandra.db.filter.QueryFilter.getSSTableColumnIterator(QueryFilter.java:68)
   at 
 org.apache.cassandra.db.CollationController.collectTimeOrderedData(CollationController.java:133)
   at 
 org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:65)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1358)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1215)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1127)
   at org.apache.cassandra.db.Table.getRow(Table.java:355)
   at 
 org.apache.cassandra.db.SliceByNamesReadCommand.getRow(SliceByNamesReadCommand.java:64)
   at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1052)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1572)
   ... 3 more
 {noformat}
 This doesn't seem to happen when the row is smaller, so it might have 
 something to do with incremental large row compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of NancyKunt by NancyKunt

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The NancyKunt page has been changed by NancyKunt:
http://wiki.apache.org/cassandra/NancyKunt

New page:
Howdy !! The name is FAUSTINA SHORT. I am 28. My parents want me to join The 
Surprise Military School which has a branch in Londonderry.BR
I also like to Bungee Jumping. My father name is Randy and he is a Optician. My 
mother is a Imam.BR
BR
Feel free to surf to my web-site [[http://www.chanel-ol-store.com|chanel 
handbags]]


[Cassandra Wiki] Trivial Update of ZXLCharis by ZXLCharis

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The ZXLCharis page has been changed by ZXLCharis:
http://wiki.apache.org/cassandra/ZXLCharis

New page:
Hey guys !! I am BIANCA DAVIS. I reside in Concord.BR
I want to study at The Professional School which has a branch in Gilbert. I 
like to do Wire Jewelry making. My dad name is Jeff and he is a Builder. My 
mother is a Test developer.BR
BR
Feel free to surf to my homepage ... 
[[http://www.cleanscreenxcel.com/cheapmonsterbeatsbydre.html|beats by dre 
monster]]


[jira] [Updated] (CASSANDRA-5232) ALTER TABLE ADD - data loss

2013-02-08 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-5232:


Attachment: 5232.txt

That's a bug in DataTracker.replaceFlushed, that doesn't handle correctly the 
case where there is no sstable created by the flush (and in that case one such 
flush is triggered by the ALTER). Namely, it removes (from the DataTracker 
instance, not from disk) all existing sstables. This actually comes from the 
CASSANDRA-4667 (the second patch committed). So in practice that means that 
ALTER TABLE is just one of the thing this broke, but this also break the atomic 
batch guarantees (as the batchlog sstables might be discarded wrongfully).

Trivial patch attached.


 ALTER TABLE ADD - data loss
 ---

 Key: CASSANDRA-5232
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5232
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.2.1
Reporter: Vasily V.D.
 Attachments: 5232.txt


 cqlsh:Test CREATE TABLE t1 (id int PRIMARY KEY, t text);
 cqlsh:Test UPDATE t1 SET t = '111' WHERE id = 1;
 cqlsh:Test ALTER TABLE t1 ADD l listtext;
 cqlsh:Test SELECT * FROM t1;
  id | l| t
 +--+-
   1 | null | 111
 cqlsh:Test ALTER TABLE t1 ADD m mapint, text;
 cqlsh:Test SELECT * FROM t1;
 cqlsh:Test
 Last query doesn't return any data.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5232) ALTER TABLE ADD - data loss

2013-02-08 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-5232:
-

Btw, in the test case above the data is not really lost. Restarting the node 
should have him pick up the ignored sstables.

 ALTER TABLE ADD - data loss
 ---

 Key: CASSANDRA-5232
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5232
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.2.1
Reporter: Vasily V.D.
Assignee: Sylvain Lebresne
 Fix For: 1.2.2

 Attachments: 5232.txt


 cqlsh:Test CREATE TABLE t1 (id int PRIMARY KEY, t text);
 cqlsh:Test UPDATE t1 SET t = '111' WHERE id = 1;
 cqlsh:Test ALTER TABLE t1 ADD l listtext;
 cqlsh:Test SELECT * FROM t1;
  id | l| t
 +--+-
   1 | null | 111
 cqlsh:Test ALTER TABLE t1 ADD m mapint, text;
 cqlsh:Test SELECT * FROM t1;
 cqlsh:Test
 Last query doesn't return any data.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of LoviePeep by LoviePeep

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The LoviePeep page has been changed by LoviePeep:
http://wiki.apache.org/cassandra/LoviePeep?action=diffrev1=1rev2=2

- Hey fellas !! I am MARCY REEVES. I like to do Working In A Food Pantry.BR
- My papa name is Bruce   and he is a Marksman. My momy is a Archeologist.BR
+ Yo bros !! My name is VALLIE MCGOWAN. I like Dancing.BR
+ My dad name is Bryan and he is a Xylophonist. My mummy is a Coast guard.BR
  BR
- Feel free to surf to my web blog ... [[http://www.dressesonit.com|cheap 
wedding dresses]]
+ Also visit my web-site [[http://www.dressesonit.com|cheap wedding dresses]]
  


[Cassandra Wiki] Trivial Update of LoviePeep by LoviePeep

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The LoviePeep page has been changed by LoviePeep:
http://wiki.apache.org/cassandra/LoviePeep?action=diffrev1=2rev2=3

- Yo bros !! My name is VALLIE MCGOWAN. I like Dancing.BR
- My dad name is Bryan and he is a Xylophonist. My mummy is a Coast guard.BR
+ Wassp People !! I am TERRIE EVANS. My hobby is Video Games.BR
+ My dad name is Aaron  and he is a Attorney at law. My mother is a Spy.BR
  BR
- Also visit my web-site [[http://www.dressesonit.com|cheap wedding dresses]]
+ My web page :: [[http://www.dressesonit.com|cheap wedding dresses]]
  


[jira] [Commented] (CASSANDRA-5232) ALTER TABLE ADD - data loss

2013-02-08 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-5232:
---

+1

 ALTER TABLE ADD - data loss
 ---

 Key: CASSANDRA-5232
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5232
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.2.1
Reporter: Vasily V.D.
Assignee: Sylvain Lebresne
 Fix For: 1.2.2

 Attachments: 5232.txt


 cqlsh:Test CREATE TABLE t1 (id int PRIMARY KEY, t text);
 cqlsh:Test UPDATE t1 SET t = '111' WHERE id = 1;
 cqlsh:Test ALTER TABLE t1 ADD l listtext;
 cqlsh:Test SELECT * FROM t1;
  id | l| t
 +--+-
   1 | null | 111
 cqlsh:Test ALTER TABLE t1 ADD m mapint, text;
 cqlsh:Test SELECT * FROM t1;
 cqlsh:Test
 Last query doesn't return any data.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5228) Track minimum ttl and use to expire entire sstables

2013-02-08 Thread Carl Yeksigian (JIRA)

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

Carl Yeksigian commented on CASSANDRA-5228:
---

I think this would really help with the Hints cf. When all of the hints in an 
sstable have been handed off, then we can easily delete the whole SSTable 
rather than running a compaction.

Also, think we need to track maximum ttl.

 Track minimum ttl and use to expire entire sstables
 ---

 Key: CASSANDRA-5228
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5228
 Project: Cassandra
  Issue Type: Bug
Reporter: Jonathan Ellis
Priority: Minor

 It would be nice to be able to throw away entire sstables worth of data when 
 we know that it's all expired.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Assigned] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko reassigned CASSANDRA-5235:


Assignee: Aleksey Yeschenko

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.2.2


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Resolved] (CASSANDRA-5234) Table created through CQL3 are not accessble to Pig 0.10

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko resolved CASSANDRA-5234.
--

Resolution: Not A Problem

This is not a bug - CQL3 tables are intentionally not included in thrift 
describe_keyspace(s) (CASSANDRA-4377).

 Table created through CQL3 are not accessble to Pig 0.10
 

 Key: CASSANDRA-5234
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5234
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Affects Versions: 1.2.1
 Environment: Red hat linux 5
Reporter: Shamim Ahmed
 Fix For: 1.2.2


 Hi,
   i have faced a bug when creating table through CQL3 and trying to load data 
 through pig 0.10 as follows:
 java.lang.RuntimeException: Column family 'abc' not found in keyspace 'XYZ'
   at 
 org.apache.cassandra.hadoop.pig.CassandraStorage.initSchema(CassandraStorage.java:1112)
   at 
 org.apache.cassandra.hadoop.pig.CassandraStorage.setLocation(CassandraStorage.java:615).
 This effects from Simple table to table with compound key. 

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko updated CASSANDRA-5235:
-

Attachment: 5235.txt

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.2.2

 Attachments: 5235.txt


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko updated CASSANDRA-5235:
-

Affects Version/s: 1.1.9

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.1.9, 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.2.2

 Attachments: 5235.txt


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko updated CASSANDRA-5235:
-

Fix Version/s: 1.1.10

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.1.9, 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.10, 1.2.2

 Attachments: 5235.txt


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Aleksey Yeschenko (JIRA)

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

Aleksey Yeschenko commented on CASSANDRA-5235:
--

1.1.9 has the same indentation issue, but it doesn't actually affect SOURCE. 
Still, should probably be fixed there as well, just in case.

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.1.9, 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.10, 1.2.2

 Attachments: 5235.txt


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of SalcpSoul by SalcpSoul

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The SalcpSoul page has been changed by SalcpSoul:
http://wiki.apache.org/cassandra/SalcpSoul

New page:
Hi !! I am CATHARINE ALVARADO. I have applied for distance learning at The 
Fancy Academy of Twinkling Education located in Leominster.BR
My hobby is Learning A Foreign Language. My father name is Brent  and he is a 
Dancer. My mummy is a Sales Person.BR
BR
my blog; [[http://www.chanel-ol-store.com|chanel purse]]


[jira] [Reopened] (CASSANDRA-4366) add UseCondCardMark XX jvm settings on jdk 1.7

2013-02-08 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reopened CASSANDRA-4366:
---


 add UseCondCardMark XX jvm settings on jdk 1.7
 --

 Key: CASSANDRA-4366
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4366
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 1.2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 1.2.0 beta 1

 Attachments: 4366.txt


 found by jbellis
 adding jvm extension setting UseCondCardMark as defined here
 http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7029167
 for better lock handling especially on hotspot with multicore processors.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[4/4] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-08 Thread jbellis
Updated Branches:
  refs/heads/cassandra-1.2 27ccc433f - 1423fb110
  refs/heads/trunk 63cc6b0c7 - d9f6cb8a6


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9f6cb8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f6cb8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f6cb8a

Branch: refs/heads/trunk
Commit: d9f6cb8a6f2582fb34f13f184cb86c7d9ff06768
Parents: 63cc6b0 1423fb1
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 8 10:57:00 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 8 10:57:00 2013 -0600

--
 CHANGES.txt|3 +-
 conf/cassandra-env.sh  |4 +++
 .../org/apache/cassandra/transport/Server.java |   16 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/conf/cassandra-env.sh
--



[3/4] git commit: un-revert #4366

2013-02-08 Thread jbellis
un-revert #4366


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1423fb11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1423fb11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1423fb11

Branch: refs/heads/cassandra-1.2
Commit: 1423fb11037ef23aef3e78516d8d2e8f7acb54ba
Parents: 27ccc43
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 8 10:56:55 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 8 10:56:55 2013 -0600

--
 CHANGES.txt   |2 +-
 conf/cassandra-env.sh |4 
 2 files changed, 5 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1423fb11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 33d6786..5d96a0c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
  * Improve handling of directory creation failures (CASSANDRA-5196)
  * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
  * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
+ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 
 
 1.2.1
@@ -271,7 +272,6 @@ Merged from 1.1:
  * remove redundant name column from schema_keyspaces (CASSANDRA-4433)
  * improve nodetool ring handling of multi-dc clusters (CASSANDRA-3047)
  * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
- * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
  * split up rpc timeout by operation type (CASSANDRA-2819)
  * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
  * update MS protocol with a version handshake + broadcast address id

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1423fb11/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e38371f..daae043 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,6 +202,10 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
+if [ $java_version = 1.7 ]
+then
+JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
+fi
 
 # GC logging options -- uncomment to enable
 # JVM_OPTS=$JVM_OPTS -XX:+PrintGCDetails



[1/4] git commit: Binary protocol: avoid sending notification for 0.0.0.0

2013-02-08 Thread jbellis
Binary protocol: avoid sending notification for 0.0.0.0

patch by slebresne; reviewed by jbellis for CASSANDRA-5227


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27ccc433
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ccc433
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27ccc433

Branch: refs/heads/trunk
Commit: 27ccc433f36f99ce42f3dd2463d2248f398fb19e
Parents: cef8eb0
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Feb 7 18:40:24 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Feb 7 18:40:24 2013 +0100

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/transport/Server.java |   16 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27ccc433/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 905db57..33d6786 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
  * Correctly expire gossip states for edge cases (CASSANDRA-5216)
  * Improve handling of directory creation failures (CASSANDRA-5196)
  * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
+ * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
 
 
 1.2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27ccc433/src/java/org/apache/cassandra/transport/Server.java
--
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index e999128..8bdae55 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -262,6 +262,17 @@ public class Server implements CassandraDaemon.Server
 private static class EventNotifier implements 
IEndpointLifecycleSubscriber, IMigrationListener
 {
 private final Server server;
+private static final InetAddress bindAll;
+static {
+try
+{
+bindAll = InetAddress.getByAddress(new byte[4]);
+}
+catch (UnknownHostException e)
+{
+throw new AssertionError(e);
+}
+}
 
 private EventNotifier(Server server)
 {
@@ -272,7 +283,10 @@ public class Server implements CassandraDaemon.Server
 {
 try
 {
-return 
InetAddress.getByName(StorageService.instance.getRpcaddress(endpoint));
+InetAddress rpcAddress = 
InetAddress.getByName(StorageService.instance.getRpcaddress(endpoint));
+// If rpcAddress == 0.0.0.0 (i.e. bound on all addresses), 
returning that is not very helpful,
+// so return the internal address (which is ok since we're 
bound on all addresses).
+return rpcAddress.equals(bindAll) ? endpoint : rpcAddress;
 }
 catch (UnknownHostException e)
 {



[2/4] git commit: un-revert #4366

2013-02-08 Thread jbellis
un-revert #4366


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1423fb11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1423fb11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1423fb11

Branch: refs/heads/trunk
Commit: 1423fb11037ef23aef3e78516d8d2e8f7acb54ba
Parents: 27ccc43
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Feb 8 10:56:55 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Feb 8 10:56:55 2013 -0600

--
 CHANGES.txt   |2 +-
 conf/cassandra-env.sh |4 
 2 files changed, 5 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1423fb11/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 33d6786..5d96a0c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
  * Improve handling of directory creation failures (CASSANDRA-5196)
  * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
  * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
+ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 
 
 1.2.1
@@ -271,7 +272,6 @@ Merged from 1.1:
  * remove redundant name column from schema_keyspaces (CASSANDRA-4433)
  * improve nodetool ring handling of multi-dc clusters (CASSANDRA-3047)
  * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
- * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
  * split up rpc timeout by operation type (CASSANDRA-2819)
  * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
  * update MS protocol with a version handshake + broadcast address id

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1423fb11/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index e38371f..daae043 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,6 +202,10 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
+if [ $java_version = 1.7 ]
+then
+JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
+fi
 
 # GC logging options -- uncomment to enable
 # JVM_OPTS=$JVM_OPTS -XX:+PrintGCDetails



[jira] [Resolved] (CASSANDRA-4366) add UseCondCardMark XX jvm settings on jdk 1.7

2013-02-08 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis resolved CASSANDRA-4366.
---

   Resolution: Fixed
Fix Version/s: (was: 1.2.0 beta 1)
   1.2.2

I reverted this accidentally during a merge from 1.1 
(02308f6f9ae272fde101357a7d395f0118b80d0d).  So it didn't actually make it into 
beta1 after all.

Re-committed in 1423fb11037ef23aef3e78516d8d2e8f7acb54ba.

 add UseCondCardMark XX jvm settings on jdk 1.7
 --

 Key: CASSANDRA-4366
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4366
 Project: Cassandra
  Issue Type: Improvement
  Components: Packaging
Affects Versions: 1.2.0 beta 1
Reporter: Dave Brosius
Assignee: Dave Brosius
Priority: Trivial
 Fix For: 1.2.2

 Attachments: 4366.txt


 found by jbellis
 adding jvm extension setting UseCondCardMark as defined here
 http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7029167
 for better lock handling especially on hotspot with multicore processors.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of ThirdPartySupport by Steve Tauber

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The ThirdPartySupport page has been changed by Steve Tauber:
http://wiki.apache.org/cassandra/ThirdPartySupport?action=diffrev1=38rev2=39

  Impetus’ initiatives and implementation experience include- 1. JPA Compliant, 
Polyglot NoSQL Client  Object Mapper (Kundera)- An annotation based Java 
library for Cassandra database (http://bigdata.impetus.com/open_source_kundera 
). 2. CassUI- A web-based database browser for the Cassandra NoSQL database. It 
is helpful in managing databases in remote deployments, particularly in Cloud 
environments (https://code.google.com/p/cassui/). More details- 
http://bigdata.impetus.com
  
  
- {{http://www.onzra.com/images/Small-Logo.gif}} [[http://www.ONZRA.com|ONZRA]] 
has been around for over 10 years and specializes on enterprise grade 
architecture, development and security consulting services utilizing many large 
scale database technologies such as Cassandra, Oracle, Alegro Graph, and much 
more.
+ {{http://www.onzra.com/img/Small-Logo.gif}} [[http://www.ONZRA.com|ONZRA]] 
has been around for over 10 years and specializes on enterprise grade 
architecture, development and security consulting services utilizing many large 
scale database technologies such as Cassandra, Oracle, Alegro Graph, and much 
more.
  
  [[http://datastax.com|Venarc]], Southern California's leading Open-source 
development house.  We have expertise in Apache Cassandra™, Spring, and JAVA.  
We have the experience to guide you in the right direction for your high 
availability software and hardware needs.
  


[Cassandra Wiki] Trivial Update of ZXLCharis by ZXLCharis

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The ZXLCharis page has been changed by ZXLCharis:
http://wiki.apache.org/cassandra/ZXLCharis?action=diffrev1=1rev2=2

- Hey guys !! I am BIANCA DAVIS. I reside in Concord.BR
- I want to study at The Professional School which has a branch in Gilbert. I 
like to do Wire Jewelry making. My dad name is Jeff and he is a Builder. My 
mother is a Test developer.BR
+ Hey guys !! The name is SHARLEEN ROBERSON. I live in Independence.BR
+ I study at The Immediately Military School which has a branch in Monterey. 
One day i would want to do Hummels. My daddy name is Stephen  and he is a Coast 
guard. My mom is a Marksman.BR
  BR
- Feel free to surf to my homepage ... 
[[http://www.cleanscreenxcel.com/cheapmonsterbeatsbydre.html|beats by dre 
monster]]
+ Feel free to visit my website ... 
[[http://www.unitedchem.com/beatbydre.aspx|beats audio headphones]]
  


[1/5] CQL3 refactor to allow conversion function

2013-02-08 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/FloatType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/FloatType.java 
b/src/java/org/apache/cassandra/db/marshal/FloatType.java
index 95854e1..cb3cc3b 100644
--- a/src/java/org/apache/cassandra/db/marshal/FloatType.java
+++ b/src/java/org/apache/cassandra/db/marshal/FloatType.java
@@ -18,12 +18,9 @@
 package org.apache.cassandra.db.marshal;
 
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcFloat;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 
@@ -31,8 +28,6 @@ public class FloatType extends AbstractTypeFloat
 {
 public static final FloatType instance = new FloatType();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.INTEGER, Term.Type.FLOAT);
-
 FloatType() {} // singleton
 
 public Float compose(ByteBuffer bytes)
@@ -94,11 +89,6 @@ public class FloatType extends AbstractTypeFloat
 throw new MarshalException(String.format(Expected 4 or 0 byte 
value for a float (%d), bytes.remaining()));
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.FLOAT;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java 
b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
index e90bdf3..f060354 100644
--- a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
+++ b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
@@ -20,20 +20,15 @@ package org.apache.cassandra.db.marshal;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcInetAddress;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class InetAddressType extends AbstractTypeInetAddress
 {
 public static final InetAddressType instance = new InetAddressType();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.STRING);
-
 InetAddressType() {} // singleton
 
 public InetAddress compose(ByteBuffer bytes)
@@ -88,11 +83,6 @@ public class InetAddressType extends 
AbstractTypeInetAddress
 }
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.INET;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/Int32Type.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/Int32Type.java 
b/src/java/org/apache/cassandra/db/marshal/Int32Type.java
index a945074..1e206ff 100644
--- a/src/java/org/apache/cassandra/db/marshal/Int32Type.java
+++ b/src/java/org/apache/cassandra/db/marshal/Int32Type.java
@@ -18,20 +18,15 @@
 package org.apache.cassandra.db.marshal;
 
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcInt32;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class Int32Type extends AbstractTypeInteger
 {
 public static final Int32Type instance = new Int32Type();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.INTEGER);
-
 Int32Type() {} // singleton
 
 public Integer compose(ByteBuffer bytes)
@@ -101,11 +96,6 @@ public class Int32Type extends AbstractTypeInteger
 throw new MarshalException(String.format(Expected 4 or 0 byte int 
(%d), bytes.remaining()));
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.INT;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/IntegerType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/IntegerType.java 
b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
index d492ba6..de675f6 100644
--- a/src/java/org/apache/cassandra/db/marshal/IntegerType.java
+++ b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
@@ -19,20 +19,15 @@ 

git commit: Fix drop of sstables in certain circumstance

2013-02-08 Thread slebresne
Updated Branches:
  refs/heads/cassandra-1.2 31e669ab4 - 5632a56c4


Fix drop of sstables in certain circumstance

patch by slebresne; reviewed by jbellis for CASSANDRA-5232


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5632a56c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5632a56c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5632a56c

Branch: refs/heads/cassandra-1.2
Commit: 5632a56c469ca49d43842a399de687e47f9be1db
Parents: 31e669a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Feb 8 18:48:42 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Feb 8 18:48:42 2013 +0100

--
 CHANGES.txt   |1 +
 src/java/org/apache/cassandra/db/DataTracker.java |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f7afdf1..21e6092 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
  * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
  * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
  * CQL3 refactor to allow conversion function (CASSANDRA-5226)
+ * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 
 
 1.2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/src/java/org/apache/cassandra/db/DataTracker.java
--
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java 
b/src/java/org/apache/cassandra/db/DataTracker.java
index 749b64e..b6bcebd 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -506,7 +506,7 @@ public class DataTracker
 {
 SetMemtable newPending = 
ImmutableSet.copyOf(Sets.difference(memtablesPendingFlush, 
Collections.singleton(flushedMemtable)));
 SetSSTableReader newSSTables = newSSTable == null
-? 
Collections.SSTableReaderemptySet()
+? sstables
 : newSSTables(newSSTable);
 SSTableIntervalTree intervalTree = buildIntervalTree(newSSTables);
 return new View(memtable, newPending, newSSTables, compacting, 
intervalTree);



[Cassandra Wiki] Trivial Update of LoujwMcwi by LoujwMcwi

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The LoujwMcwi page has been changed by LoujwMcwi:
http://wiki.apache.org/cassandra/LoujwMcwi

New page:
Howdy !! The name is CAROLYNN MAYER. I am turning 50.BR
I go to night school at The Jovial Academy located in Stirling. I also like to 
Freshwater Aquariums. My dad name is Danny  and he is a Cook. My mother is a 
Public Relations Officer.BR
BR
My webpage :: [[http://www.fairchanelbagsstore.com|chanel handbags]]


[6/7] git commit: Fix drop of sstables in certain circumstance

2013-02-08 Thread slebresne
Fix drop of sstables in certain circumstance

patch by slebresne; reviewed by jbellis for CASSANDRA-5232


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5632a56c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5632a56c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5632a56c

Branch: refs/heads/trunk
Commit: 5632a56c469ca49d43842a399de687e47f9be1db
Parents: 31e669a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Feb 8 18:48:42 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Feb 8 18:48:42 2013 +0100

--
 CHANGES.txt   |1 +
 src/java/org/apache/cassandra/db/DataTracker.java |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index f7afdf1..21e6092 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
  * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
  * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
  * CQL3 refactor to allow conversion function (CASSANDRA-5226)
+ * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 
 
 1.2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/src/java/org/apache/cassandra/db/DataTracker.java
--
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java 
b/src/java/org/apache/cassandra/db/DataTracker.java
index 749b64e..b6bcebd 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -506,7 +506,7 @@ public class DataTracker
 {
 SetMemtable newPending = 
ImmutableSet.copyOf(Sets.difference(memtablesPendingFlush, 
Collections.singleton(flushedMemtable)));
 SetSSTableReader newSSTables = newSSTable == null
-? 
Collections.SSTableReaderemptySet()
+? sstables
 : newSSTables(newSSTable);
 SSTableIntervalTree intervalTree = buildIntervalTree(newSSTables);
 return new View(memtable, newPending, newSSTables, compacting, 
intervalTree);



[1/7] CQL3 refactor to allow conversion function

2013-02-08 Thread slebresne
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/FloatType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/FloatType.java 
b/src/java/org/apache/cassandra/db/marshal/FloatType.java
index 95854e1..cb3cc3b 100644
--- a/src/java/org/apache/cassandra/db/marshal/FloatType.java
+++ b/src/java/org/apache/cassandra/db/marshal/FloatType.java
@@ -18,12 +18,9 @@
 package org.apache.cassandra.db.marshal;
 
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcFloat;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 
@@ -31,8 +28,6 @@ public class FloatType extends AbstractTypeFloat
 {
 public static final FloatType instance = new FloatType();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.INTEGER, Term.Type.FLOAT);
-
 FloatType() {} // singleton
 
 public Float compose(ByteBuffer bytes)
@@ -94,11 +89,6 @@ public class FloatType extends AbstractTypeFloat
 throw new MarshalException(String.format(Expected 4 or 0 byte 
value for a float (%d), bytes.remaining()));
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.FLOAT;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java 
b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
index e90bdf3..f060354 100644
--- a/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
+++ b/src/java/org/apache/cassandra/db/marshal/InetAddressType.java
@@ -20,20 +20,15 @@ package org.apache.cassandra.db.marshal;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcInetAddress;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class InetAddressType extends AbstractTypeInetAddress
 {
 public static final InetAddressType instance = new InetAddressType();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.STRING);
-
 InetAddressType() {} // singleton
 
 public InetAddress compose(ByteBuffer bytes)
@@ -88,11 +83,6 @@ public class InetAddressType extends 
AbstractTypeInetAddress
 }
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.INET;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/Int32Type.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/Int32Type.java 
b/src/java/org/apache/cassandra/db/marshal/Int32Type.java
index a945074..1e206ff 100644
--- a/src/java/org/apache/cassandra/db/marshal/Int32Type.java
+++ b/src/java/org/apache/cassandra/db/marshal/Int32Type.java
@@ -18,20 +18,15 @@
 package org.apache.cassandra.db.marshal;
 
 import java.nio.ByteBuffer;
-import java.util.EnumSet;
-import java.util.Set;
 
 import org.apache.cassandra.cql.jdbc.JdbcInt32;
 import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Term;
 import org.apache.cassandra.utils.ByteBufferUtil;
 
 public class Int32Type extends AbstractTypeInteger
 {
 public static final Int32Type instance = new Int32Type();
 
-private final SetTerm.Type supportedCQL3Constants = 
EnumSet.of(Term.Type.INTEGER);
-
 Int32Type() {} // singleton
 
 public Integer compose(ByteBuffer bytes)
@@ -101,11 +96,6 @@ public class Int32Type extends AbstractTypeInteger
 throw new MarshalException(String.format(Expected 4 or 0 byte int 
(%d), bytes.remaining()));
 }
 
-public SetTerm.Type supportedCQL3Constants()
-{
-return supportedCQL3Constants;
-}
-
 public CQL3Type asCQL3Type()
 {
 return CQL3Type.Native.INT;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31e669ab/src/java/org/apache/cassandra/db/marshal/IntegerType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/IntegerType.java 
b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
index d492ba6..de675f6 100644
--- a/src/java/org/apache/cassandra/db/marshal/IntegerType.java
+++ b/src/java/org/apache/cassandra/db/marshal/IntegerType.java
@@ -19,20 +19,15 @@ 

[Cassandra Wiki] Trivial Update of MitchellM by MitchellM

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The MitchellM page has been changed by MitchellM:
http://wiki.apache.org/cassandra/MitchellM

New page:
Hello !! I am HENRIETTA LANG. I belong to Huntsville.BR
My school's name is The Messy Boarding School in New York City. I have a job as 
Electrician. I am a fan of Hot Air Ballooning. My papa name is Greg and he is a 
Saxophonist. My momy is a Analyst.BR
BR
Also visit my homepage; [[http://www.addiehandbags.com|gucci belt]]


[Cassandra Wiki] Trivial Update of DrusillaH by DrusillaH

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The DrusillaH page has been changed by DrusillaH:
http://wiki.apache.org/cassandra/DrusillaH

New page:
Yo bros !! The name is LILLIAN GALLOWAY. I am from Simi Valley.BR
I am 56. My parents want me to join The Gleeful Institute situated in Plano. My 
daddy name is Bryan and he is a Bishop. My mom is a Lyricist.BR
BR
Also visit my site [[http://www.aldorabag.com|chanel bags]]


git commit: cqlsh: ninja-fix indentation in Shell constructor

2013-02-08 Thread aleksey
Updated Branches:
  refs/heads/cassandra-1.1 6bddbb2dd - 310bf3485


cqlsh: ninja-fix indentation in Shell constructor


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/310bf348
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310bf348
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310bf348

Branch: refs/heads/cassandra-1.1
Commit: 310bf348521e25f9142e5a62dc206555b83e1a68
Parents: 6bddbb2
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:49:31 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:49:31 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/310bf348/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 967f2f1..be4ecfc 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -593,13 +593,13 @@ class Shell(cmd.Cmd):
 self.conn = use_conn
 else:
 self.conn = cql.connect(hostname, port, user=username, 
password=password)
-self.set_expanded_cql_version(cqlver)
-# we could set the keyspace through cql.connect(), but as of 
1.0.10,
-# it doesn't quote the keyspace for USE :(
-if keyspace is not None:
-tempcurs = self.conn.cursor()
-tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
-tempcurs.close()
+self.set_expanded_cql_version(cqlver)
+# we could set the keyspace through cql.connect(), but as of 1.0.10,
+# it doesn't quote the keyspace for USE :(
+if keyspace is not None:
+tempcurs = self.conn.cursor()
+tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
+tempcurs.close()
 self.cursor = self.conn.cursor()
 
 self.current_keyspace = keyspace



[1/2] git commit: cqlsh: ninja-fix indentation in Shell constructor

2013-02-08 Thread aleksey
cqlsh: ninja-fix indentation in Shell constructor


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/310bf348
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310bf348
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310bf348

Branch: refs/heads/cassandra-1.2
Commit: 310bf348521e25f9142e5a62dc206555b83e1a68
Parents: 6bddbb2
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:49:31 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:49:31 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/310bf348/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 967f2f1..be4ecfc 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -593,13 +593,13 @@ class Shell(cmd.Cmd):
 self.conn = use_conn
 else:
 self.conn = cql.connect(hostname, port, user=username, 
password=password)
-self.set_expanded_cql_version(cqlver)
-# we could set the keyspace through cql.connect(), but as of 
1.0.10,
-# it doesn't quote the keyspace for USE :(
-if keyspace is not None:
-tempcurs = self.conn.cursor()
-tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
-tempcurs.close()
+self.set_expanded_cql_version(cqlver)
+# we could set the keyspace through cql.connect(), but as of 1.0.10,
+# it doesn't quote the keyspace for USE :(
+if keyspace is not None:
+tempcurs = self.conn.cursor()
+tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
+tempcurs.close()
 self.cursor = self.conn.cursor()
 
 self.current_keyspace = keyspace



[2/2] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-02-08 Thread aleksey
Updated Branches:
  refs/heads/cassandra-1.2 5632a56c4 - 7347d968d


Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
bin/cqlsh


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7347d968
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7347d968
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7347d968

Branch: refs/heads/cassandra-1.2
Commit: 7347d968d0d65fe14c6d8bf37c877f62a16ba34a
Parents: 5632a56 310bf34
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:53:13 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:53:13 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7347d968/bin/cqlsh
--
diff --cc bin/cqlsh
index b2e9755,be4ecfc..4f58bdc
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -478,26 -592,15 +478,26 @@@ class Shell(cmd.Cmd)
  if use_conn is not None:
  self.conn = use_conn
  else:
 -self.conn = cql.connect(hostname, port, user=username, 
password=password)
 +transport = transport_factory(hostname, port, os.environ, 
CONFIG_FILE)
 +self.conn = cql.connect(hostname, port, user=username, 
password=password,
 +cql_version=cqlver, transport=transport)
- self.set_expanded_cql_version(cqlver)
- # we could set the keyspace through cql.connect(), but as of 
1.0.10,
- # it doesn't quote the keyspace for USE :(
- if keyspace is not None:
- tempcurs = self.conn.cursor()
- tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
- tempcurs.close()
+ self.set_expanded_cql_version(cqlver)
+ # we could set the keyspace through cql.connect(), but as of 1.0.10,
+ # it doesn't quote the keyspace for USE :(
+ if keyspace is not None:
+ tempcurs = self.conn.cursor()
+ tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
+ tempcurs.close()
  self.cursor = self.conn.cursor()
 +self.get_connection_versions()
 +
 +# use 3.0.0-beta1 syntax if explicitly requested, or if using
 +# cassandra  1.2. this only affects use of cql3; cql2 syntax
 +# in either case is the same.
 +if self.cassandraver_atleast(1, 2) and not self.is_cql3_beta():
 +cql3handling.use_post_3_0_0_syntax()
 +else:
 +cql3handling.use_pre_3_0_0_syntax()
  
  self.current_keyspace = keyspace
  



[3/3] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-08 Thread aleksey
Updated Branches:
  refs/heads/trunk aae62a76c - 850440900


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85044090
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85044090
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85044090

Branch: refs/heads/trunk
Commit: 850440900b2674146aeb88286e30269d8387f962
Parents: aae62a7 7347d96
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:54:10 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:54:10 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--




[2/3] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-02-08 Thread aleksey
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
bin/cqlsh


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7347d968
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7347d968
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7347d968

Branch: refs/heads/trunk
Commit: 7347d968d0d65fe14c6d8bf37c877f62a16ba34a
Parents: 5632a56 310bf34
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:53:13 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:53:13 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7347d968/bin/cqlsh
--
diff --cc bin/cqlsh
index b2e9755,be4ecfc..4f58bdc
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -478,26 -592,15 +478,26 @@@ class Shell(cmd.Cmd)
  if use_conn is not None:
  self.conn = use_conn
  else:
 -self.conn = cql.connect(hostname, port, user=username, 
password=password)
 +transport = transport_factory(hostname, port, os.environ, 
CONFIG_FILE)
 +self.conn = cql.connect(hostname, port, user=username, 
password=password,
 +cql_version=cqlver, transport=transport)
- self.set_expanded_cql_version(cqlver)
- # we could set the keyspace through cql.connect(), but as of 
1.0.10,
- # it doesn't quote the keyspace for USE :(
- if keyspace is not None:
- tempcurs = self.conn.cursor()
- tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
- tempcurs.close()
+ self.set_expanded_cql_version(cqlver)
+ # we could set the keyspace through cql.connect(), but as of 1.0.10,
+ # it doesn't quote the keyspace for USE :(
+ if keyspace is not None:
+ tempcurs = self.conn.cursor()
+ tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
+ tempcurs.close()
  self.cursor = self.conn.cursor()
 +self.get_connection_versions()
 +
 +# use 3.0.0-beta1 syntax if explicitly requested, or if using
 +# cassandra  1.2. this only affects use of cql3; cql2 syntax
 +# in either case is the same.
 +if self.cassandraver_atleast(1, 2) and not self.is_cql3_beta():
 +cql3handling.use_post_3_0_0_syntax()
 +else:
 +cql3handling.use_pre_3_0_0_syntax()
  
  self.current_keyspace = keyspace
  



[1/3] git commit: cqlsh: ninja-fix indentation in Shell constructor

2013-02-08 Thread aleksey
cqlsh: ninja-fix indentation in Shell constructor


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/310bf348
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310bf348
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310bf348

Branch: refs/heads/trunk
Commit: 310bf348521e25f9142e5a62dc206555b83e1a68
Parents: 6bddbb2
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 8 21:49:31 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 8 21:49:31 2013 +0300

--
 bin/cqlsh |   14 +++---
 1 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/310bf348/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 967f2f1..be4ecfc 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -593,13 +593,13 @@ class Shell(cmd.Cmd):
 self.conn = use_conn
 else:
 self.conn = cql.connect(hostname, port, user=username, 
password=password)
-self.set_expanded_cql_version(cqlver)
-# we could set the keyspace through cql.connect(), but as of 
1.0.10,
-# it doesn't quote the keyspace for USE :(
-if keyspace is not None:
-tempcurs = self.conn.cursor()
-tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
-tempcurs.close()
+self.set_expanded_cql_version(cqlver)
+# we could set the keyspace through cql.connect(), but as of 1.0.10,
+# it doesn't quote the keyspace for USE :(
+if keyspace is not None:
+tempcurs = self.conn.cursor()
+tempcurs.execute('USE %s;' % self.cql_protect_name(keyspace))
+tempcurs.close()
 self.cursor = self.conn.cursor()
 
 self.current_keyspace = keyspace



[jira] [Commented] (CASSANDRA-5235) Error when executing a file contains CQL statement in cqlsh

2013-02-08 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-5235:
-

+1

 Error when executing a file contains CQL statement in cqlsh
 ---

 Key: CASSANDRA-5235
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5235
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.1.9, 1.2.1
 Environment: Redhat linux 5, windows 7
Reporter: Shamim Ahmed
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.10, 1.2.2

 Attachments: 5235.txt


 When executing a file contains CQL statement returns following error:
 cqlsh source '/tmp/src/xyz.cql';
 Shell instance has no attribute 'cql_ver_tuple'

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5225) Missing columns, errors when requesting specific columns from wide rows

2013-02-08 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-5225:
-

I applied the patch correctly, but the bug is in the pycassa script itself... I 
was hitting an edge case where it asked for the same column twice.

 Missing columns, errors when requesting specific columns from wide rows
 ---

 Key: CASSANDRA-5225
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5225
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.1
Reporter: Tyler Hobbs
Priority: Critical
 Fix For: 1.2.2

 Attachments: 5225.txt, pycassa-repro.py


 With Cassandra 1.2.1 (and probably 1.2.0), I'm seeing some problems with 
 Thrift queries that request a set of specific column names when the row is 
 very wide.
 To reproduce, I'm inserting 10 million columns into a single row and then 
 randomly requesting three columns by name in a loop.  It's common for only 
 one or two of the three columns to be returned.  I'm also seeing stack traces 
 like the following in the Cassandra log:
 {noformat}
 ERROR 13:12:01,017 Exception in thread Thread[ReadStage:76,5,main]
 java.lang.RuntimeException: 
 org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1576)
   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: org.apache.cassandra.io.sstable.CorruptSSTableException: 
 org.apache.cassandra.db.ColumnSerializer$CorruptColumnException: invalid 
 column name length 0 
 (/var/lib/cassandra/data/Keyspace1/CF1/Keyspace1-CF1-ib-5-Data.db, 14035168 
 bytes remaining)
   at 
 org.apache.cassandra.db.columniterator.SSTableNamesIterator.init(SSTableNamesIterator.java:69)
   at 
 org.apache.cassandra.db.filter.NamesQueryFilter.getSSTableColumnIterator(NamesQueryFilter.java:81)
   at 
 org.apache.cassandra.db.filter.QueryFilter.getSSTableColumnIterator(QueryFilter.java:68)
   at 
 org.apache.cassandra.db.CollationController.collectTimeOrderedData(CollationController.java:133)
   at 
 org.apache.cassandra.db.CollationController.getTopLevelColumns(CollationController.java:65)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getTopLevelColumns(ColumnFamilyStore.java:1358)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1215)
   at 
 org.apache.cassandra.db.ColumnFamilyStore.getColumnFamily(ColumnFamilyStore.java:1127)
   at org.apache.cassandra.db.Table.getRow(Table.java:355)
   at 
 org.apache.cassandra.db.SliceByNamesReadCommand.getRow(SliceByNamesReadCommand.java:64)
   at 
 org.apache.cassandra.service.StorageProxy$LocalReadRunnable.runMayThrow(StorageProxy.java:1052)
   at 
 org.apache.cassandra.service.StorageProxy$DroppableRunnable.run(StorageProxy.java:1572)
   ... 3 more
 {noformat}
 This doesn't seem to happen when the row is smaller, so it might have 
 something to do with incremental large row compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-5234) Table created through CQL3 are not accessble to Pig 0.10

2013-02-08 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-5234:
-

See CASSANDRA-4421

 Table created through CQL3 are not accessble to Pig 0.10
 

 Key: CASSANDRA-5234
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5234
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Affects Versions: 1.2.1
 Environment: Red hat linux 5
Reporter: Shamim Ahmed
 Fix For: 1.2.2


 Hi,
   i have faced a bug when creating table through CQL3 and trying to load data 
 through pig 0.10 as follows:
 java.lang.RuntimeException: Column family 'abc' not found in keyspace 'XYZ'
   at 
 org.apache.cassandra.hadoop.pig.CassandraStorage.initSchema(CassandraStorage.java:1112)
   at 
 org.apache.cassandra.hadoop.pig.CassandraStorage.setLocation(CassandraStorage.java:615).
 This effects from Simple table to table with compound key. 

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of DevinPoll by DevinPoll

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The DevinPoll page has been changed by DevinPoll:
http://wiki.apache.org/cassandra/DevinPoll

New page:
My age is 27. I am taking admission in The Spotted Finishing School of 
Light-Hearted Education which has a branch in Saint Louis.BR
I am planning to become a Welder. I am a fan of Rock Collecting . My dad name 
is Shawn  and he is a Archbishop. My mother is a Poll-taker.BR
BR
Here is my page - [[http://louis-vuitton-outlets.blinkweb.com|louis vuitton 
online store]]


[Cassandra Wiki] Trivial Update of MartinDer by MartinDer

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The MartinDer page has been changed by MartinDer:
http://wiki.apache.org/cassandra/MartinDer

New page:
Hi !! The name is ELSIE TRAVIS. I belong to Baltimore.BR
I want to study at The Quality Prep School built at Tyler. I like to do Chess. 
My dad name is Frank  and he is a Odontologist. My momy is a Etymologist.BR
BR
My blog - [[http://www.unitedchem.com/beatbydre.aspx|cheap dre beats]]


[jira] [Created] (CASSANDRA-5236) Migration during shutdown can cause AE

2013-02-08 Thread Brandon Williams (JIRA)
Brandon Williams created CASSANDRA-5236:
---

 Summary: Migration during shutdown can cause AE
 Key: CASSANDRA-5236
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5236
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Reporter: Brandon Williams
Assignee: Brandon Williams
Priority: Trivial
 Fix For: 1.2.2


Mostly just a problem for the dtests on occasion:

{noformat}
 INFO [FlushWriter:1] 2013-02-08 17:03:49,727 Memtable.java (line 453) Writing 
Memtable-schema_columns@1757448463(793/793 serialized/live bytes, 15 ops)
 INFO [FlushWriter:1] 2013-02-08 17:03:49,752 Memtable.java (line 487) 
Completed flushing 
/tmp/dtest-gEW6x2/test/node3/data/system/schema_columns/system-schema_columns-ib-4-Data.db
 (339 bytes) for commitlog position ReplayPosition(segmentId=1360364624598, 
position=66887)
 INFO [CompactionExecutor:2] 2013-02-08 17:03:49,754 CompactionTask.java (line 
112) Compacting 
[SSTableReader(path='/tmp/dtest-gEW6x2/test/node3/data/system/schema_columns/system-schema_columns-ib-4-Data.db'),
 
SSTableReader(path='/tmp/dtest-gEW6x2/test/node3/data/system/schema_columns/system-schema_columns-ib-3-Data.db'),
 
SSTableReader(path='/tmp/dtest-gEW6x2/test/node3/data/system/schema_columns/system-schema_columns-ib-2-Data.db'),
 
SSTableReader(path='/tmp/dtest-gEW6x2/test/node3/data/system/schema_columns/system-schema_columns-ib-1-Data.db')]
 INFO [CompactionExecutor:3] 2013-02-08 17:03:49,759 CompactionTask.java (line 
272) Compacted 4 sstables to 
[/tmp/dtest-gEW6x2/test/node3/data/system/schema_columnfamilies/system-schema_columnfamilies-ib-5,].
  7,473 bytes to 5,595 (~74% of original) in 32ms = 0.166744MB/s.  6 total 
rows, 4 unique.  Row merge counts were {1:3, 2:0, 3:1, 4:0, }
ERROR [InternalResponseStage:1] 2013-02-08 17:03:49,787 CassandraDaemon.java 
(line 135) Exception in thread Thread[InternalResponseStage:1,5,main]
java.lang.AssertionError
at 
org.apache.cassandra.service.MigrationManager.passiveAnnounce(MigrationManager.java:320)
at 
org.apache.cassandra.config.Schema.updateVersionAndAnnounce(Schema.java:458)
at org.apache.cassandra.db.DefsTable.mergeSchema(DefsTable.java:347)
at 
org.apache.cassandra.service.MigrationTask$1.response(MigrationTask.java:66)
at 
org.apache.cassandra.net.ResponseVerbHandler.doVerb(ResponseVerbHandler.java:47)
at 
org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:56)
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)
{noformat}

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of Cyrus15F by Cyrus15F

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The Cyrus15F page has been changed by Cyrus15F:
http://wiki.apache.org/cassandra/Cyrus15F

New page:
I have applied for distance learning at The Successful Prep School of Shiny 
Education built at Oxnard.BR
I am self employed as a Dancer. I like to do Guns. My papa name is Darren  and 
he is a Banker. My mother is a Etymologist.BR
BR
my web page - [[http://cheap-beatsbydre.blinkweb.com|beats dre]]


[2/3] git commit: Modernize 4366 unrevert

2013-02-08 Thread brandonwilliams
Modernize 4366 unrevert


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bef66bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bef66bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bef66bc

Branch: refs/heads/trunk
Commit: 6bef66bce837f81063b5551a6952504bfd9db576
Parents: 7347d96
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:02:39 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:02:39 2013 -0600

--
 conf/cassandra-env.sh |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bef66bc/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index daae043..527dba0 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,8 +202,7 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
-if [ $java_version = 1.7 ]
-then
+if [ $JVM_VERSION \ 1.6.0 ]; then
 JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
 fi
 



[3/3] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-08 Thread brandonwilliams
Updated Branches:
  refs/heads/cassandra-1.2 7347d968d - 6bef66bce
  refs/heads/trunk 850440900 - 5f36ece0f


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f36ece0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f36ece0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f36ece0

Branch: refs/heads/trunk
Commit: 5f36ece0fcfafa51c4b7283d367c6baecbbb2c80
Parents: 8504409 6bef66b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:02:49 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:02:49 2013 -0600

--
 conf/cassandra-env.sh |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f36ece0/conf/cassandra-env.sh
--



[1/3] git commit: Modernize 4366 unrevert

2013-02-08 Thread brandonwilliams
Modernize 4366 unrevert


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bef66bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bef66bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bef66bc

Branch: refs/heads/cassandra-1.2
Commit: 6bef66bce837f81063b5551a6952504bfd9db576
Parents: 7347d96
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:02:39 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:02:39 2013 -0600

--
 conf/cassandra-env.sh |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6bef66bc/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index daae043..527dba0 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,8 +202,7 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
-if [ $java_version = 1.7 ]
-then
+if [ $JVM_VERSION \ 1.6.0 ]; then
 JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
 fi
 



[1/3] git commit: fix bash string comp

2013-02-08 Thread brandonwilliams
fix bash string comp


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0820b20f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0820b20f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0820b20f

Branch: refs/heads/cassandra-1.2
Commit: 0820b20fb259a015d856263ac3d59edcf6327dae
Parents: 6bef66b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:19:44 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:19:44 2013 -0600

--
 conf/cassandra-env.sh |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0820b20f/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 527dba0..462244c 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,7 +202,8 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
-if [ $JVM_VERSION \ 1.6.0 ]; then
+# note: bash evals '1.7.x' as  '1.7' so this is really a = 1.7 jvm check
+if [ $JVM_VERSION \ 1.7 ] ; then
 JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
 fi
 



[2/3] git commit: fix bash string comp

2013-02-08 Thread brandonwilliams
fix bash string comp


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0820b20f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0820b20f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0820b20f

Branch: refs/heads/trunk
Commit: 0820b20fb259a015d856263ac3d59edcf6327dae
Parents: 6bef66b
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:19:44 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:19:44 2013 -0600

--
 conf/cassandra-env.sh |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0820b20f/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 527dba0..462244c 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -202,7 +202,8 @@ JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
 JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
 JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
-if [ $JVM_VERSION \ 1.6.0 ]; then
+# note: bash evals '1.7.x' as  '1.7' so this is really a = 1.7 jvm check
+if [ $JVM_VERSION \ 1.7 ] ; then
 JVM_OPTS=$JVM_OPTS -XX:+UseCondCardMark
 fi
 



[3/3] git commit: Merge branch 'cassandra-1.2' into trunk

2013-02-08 Thread brandonwilliams
Updated Branches:
  refs/heads/cassandra-1.2 6bef66bce - 0820b20fb
  refs/heads/trunk 5f36ece0f - 4e9d01f50


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e9d01f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e9d01f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e9d01f5

Branch: refs/heads/trunk
Commit: 4e9d01f506bf289c3ce4ac644ddea7519f16e112
Parents: 5f36ece 0820b20
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Feb 8 18:19:50 2013 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Feb 8 18:19:50 2013 -0600

--
 conf/cassandra-env.sh |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e9d01f5/conf/cassandra-env.sh
--



[Cassandra Wiki] Trivial Update of ArmandGau by ArmandGau

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The ArmandGau page has been changed by ArmandGau:
http://wiki.apache.org/cassandra/ArmandGau

New page:
Hey fellas !! The name is SHAKIRA MALDONADO. Soon i will turn 27.BR
BR
My school's name is The Expert Military School in Austin. I have a job as Law 
enforcement agent. I am a fan of Surf Fishing. My dad name is 2nd LT James  and 
he is a Composer. My mummy is a Retailer.BR
BR
my website - [[http://www.addiehandbags.com|cheap gucci bags]]


[Cassandra Wiki] Trivial Update of SoonDonne by SoonDonne

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The SoonDonne page has been changed by SoonDonne:
http://wiki.apache.org/cassandra/SoonDonne

New page:
Hey fellas !! I am CRISSY SCHWARTZ. I reside in Ely.BR
BR
My age is 45. I want to study at The Shiny Preparatory situated in Jefferson. I 
want to become a Miner. I am a fan of Shadow Boxes. My father name is Jon and 
he is a Pharmacist. My mummy is a Messenger.BR
BR
Here is my page ... [[http://www.justbeatsphone.com|beats by dr dre headphones]]


[jira] [Commented] (CASSANDRA-5151) Implement better way of eliminating compaction left overs.

2013-02-08 Thread Michael Kjellman (JIRA)

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

Michael Kjellman commented on CASSANDRA-5151:
-

[~yukim]

looks like this isn't fool proof.

{code}
java.lang.IllegalStateException: Unfinished compactions reference missing 
sstables. This should never happen since compactions are marked finished before 
we start removing the old sstables.
at 
org.apache.cassandra.db.ColumnFamilyStore.removeUnfinishedCompactionLeftovers(ColumnFamilyStore.java:444)
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:213)
at 
org.apache.cassandra.service.CassandraDaemon.init(CassandraDaemon.java:324)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at 
org.apache.commons.daemon.support.DaemonLoader.load(DaemonLoader.java:188)
Cannot load daemon
Service exit with a return value of 3
{code}

 Implement better way of eliminating compaction left overs.
 --

 Key: CASSANDRA-5151
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5151
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.3
Reporter: Yuki Morishita
Assignee: Yuki Morishita
 Fix For: 1.2.2

 Attachments: 5151-1.2.txt, 5151-v2.txt


 This is from discussion in CASSANDRA-5137. Currently we skip loading SSTables 
 that are left over from incomplete compaction to not over-count counter, but 
 the way we track compaction completion is not secure.
 One possible solution is to create system CF like:
 {code}
 create table compaction_log (
   id uuid primary key,
   inputs setint,
   outputs setint
 );
 {code}
 to track incomplete compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Comment Edited] (CASSANDRA-5151) Implement better way of eliminating compaction left overs.

2013-02-08 Thread Michael Kjellman (JIRA)

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

Michael Kjellman edited comment on CASSANDRA-5151 at 2/9/13 2:06 AM:
-

[~yukim] looks like there might still be an unexpected condition here

{code}
java.lang.IllegalStateException: Unfinished compactions reference missing 
sstables. This should never happen since compactions are marked finished before 
we start removing the old sstables.
at 
org.apache.cassandra.db.ColumnFamilyStore.removeUnfinishedCompactionLeftovers(ColumnFamilyStore.java:444)
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:213)
at 
org.apache.cassandra.service.CassandraDaemon.init(CassandraDaemon.java:324)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at 
org.apache.commons.daemon.support.DaemonLoader.load(DaemonLoader.java:188)
Cannot load daemon
Service exit with a return value of 3
{code}

  was (Author: mkjellman):
[~yukim]

looks like this isn't fool proof.

{code}
java.lang.IllegalStateException: Unfinished compactions reference missing 
sstables. This should never happen since compactions are marked finished before 
we start removing the old sstables.
at 
org.apache.cassandra.db.ColumnFamilyStore.removeUnfinishedCompactionLeftovers(ColumnFamilyStore.java:444)
at 
org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:213)
at 
org.apache.cassandra.service.CassandraDaemon.init(CassandraDaemon.java:324)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at 
org.apache.commons.daemon.support.DaemonLoader.load(DaemonLoader.java:188)
Cannot load daemon
Service exit with a return value of 3
{code}
  
 Implement better way of eliminating compaction left overs.
 --

 Key: CASSANDRA-5151
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5151
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.3
Reporter: Yuki Morishita
Assignee: Yuki Morishita
 Fix For: 1.2.2

 Attachments: 5151-1.2.txt, 5151-v2.txt


 This is from discussion in CASSANDRA-5137. Currently we skip loading SSTables 
 that are left over from incomplete compaction to not over-count counter, but 
 the way we track compaction completion is not secure.
 One possible solution is to create system CF like:
 {code}
 create table compaction_log (
   id uuid primary key,
   inputs setint,
   outputs setint
 );
 {code}
 to track incomplete compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Created] (CASSANDRA-5237) Add consistency level EACH_ONCE

2013-02-08 Thread Srdjan Mitrovic (JIRA)
Srdjan Mitrovic created CASSANDRA-5237:
--

 Summary: Add consistency level EACH_ONCE
 Key: CASSANDRA-5237
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5237
 Project: Cassandra
  Issue Type: Improvement
Reporter: Srdjan Mitrovic
Priority: Minor


Use case:
If we have 2 datacenters and 2 replicas per datacenter a good fault tolerant 
consistency strategy would be to use level EACH_ONCE for writes as in that case 
it is fault tolerant even if 2 nodes die (one in each dc). If we assume that a 
node from local dc will always reply faster then remote dc we could use CL_TWO 
for reads and it would work fast for reads in normal conditions and be fault 
tolerant if a node or 2 nodes die.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of Cyrus15F by Cyrus15F

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The Cyrus15F page has been changed by Cyrus15F:
http://wiki.apache.org/cassandra/Cyrus15F?action=diffrev1=1rev2=2

- I have applied for distance learning at The Successful Prep School of Shiny 
Education built at Oxnard.BR
- I am self employed as a Dancer. I like to do Guns. My papa name is Darren  
and he is a Banker. My mother is a Etymologist.BR
+ I have applied for distance learning at The Short Boarding School of Approved 
People built at Chesapeake.BR
+ I am working as Alderman. I like to do Traveling. My father name is Cary and 
he is a Physician. My mother is a Blacksmith.BR
  BR
- my web page - [[http://cheap-beatsbydre.blinkweb.com|beats dre]]
+ Also visit my blog :: [[http://cheap-beatsbydre.blinkweb.com|dre dre beats]]
  


[jira] [Commented] (CASSANDRA-5151) Implement better way of eliminating compaction left overs.

2013-02-08 Thread Michael Kjellman (JIRA)

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

Michael Kjellman commented on CASSANDRA-5151:
-

wondering if this is related...

{code}
 INFO 18:43:25,360 Completed flushing 
/data/cassandra/system/compactions_in_progress/system-compactions_in_progress-ib-60-Data.db
 (192 bytes) for commitlog position ReplayPosition(segmentId=1360374628064, 
position=29215408)
 INFO 18:43:25,364 Compacting 
[SSTableReader(path='/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2182-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2180-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2185-Data.db'),
 
SSTableReader(path='/data/cassandra/evidence/fingerprints/evidence-fingerprints-ib-2181-Data.db'),
 
SSTableReader(path='/data/cassandra/evidence/fingerprints/evidence-fingerprints-ib-2184-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2183-Data.db'),
 
SSTableReader(path='/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2179-Data.db')]
ERROR 18:43:25,367 Exception in thread Thread[CompactionExecutor:85,1,main]
java.lang.RuntimeException: java.io.FileNotFoundException: 
/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2183-Data.db
 (No such file or directory)
at 
org.apache.cassandra.io.compress.CompressedRandomAccessReader.open(CompressedRandomAccessReader.java:61)
at 
org.apache.cassandra.io.sstable.SSTableReader.openDataReader(SSTableReader.java:1121)
at 
org.apache.cassandra.io.sstable.SSTableScanner.init(SSTableScanner.java:51)
at 
org.apache.cassandra.io.sstable.SSTableReader.getDirectScanner(SSTableReader.java:954)
at 
org.apache.cassandra.io.sstable.SSTableReader.getDirectScanner(SSTableReader.java:966)
at 
org.apache.cassandra.db.compaction.AbstractCompactionStrategy.getScanners(AbstractCompactionStrategy.java:147)
at 
org.apache.cassandra.db.compaction.AbstractCompactionStrategy.getScanners(AbstractCompactionStrategy.java:153)
at 
org.apache.cassandra.db.compaction.CompactionTask.runWith(CompactionTask.java:124)
at 
org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48)
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28)
at 
org.apache.cassandra.db.compaction.CompactionTask.execute(CompactionTask.java:63)
at 
org.apache.cassandra.db.compaction.CompactionManager$BackgroundCompactionTask.run(CompactionManager.java:193)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
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:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:722)
Caused by: java.io.FileNotFoundException: 
/var/lib/cassandra/data/evidence/fingerprints/evidence-fingerprints-ib-2183-Data.db
 (No such file or directory)
at java.io.RandomAccessFile.open(Native Method)
at java.io.RandomAccessFile.init(RandomAccessFile.java:233)
at 
org.apache.cassandra.io.util.RandomAccessReader.init(RandomAccessReader.java:67)
at 
org.apache.cassandra.io.compress.CompressedRandomAccessReader.init(CompressedRandomAccessReader.java:78)
at 
org.apache.cassandra.io.compress.CompressedRandomAccessReader.open(CompressedRandomAccessReader.java:57)
... 17 more
{code}

 Implement better way of eliminating compaction left overs.
 --

 Key: CASSANDRA-5151
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5151
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.3
Reporter: Yuki Morishita
Assignee: Yuki Morishita
 Fix For: 1.2.2

 Attachments: 5151-1.2.txt, 5151-v2.txt


 This is from discussion in CASSANDRA-5137. Currently we skip loading SSTables 
 that are left over from incomplete compaction to not over-count counter, but 
 the way we track compaction completion is not secure.
 One possible solution is to create system CF like:
 {code}
 create table compaction_log (
   id uuid primary key,
   inputs setint,
   outputs setint
 );
 {code}
 to track incomplete compaction.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: 

[jira] [Created] (CASSANDRA-5238) TokenMetadata.getToken java.lang.AssertionError

2013-02-08 Thread sunjian (JIRA)
sunjian created CASSANDRA-5238:
--

 Summary: TokenMetadata.getToken java.lang.AssertionError
 Key: CASSANDRA-5238
 URL: https://issues.apache.org/jira/browse/CASSANDRA-5238
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.5
Reporter: sunjian


ERROR [MutationStage:159] 2013-02-07 06:34:33,121 AbstractCassandraDaemon.java 
(line 135) Exception in thread Thread[MutationStage:159,5,main]
java.lang.AssertionError
at 
org.apache.cassandra.locator.TokenMetadata.getToken(TokenMetadata.java:304)
at 
org.apache.cassandra.service.StorageProxy$5.runMayThrow(StorageProxy.java:370)
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
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:722)
ERROR [MutationStage:140] 2013-02-07 06:34:38,124 AbstractCassandraDaemon.java 
(line 135) Exception in thread Thread[MutationStage:140,5,main]
java.lang.AssertionError
at 
org.apache.cassandra.locator.TokenMetadata.getToken(TokenMetadata.java:304)
at 
org.apache.cassandra.service.StorageProxy$5.runMayThrow(StorageProxy.java:370)
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
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:722)
ERROR [MutationStage:144] 2013-02-07 06:34:38,124 AbstractCassandraDaemon.java 
(line 135) Exception in thread Thread[MutationStage:144,5,main]
java.lang.AssertionError
at 
org.apache.cassandra.locator.TokenMetadata.getToken(TokenMetadata.java:304)
at 
org.apache.cassandra.service.StorageProxy$5.runMayThrow(StorageProxy.java:370)
at 
org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[Cassandra Wiki] Trivial Update of EusebiaLi by EusebiaLi

2013-02-08 Thread Apache Wiki
Dear Wiki user,

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

The EusebiaLi page has been changed by EusebiaLi:
http://wiki.apache.org/cassandra/EusebiaLi

New page:
Not much to say about me really.BR
Feels good to be a member of apache.org.BR
I really wish Im useful at allBR
BR
Feel free to visit my web blog - [[http://888poker.webmium.com|click through 
the up coming web page]]