Commit Graph

4185 Commits

Author SHA1 Message Date
Sylvain Lebresne 07cdfd07a3 [3649] Strip end of line whitespaces 2012-02-27 11:21:34 +01:00
Sylvain Lebresne 185e0250ab Minor javadoc tweaks
patch by dbrosius; reviewed by slebresne for CASSANDRA-3956
2012-02-27 10:54:09 +01:00
Jonathan Ellis 7587e73aab merge from 1.0 2012-02-24 10:46:10 -06:00
Jonathan Ellis 5cc12f37f6 always compact away deleted hints immediately after handoff
patch by brandonwilliams and jbellis for CASSANDRA-3955
2012-02-24 10:35:58 -06:00
Jonathan Ellis eac19fee03 Add a wrapper to the Runnables executed by DSTPE to prevent exceptions from killing the tasks. Replace ExpiringMap's timer with a DSTPE.
patch by jbellis; reviewed by slebresne for CASSANDRA-3537
2012-02-24 09:25:39 -06:00
Sylvain Lebresne ea28f42d71 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-24 13:58:30 +01:00
Sylvain Lebresne e2ac5303a2 More dead code 2012-02-24 13:56:42 +01:00
Sylvain Lebresne 5a175336fb Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
	.rat-excludes
	build.xml
	debian/changelog
2012-02-24 12:32:00 +01:00
Sylvain Lebresne 8ad7840b33 Remove dead code 2012-02-24 12:21:51 +01:00
Brandon Williams 4dcd15f48d Fix typo in log message 2012-02-23 22:13:18 -06:00
Sylvain Lebresne 5888fcd6af Avoids some exception when doing migration in a mixed 1.0-1.1 cluster
patch by xedin; reviewed by slebresne for CASSANDRA-3804
2012-02-23 18:02:28 +01:00
Pavel Yaskevich 9dbb1b7757 fix for intermittent SchemaDisagreementException
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-3884
2012-02-23 18:28:15 +03:00
Pavel Yaskevich e376bc02ec add a convenient way to reset a node's schema
patch by Yuki Morishita and Pavel Yaskevich; reviewed by Pavel Yaskevich for CASSANDRA-2963
2012-02-22 21:59:31 +03:00
Sylvain Lebresne 5030f78a5a Remove deprecated merge_shard_chance
patch by slebresne; reviewed by jbellis for CASSANDRA-3940
2012-02-22 16:32:07 +01:00
Sylvain Lebresne 68268954ac Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 14:23:06 +01:00
Sylvain Lebresne 8413d831d1 Fix short read protection
patch by slebresne; reviewed by driftx for CASSANDRA-3934
2012-02-22 14:21:53 +01:00
Sylvain Lebresne 9f90a7997a Fix bug with counter in super columns
patch by slebresne; reviewed by yukim for CASSANDRA-3821
2012-02-22 09:41:31 +01:00
Sylvain Lebresne 04e6dfb302 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 09:37:29 +01:00
Sylvain Lebresne f943a6edf2 Remove wait on hint future from writes
patch by slebresne; reviewed by amorton for CASSANDRA-3870
2012-02-22 09:24:43 +01:00
Chris Goffinet a47d4cbf0f Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop
Patch by goffinet, reviewed by goffinet for CASSANDRA-3944
2012-02-22 00:01:02 -08:00
Eric Evans c2f7af6e7e CASSANDRA-3939 properly initialize CliSessionState.schema_mwt
Patch by eevans for CASSANDRA-3939
2012-02-21 14:28:24 -06:00
Brandon Williams 527d590d43 Update gossip with schema version when merging from remote.
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-3931
2012-02-21 13:14:39 -06:00
Brandon Williams 83cfa9dd16 Use longs for ttl expiry calculation in BRW
Patch by Samarth Gahire, reviewed by brandonwilliams for CASSANDRA-3754
2012-02-21 08:31:50 -06:00
Brandon Williams d760706c92 Merge from 1.0 2012-02-21 08:03:58 -06:00
Sylvain Lebresne 058307b65e Update ORDER BY syntax for CQL3
patch by slebresne; reviewed by jbellis for CASSANDRA-3925
2012-02-20 11:04:00 +01:00
Vijay Parthasarathy 14d57389bf Show Effective Owership
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-3412
2012-02-17 15:28:19 -08:00
Brandon Williams 064adba2e1 Enable compression setting adjustment via JMX.
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-3815.
2012-02-17 05:24:26 -06:00
Sylvain Lebresne 8f570ea68e Fix concurrency issues with CQL keyspace creation
patch by slebresne; reviewed by thepaul for CASSANDRA-3903
2012-02-17 08:53:40 +01:00
Jonathan Ellis 94860c6c37 avoid unproductive deserializing of cached rows during compaction
patch by jbellis for CASSANDRA-3921
2012-02-16 09:26:38 -06:00
Sylvain Lebresne 271630d585 Fix streaming from all replica during boostrap/rebuild
patch by scode; reviewed by slebresne for CASSANDRA-3922
2012-02-16 09:40:13 +01:00
Jonathan Ellis 33199c6ca2 use metadata.cfId instead of re-looking it up for each cache update 2012-02-15 17:34:10 -06:00
Sylvain Lebresne b0c0faeed5 Fix typo in SuperColumn.mostRecentLiveChangeAt()
patch by slebresne; reviewed by driftx for CASSANDRA-3917
2012-02-15 18:38:07 +01:00
Sylvain Lebresne 7f4693dab9 Fix licenses and version for 1.1.0-beta1 2012-02-15 16:53:43 +01:00
Sylvain Lebresne e467533816 Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
2012-02-15 16:45:19 +01:00
Sylvain Lebresne 636e41dc3c Fix LazilyCompactedRowTest
patch by slebresne; reviewed by driftx for CASSANDRA-3915
2012-02-15 16:41:46 +01:00
Brandon Williams 984194d0c6 Correct InetAddress equality comparisons.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-3913
2012-02-15 09:07:33 -06:00
Peter Schuller 212fd417f3 Improve MessagingService assertion.
patch by scode; reviewed by jbellis for CASSANDRA-3887
2012-02-15 00:37:26 +01:00
T Jake Luciani b3bc28bdb4 add method signature for processing a already parsed CQL statement 2012-02-14 15:36:43 -05:00
Chris Goffinet 5dac2086dc Support compression using BulkWriter
Patch by goffinet, reviewed by Brandon Williams for CASSANDRA-3907
2012-02-14 09:58:15 -08:00
Chris Goffinet 648e62e58e BulkRecordWriter throws NPE for counter columns
Patch by goffinet and driftx, reviewed by Brandon Williams for CASSANDRA-3906
2012-02-14 09:12:33 -08:00
Brandon Williams d2c22a855c BulkOutputFormat no longer unnecessarily looks for cassandra.yaml.
Patch by brandonwilliams, reviewed by Chris Goffinet for CASSANDRA-3740
2012-02-14 07:29:35 -06:00
Sylvain Lebresne e0c655dc85 Avoids NPE on aborted stream sessions
patch by scode; reviewed by slebresne for CASSANDRA-3904
2012-02-14 14:14:05 +01:00
Sylvain Lebresne 82a75d4ae7 Finish cleanup up tombstone purge code
patch by slebresne; reviewed by jbellis for CASSANDRA-3872
2012-02-14 12:00:11 +01:00
Sylvain Lebresne ee2a135469 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-14 11:47:06 +01:00
Sylvain Lebresne 161e0527f2 Fix typo in nodetool help for repair
patch by scode; reviewed by jbellis for CASSANDRA-3905
2012-02-14 11:44:45 +01:00
Brandon Williams 1d435db703 Merge from 1.0 2012-02-13 17:34:34 -06:00
Jonathan Ellis c98edc3e81 merge from 1.0 2012-02-13 16:31:41 -06:00
Jonathan Ellis 9ca84786b5 fix race between cleanup and flush on secondary index CFSes
patch by yukim and jbellis for CASSANDRA-3712
2012-02-13 16:30:34 -06:00
Jonathan Ellis 4ab6fad945 fix unsynchronized use of TokenMetadata.entrySet
patch by Peter Schuller; reviewed by jbellis for CASSANDRA-3417
2012-02-13 15:44:50 -06:00
Jonathan Ellis c5986871c0 merge from 1.0 2012-02-13 15:41:30 -06:00