554d53664c
Replace keystore for utests with non export restricted cipher keys
...
patch by Stefan Podkowinski; reviewed by Jason Brown for CASSANDRA-12945
2016-11-28 05:14:19 -08:00
d4d71cd331
Merge branch 'cassandra-3.0' into trunk
2016-08-17 15:38:12 +02:00
5694a2ac3f
Debug logging for unit tests
...
Patch by marcuse; reviewed by Michael Shuler for CASSANDRA-12425
2016-08-17 15:08:08 +02:00
e1393ec54f
Unify STDOUT and SYSTEMLOG logback format
...
Patch by Jérôme Mainaud; Reviewed by Paulo Motta for CASSANDRA-12004
2016-07-27 15:38:32 +01:00
e31e216234
Add Change Data Capture
...
Patch by jmckenzie; reviewed by cyeksigian and blambov for CASSANDRA-8844
2016-06-16 10:01:39 -04:00
84db205b41
Merge branch 'cassandra-3.0' into trunk
2016-02-29 17:20:13 +00:00
6328590808
Merge branch 'cassandra-2.2' into cassandra-3.0
2016-02-29 17:19:19 +00:00
a24bd6c6a5
Preserve order for preferred SSL cipher suites
...
Patch by Stefan Podkowinski and Tom Petracca; reviewed by Stefania for CASSANDRA-11164
2016-02-29 17:17:47 +00:00
fdee887b42
Merge branch 'cassandra-3.0' into trunk
2016-02-19 10:30:50 +01:00
a76a8efcc7
Prevent logging in sandboxed state
...
patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-11033
2016-02-19 10:28:30 +01:00
2f41243191
9472: Reintroduce Off-Heap Memtables
...
patch by benedict and stefania
2016-01-27 10:49:26 +00:00
72790dc8e3
Integrate SASI index into Cassandra
...
patch by xedin; reviewed by beobal for CASSANDRA-10661
2016-01-23 19:35:29 -08:00
6f2b855c6e
Merge branch 'cassandra-3.0' into trunk
2015-10-16 13:29:30 +01:00
56cfc6ea35
Remove Pig support
...
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
2015-10-16 13:23:20 +01:00
07782aa4a5
Merge branch 'cassandra-3.0' into trunk
2015-10-07 10:48:48 +02:00
566799f567
Remove (unsupported) offheap_objects option
...
patch by slebresne; reviewed by aweisberg for CASSANDRA-10437
The 'objects offheap' allocator is currently not implemented for
Cassandra 3.0. The option will be re-introduced by CASSANDRA-9472
in a future release but in the meantime, the patch properly remove
the (now broken) option.
2015-10-07 10:45:40 +02:00
557bbbccb0
Abort in-progress queries that time out
...
patch by Stefania; reviewed by aweisberg for CASSANDRA-7392
2015-10-07 10:28:37 +02:00
4bb5976a7b
Merge branch 'cassandra-3.0' into trunk
2015-09-19 17:50:38 +01:00
cffa93c629
Set hints_directory in cassandra_pig.yaml
2015-09-19 17:50:06 +01:00
1944e402cf
Merge branch 'cassandra-3.0' into trunk
2015-09-15 16:16:56 +01:00
7ca4db0a11
Merge branch 'cassandra-2.2' into cassandra-3.0
2015-09-15 16:16:33 +01:00
cd4a1e6acc
Merge branch 'cassandra-2.1' into cassandra-2.2
2015-09-15 16:12:45 +01:00
c7b4073578
(Pig) support BulkOutputFormat as a URL parameter
...
patch by Alex Liu; reviewed by Piotr Kołaczkowski for CASSANDRA-7410
2015-09-15 16:08:54 +01:00
cabdb03a9f
Merge branch 'cassandra-3.0' into trunk
2015-08-19 17:30:00 +03:00
96d41f0e0e
Rewrite hinted handoff
...
patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6230
2015-08-19 17:27:22 +03:00
ef5962442e
Revert "Add transparent data encryption core classes (CASSANDRA-9945)"
...
This reverts commit 765ab3fc3b
2015-08-06 16:08:05 +02:00
765ab3fc3b
Add transparent data encryption core classes (CASSANDRA-9945)
2015-08-06 14:36:07 +02:00
72f5fbd236
Revert "Add transparent data encryption core classes"
...
This reverts commit 37160e109e
2015-08-03 16:42:38 -07:00
e37d577b6c
Disable scripted UDFs by default
...
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9889
2015-08-04 00:05:30 +02:00
37160e109e
Add transparent data encryption core classes
...
patch by jasobrown, reviewed by snazy for CASSANDRA-9945
2015-08-01 07:14:04 -07:00
00ed8017fd
Improve log output from unit tests
...
(follow-up to c8d3cc1493
2015-07-22 19:46:47 +02:00
a991b64811
Storage engine refactor, a.k.a CASSANDRA-8099
...
Initial patch, see ticket for details
2015-06-30 12:47:01 +02:00
c8d3cc1493
Improve log output from unit tests
...
patch by Ariel Weisberg; reviewed by Robert Stupp for CASSANDRA-9528
2015-06-24 08:09:52 +02:00
9a3fa887cf
Add algorithmic token allocation
...
patch by branimir; reviewed by benedict for CASSANDRA-7032
2015-06-23 12:03:45 +01:00
1936657570
Remove use of Cell in Thrift M/R classes
...
Patch and review by Philip Thompson and Sam Tunnicliffe for
CASSANDRA-8609
2015-06-04 10:46:57 +01:00
6c0a462624
Add a flag in cassandra.yaml to enable UDFs
...
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9404
2015-05-15 22:01:38 +02:00
160e7f2945
faster async logback configuration for tests
...
patch by awiesberg; reviewed by beobal for CASSANDRA-9376
2015-05-15 11:20:35 -04:00
44f8254df8
Compressed Commit Log
...
patch by branimir; reviewed by ariel for CASSANDRA-6809
2015-03-24 23:42:30 +00:00
dfd78d0e90
Serializing Row cache alternative, fully off heap
...
Patch by Robert Stupp, reviewed by Ariel Weisberg for CASSANDRA-7438
2015-01-21 20:50:35 +01:00
658a86933c
Merge branch 'cassandra-2.1' into trunk
2014-10-23 13:11:10 -05:00
8e5fdc2f94
move tests back to debug
2014-10-23 13:11:04 -05:00
796ddbc060
kill yaml snitch
2014-09-12 17:57:26 -05:00
18ce8c72a3
Merge branch 'cassandra-2.0' into cassandra-2.1.0
...
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/DataTracker.java
test/unit/org/apache/cassandra/db/CommitLogTest.java
2014-08-01 11:16:57 -04:00
60eab4e45e
Fix truncate to always call flush on table
...
Patch by Jeremiah Jordan; reviewed by tjake for (CASSANDRA-7511)
2014-08-01 10:30:48 -04:00
1e2a5b0ee3
Pig support for hadoop CqlInputFormat
...
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
2014-07-23 10:26:50 -05:00
3958fc4592
ninja fix: raise default concurrent compactors to 4 to avoid LCS test timeout
2014-07-01 14:39:12 -04:00
1569bd9c4b
clean out in_memory_compaction_limit
...
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428
2014-06-24 22:13:53 -05:00
a14a01c924
Fix memtable copy bug causing rangetombstones to be missed
...
patch by tjake; reviewed by benedict got CASSANDRA-7371
2014-06-16 16:10:06 -04:00
0932ed670c
Tuple types
...
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
2014-05-29 11:33:11 +02:00
48727b4ccb
Update versions and add licenses for 2.1-beta2 release
2014-05-01 16:40:15 +02:00
8541cca718
Push more of memtable data off-heap
...
patch by benedict & xedin; reviewed by benedict, iamaleksey & xedin for CASSANDRA-6694
2014-04-29 13:58:20 +02:00
1a3b5dbcb5
Add multiple memory allocation options for memtables
...
patch by benedict and xedin; reviewed by marcuse and xedin for CASSANDRA-6689
2014-03-25 14:21:07 -07:00
f67b7a477a
Auto reload GossipingPropertyFileSnitch config
...
Patch by Danield Shelepov, reviewed by Tyler Hobbs for CASSANDRA-5897
2014-03-06 11:22:47 -06:00
9f14856234
Versions and licenses in preparation for 2.1.0-beta1 release
2014-02-17 17:06:10 +01:00
379212d5de
Fix logback config in scripts and packaging.
...
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
2014-01-10 09:31:12 -06:00
0f13031023
Merge branch 'cassandra-2.0' into trunk
...
Conflicts:
build.xml
test/conf/log4j-junit.properties
2013-10-14 14:19:20 -05:00
fe598e77e6
Merge branch 'cassandra-1.2' into cassandra-2.0
...
Conflicts:
build.xml
src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
2013-10-14 14:17:05 -05:00
4e35969795
Add PigUnit unit tests.
...
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5695
2013-10-14 14:13:18 -05:00
4ba8e3c556
fix error in logback config files, causing INFO to spew unwantedly
2013-09-17 22:09:42 -04:00
fcd0aebb6e
Merge branch 'cassandra-2.0' into trunk
2013-09-14 17:47:02 -07:00
86b32704b4
Merge branch 'cassandra-1.2' into cassandra-2.0
2013-09-14 16:08:18 -07:00
742e5baf63
Fix CommitLogReplayer date time issue
...
patch by Vijay ; reviewed by jbellis for CASSANDRA-5909
2013-09-14 16:05:54 -07:00
0ec481bd64
add ThresholdFilter for stderr for tests for cassandra-5961
2013-08-30 20:39:20 -04:00
29605aedd9
switch logging from log4j to logback
...
patch by dbrosius reviewed by jbellis for cassandra-5883
2013-08-15 06:54:37 -04:00
4f2fdc2e73
Fix trigger directory detection code
...
Patch by Vijay, reviewed by jebllis for CASSANDRA-5826
2013-08-03 11:21:07 -07:00
81cbdc5312
Add yaml network topology snitch for mixed ec2/other envs
...
Patch by Eric Dong, reviewed by brandonwilliams for CASSANDRA-5339
2013-04-02 14:56:32 -05:00
e79d9fbf84
Remove memory emergency pressure valve logic
...
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-3534
2013-03-11 19:24:27 +03:00
0b83682b40
Add CQL3-based implementations of IAuthenticator and IAuthorizer
...
Patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-4898
2013-02-15 01:26:10 +03:00
e90dcd51d0
Make Ec2Region's datacenter name configurable
...
patch by Jason Brown; reviewed by Vijay for CASSANDRA-5155
2013-01-14 20:57:25 -08:00
40e22489cd
r/m obsolete and unnecessary rpc_timeout_in_ms override from test config
2012-12-04 21:58:20 -06:00
5a3eb1a6c3
Replace IAuthority with new IAuthorizer; patch by Aleksey Yeschenko,
...
reviewed by Jonathan Ellis for CASSANDRA-4874
2012-11-27 20:30:24 +03:00
8495560c2b
Support client Thrift SSL socket
...
patch by Jason Brown; reviewed by Vijay for CASSANDRA-4239
2012-10-17 18:58:04 -07:00
604a38645c
remove COPP
...
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2479
2012-06-04 17:23:02 -05:00
46e422a941
Open one sstableScanner per level for leveled compaction
...
patch by slebresne and jbellis for CASSANDRA-4142
2012-05-02 12:48:23 -05:00
4ff5c45c70
fix test config so localhost is seed
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1158753 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 14:50:53 +00:00
2b72987596
fix tests
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136472 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 15:00:04 +00:00
f4b3c01dff
add a server-wide cap on memtable memory usage
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2006
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090064 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 23:49:06 +00:00
6d2f24cd63
Revert prematurely-committed "add a server-wide cap on memtable memory usage"
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089526 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:33:35 +00:00
a287f42ceb
add a server-wide cap on memtable memory usage
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089521 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:21:17 +00:00
4b51718b7b
set level to DEBUG for tests (inadvertently changed to TRACE)
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087046 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 19:06:03 +00:00
ebc7278d78
sanitize configuration code. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-1906
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082510 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 14:50:32 +00:00
cea86b62a5
update JDBC driver and tests for BytesType columns
...
Patch by eevans for CASSANDRA-2027
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080028 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 22:00:48 +00:00
b5ad6a0335
column families of expected type (JDBC tests)
...
Patch by eevans for CASSANDRA-2027
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080026 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 22:00:40 +00:00
1d50f5f378
uuid term type (hyphenated hex string)
...
Patch by eevans for CASSANDRA-2027
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080021 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 22:00:12 +00:00
6edca314f0
implements getXXX methods to return values of the correct types. rearranges the JdbcDriverTest. renames SchemaDecoder. patch by gdusbabek, reviewed by eevans. CASSANDRA-2124
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1079975 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 20:23:10 +00:00
ade3581fb2
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1078860 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 17:33:53 +00:00
cb71747c88
add incremental_backups option
...
patch by Yang Yang and jbellis for CASSANDRA-1872
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1078858 13f79535-47bb-0310-9956-ffa450edef68
2011-03-07 17:30:07 +00:00
a9cbaae12d
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1074329 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 22:33:03 +00:00
53286d56f0
fix supercolumn de/serialization when subcolumn comparator is different from supercolumn's
...
patch by slebresne; reviewed by jbellis for CASSANDRA-2104
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1074259 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 19:09:42 +00:00
4e11242fb5
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1073896 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 19:32:42 +00:00
c280e204d1
nodetool scrub
...
patch by jbellis and tjake; reviewed by slebresne for CASSANDRA-2217
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1073586 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 03:44:26 +00:00
c16a51827b
add RowCacheTest
...
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2173
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1072164 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 21:50:43 +00:00
dc3d5bc004
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1071388 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 20:37:17 +00:00
87ea405523
fix column bloom filter deserialization
...
patch by jbellis and slebresne for CASSANDRA-2165
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1071042 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 20:42:28 +00:00
b1c2ce2210
configurable internode encryption. patch by rnirmal, reviewed by gdusbabek. CASSANDRA-1567
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1060890 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 18:10:35 +00:00
2c4ac98c9f
Adds support for columns that act as incr/decr counters. Patch primarily by Kelvin Kakugawa with select parts from Chris Goffinet, Sylvain Lebresne, Rob Coli, Johan Oskarsson, Adam Samet, Jaakko Laine and more. Review by Jonathan Ellis and Sylvain Lebresne. CASSANDRA-1072.
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1051679 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 22:17:09 +00:00
97f0480af9
revert change to test/cassandra.yaml
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1044571 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 06:27:42 +00:00
c48abe4c1f
make NameSortTest fast to make Hudson quit bitching
...
patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1044570 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 06:26:45 +00:00
018be3cd12
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1036924 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19 16:28:40 +00:00
53b49b1180
resolve circular initializer dependency deadlock. patch by Erik Onnen and Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-1756
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1036922 13f79535-47bb-0310-9956-ffa450edef68
2010-11-19 16:26:16 +00:00
4680da2a57
update test yaml
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1036557 13f79535-47bb-0310-9956-ffa450edef68
2010-11-18 17:48:16 +00:00
bb0dc512d8
Make memtable flush thresholds per-CF instead of global. Patch by Jon Hermes, reviewed by brandonwilliams for CASSANDRA-1007
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1023036 13f79535-47bb-0310-9956-ffa450edef68
2010-10-15 17:42:57 +00:00
88e660f530
rename test cassandra-rack.properties to cassandra-topology
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1022696 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 20:35:06 +00:00
52b7aeefe3
Point saved_caches in testing conf to build/test instead of /var/lib
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1021480 13f79535-47bb-0310-9956-ffa450edef68
2010-10-11 19:34:42 +00:00
5c44cc166e
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1005317 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 02:24:22 +00:00
e7591fc3c0
fix 2ary index support for deletions
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-1546
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1005174 13f79535-47bb-0310-9956-ffa450edef68
2010-10-06 17:19:26 +00:00
bbf1afa0dd
CF access test for SimpleAuthority
...
Patch by eevans; reviewed by Stu Hood for CASSANDRA-1554
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1005081 13f79535-47bb-0310-9956-ffa450edef68
2010-10-06 15:19:19 +00:00
67198f00bc
refactor SimpleAuthority for CF resources
...
Patch by eevans; reviewed by Stu Hood for CASSANDRA-1554
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1005079 13f79535-47bb-0310-9956-ffa450edef68
2010-10-06 15:19:07 +00:00
0cb207f83d
Make SimpleAuthority aware of the keyspace list resource.
...
Patch by Stu Hood; reviewed by eevans for CASSANDRA-1271
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1002401 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 23:00:54 +00:00
8e68f3b9a0
allow addIndex to create indexes that did not previously exist
...
patch by jbellis; reviewed by gdusbabek for CASSANDRA-1415
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@999741 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 03:41:38 +00:00
d966ed0861
r/m Clock from Thrift api. patch by jbellis; reviewed by slebresne for CASSANDRA-1501
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@999542 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 18:56:23 +00:00
2c64c97fb0
fix updating index when value is changed. patch by jbellis; tested by Tyler Hobbs for CASSANDRA-1373
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@986397 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 17:05:36 +00:00
916c810b54
rename RackAwareStrategy to OldNetworkTopologyStrategy, RackUnawareStrategy to SimpleStrategy, DatacenterShardStrategy to NetworkTopologyStrategy, AbstractRackAwareSnitch to AbstractNetworkTopologySnitch
...
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-1392
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@985701 13f79535-47bb-0310-9956-ffa450edef68
2010-08-15 16:16:58 +00:00
3a044a9140
add IntegerType for arbitrary-length integers. patch by Folke Behrens; reviewed by mdennis and jbellis for CASSANDRA-1282
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979784 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 17:46:28 +00:00
b6b1053687
Remove convertToDiskFormat, and version-conditionally apply convertFromDiskFormat
...
patch by Stu Hood; reviewed by jbellis for CASSANDRA-1249
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@964289 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 03:02:21 +00:00
fc73007f3d
avoid double-copy of flushed data by serializing directly to output file. patch by jbellis; reviewed by mdennis for CASSANDRA-270
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@963159 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 23:07:50 +00:00
0da82f321c
implement keyspace round-robin scheduler. patch by Nirmal Ranganathan; reviewed by Stu Hood and jbellis for CASSANDRA-1035
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@962675 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 19:58:21 +00:00
8250594efd
introduce RawColumnDefinition for yaml import and fix CFMetaData deserialize bug. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@960972 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 18:21:22 +00:00
0789a58a46
sanity-check replica count against number of nodes in the cluster. patch by mdennis; reviewed by jbellis for CASSANDRA-1191
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@959726 13f79535-47bb-0310-9956-ffa450edef68
2010-07-01 17:20:39 +00:00
34e241accd
Fix bootstrap with DSS and add endpoint caching.
...
patch by mdennis and jbellis for CASSANDRA-1147
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@954657 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 21:53:09 +00:00
40d3fe48d6
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951243 13f79535-47bb-0310-9956-ffa450edef68
2010-06-04 02:41:03 +00:00
7860b138e3
Add support for reconciler classes that decide how to resolve conflicting columns. Patch by Kelvin Kakugawa and johan, review by jbellis. CASSANDRA-1144
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950099 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 15:03:48 +00:00
5a45534c27
make DCQUORUM CLs actually wait for the nodes per DC rather than attempting a purely count-based approach that didn't really work as advertised. patch by Vijay Parthasarathy and jbellis; reviewed by Jeremy Hanna for CASSANDRA-952
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@945333 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 19:58:39 +00:00
2acfb43599
move per-datacenter replication factor into datacenters.properties
...
patch by jbellis; reviewed by eevans for CASSANDRA-994
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@938568 13f79535-47bb-0310-9956-ffa450edef68
2010-04-27 17:06:04 +00:00
c75230c3a1
add bin/config-convert for xml -> yaml migration. patch by Todd Blose; reviewed by Stu Hood for CASSANDRA-1000
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936511 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 21:05:34 +00:00
04384943fe
convert cassandra.xml to cassandra.yaml. patch by Todd Blose and Stu Hood for CASSANDRA-990
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936510 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 21:05:26 +00:00
c59a4fc4bb
add SimpleSnitch and make it the default
...
patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935726 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 20:11:10 +00:00
1a904da729
rename snitches to emphasize that RackAware is adding extra functionality that is not needed for simpler replication strategies.
...
patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935725 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 20:10:56 +00:00
7a4a7090cb
rename EndPoint classes -> Endpoint, part 2.
...
patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935717 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 19:58:10 +00:00
2e1b1a53c9
rename EndPoint classes -> Endpoint (case change).
...
patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935601 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:47:36 +00:00
18b2a16f0a
rename EndPoint -> Endpoint, part 1. patch by Erick Tryzelaar; reviewed by jbellis for CASSANDRA-994
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935594 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 14:36:24 +00:00
79e9a80b2f
make EndPointSnitch per-cluster instead of per-keyspace, and add better error messages for snitch misconfiguration.
...
patch by jbellis; reviewed by gdusbabek for CASSANDRA-986
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@935049 13f79535-47bb-0310-9956-ffa450edef68
2010-04-16 19:23:47 +00:00
1654a10ecc
mv test config files to new names, too. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@934509 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 18:31:06 +00:00
82bd54dbda
Gossip metadata version and request updates. Patch by Gary Dusbabek, reviewed by Jonthan Ellis. CASSANDRA-827
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@931200 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 16:01:57 +00:00
5fceac1743
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@928321 13f79535-47bb-0310-9956-ffa450edef68
2010-03-28 02:27:41 +00:00
4b13441dda
CASSANDRA-878 remove CalloutLocation and StagingFileDirectory from configs.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@922259 13f79535-47bb-0310-9956-ffa450edef68
2010-03-12 14:05:10 +00:00
5d4371a0c4
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@916962 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:18:50 +00:00
5a5f9aa3d2
use less specific descriptors for Thrift{Address,Port}
...
Patch by eevans; reviewed by gdusbabek for CASSANDRA-811
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911989 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 21:30:32 +00:00
5edd6dd836
quiet stderr log output introduced by hadoop-core
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910703 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 21:31:22 +00:00
3577fd8252
add per-keyspace replication factor and replication strategy. Patch by Gary Dusbabek, reviewed by Jaakko Laine. CASSANDRA-620
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@906521 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 15:21:31 +00:00
5b522404d6
convert gossip to use tcp. this finishes the removal of nio
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-705
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@901437 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 23:38:20 +00:00
27101e9626
change RowsCachedFraction option to RowsCached, specified either as an absolute number or as a percentage of rows in the CF
...
patch by jbellis; reviewed by goffinet for CASSANDRA-688
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@900435 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 15:51:26 +00:00
70e1ee304c
fix enabling/disabling row cache.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-689
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898893 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 19:13:39 +00:00
9a486949a7
make rowcache, keycache configurable per-CF
...
patch by jbellis; reviewed by goffinet for CASSANDRA-678
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@898178 13f79535-47bb-0310-9956-ffa450edef68
2010-01-12 04:05:03 +00:00
b40af75114
use throughput and op count instead of size and column count to determine when to flush, greatly reducing the amount of synchronization required to insert
...
patch by jbellis; tested by Brandon Williams for CASSANDRA-658
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896755 13f79535-47bb-0310-9956-ffa450edef68
2010-01-07 05:46:30 +00:00
b2c2a6031a
productize mmap approach: handle files > 2GB by chunking w/ fallback to BRAF
...
when a row crosses chunk boundaries (you don't want to have to check for crossing
boundary in each read() call, or you'll almost certainly waste more time than
the BRAF approach); add retrying-delete to wait for mmapped files to be unmapped
by finalizer after compaction
patch by jbellis; reviewed by Brandon Williams and goffinet for CASSANDRA-408
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894944 13f79535-47bb-0310-9956-ffa450edef68
2009-12-31 21:32:13 +00:00
e65ce8dcd7
JSON importer/exporter tests
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@885325 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 03:25:15 +00:00
f6b71a507d
add failing test for removing a single subcolumn.
...
patch by jbellis; reviewed by gdusbabek for CASSANDRA-510
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@832796 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 17:07:37 +00:00
021ab75a5f
add midpoint method to IPartitioner. patch by Stu Hood; reviewed by jbellis for CASSANDRA-242
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808206 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 22:20:23 +00:00
f8fa6d2431
refactors COPP to use BytesToken. patch by Stu Hood; reviewed by jbellis for CASSANDRA-242
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808205 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 22:20:13 +00:00
51401247c1
remove groovy jar, half-baked Callout code. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806267 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:24:33 +00:00
db18318c0a
do timed sync if we're not doing it in the executor process()
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805211 13f79535-47bb-0310-9956-ffa450edef68
2009-08-17 23:34:23 +00:00
480650b826
fix typo breaking CompareSubcolumnsWith. fix timeuuid compare with byte[0].
...
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-357
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802977 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 02:09:33 +00:00
9d6f4752b6
reduce buffer sizes for test suite since it forces lots of small flushes. reduces NameSortTest from ~30s back to < 10s.
...
patch by jbellis for CASSANDRA-339
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802276 13f79535-47bb-0310-9956-ffa450edef68
2009-08-08 00:59:14 +00:00
25dbb8cf85
update test config to use CollatingOPP. patch by jbellis for CASSANDRA-339
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802246 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 22:01:17 +00:00
debfcf8aca
fix .properties line endings. patch by jbellis; reviewed by Jeff Hodges for CASSANDRA-111
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@801042 13f79535-47bb-0310-9956-ffa450edef68
2009-08-05 01:31:30 +00:00
572b5f852d
table -> keyspace
...
patch by jbellis; reviewed by Michael Greene for CASSANDRA-271
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799140 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 00:29:28 +00:00
56a846ba1c
Pluggable replicaplacement, endpointsnitch classes (take 2). patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799065 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:39:01 +00:00
bd05521131
Revert "Pluggable replicaplacement, endpointsnitch classes." Breaks test suite.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799045 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:10:38 +00:00
51dbca6927
Pluggable replicaplacement, endpointsnitch classes. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799043 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:05:46 +00:00
574cb8f549
Use arrayblockingqueue in commitlog executor; this cleans up the code a bit (performance is unaffected since the writes and syncs are far more expensive than any queue ops)
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798373 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:11 +00:00
fbe6c4a854
add config options for commitlog syncing
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798372 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:27 +00:00
b866f81415
add SubcolumnCompareWith option and subcolumnComparator code.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796132 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:55 +00:00
e425474af2
add get_slice for supercolumn, tests. add back updated TimeSortTest. we need to pass gcBefore to the filters so Slice can count correctly.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-303
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796129 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 02:58:20 +00:00
986cee6806
change String column names to byte[] to allow user-defined ordering.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796108 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:52 +00:00
4b4459c0d1
r/m ZooKeeper vestiges. patch by Michael Greene; reviewed by jbellis for CASSANDRA-291
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793691 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 20:05:04 +00:00
fdf95da464
move ports used in system tests; shorten timeout
...
Patch by Michael Greene; reviewed by eevans for CASSANDRA-282
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792614 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 17:38:36 +00:00
e324ef9051
disallow specifying ColumnSort on supercolumns. patch by jbellis; reviewed by Evan Weaver for CASSANDRA-251
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791598 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 20:07:52 +00:00
2000bc3775
remove unused options and add comments from the old Setup wiki page.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@790301 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 18:28:54 +00:00
509cbb85de
remove table_ from CommitLog and add multitable tests.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787407 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:12 +00:00
a102a3e73a
fix line endings
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785436 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 22:35:04 +00:00
a48110e815
revert test/conf/log4j.properties (accidentally committed by mistake)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785352 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 19:36:13 +00:00
08d96422dc
install bin/ scripts as executable when building release. patch by Eric Evans; reviewed by jbellis for CASSANDRA-229
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785351 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 19:33:28 +00:00
30b1f5f3d3
add test covering use of column indexes. patch by Jun Rao; reviewed by jbellis for CASSANDRA-210
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@780853 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 22:16:58 +00:00
d800250cbc
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@780687 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 15:36:59 +00:00
88edbed30c
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775983 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 15:22:23 +00:00
426bf0f450
expose range query bugs by forcing flushes during the test w/ a very small memtable object limit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773151 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 01:40:07 +00:00
9db8da81b7
Add range query support, which requires using an OrderPreservingPartitioner. (Keys are returned in the order defined by the partitioner collation.) The fundamental approach (in table.getKeyRange) is simple: create a CollatedIterator that will return unique keys from different sources, each of which is already sorted. Then we just need Iterators for different key sources. For SSTables, this means adding seekTo and an Iterator interface to FileStruct. For Memtable, this means adding a DestructivePQIterator since unlike SSTable keys those are not inherently ordered already. This means that we only do M log N work sorting the memtable keys where M is the number of keys we actually read, and N is the total number of keys, where a naive sort-everything-first iterator would be N log N.
...
This does not yet implement range queries spanning multiple nodes.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-71
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769874 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 18:57:35 +00:00
f836610fe0
add system tests. each method in test/system/test_server.py exercises part of the thrift API, and manages cleaning out data files and starting a fresh server for each test.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-102
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769608 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 01:12:38 +00:00
b0dde7139a
configurable ListenAddress setting. allows running multiple instances of Cassandra
...
on a single machine or VM. patch and review by Per Mellqvist, Eric Evans, and
jbellis for #43
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@767307 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 21:34:46 +00:00
807b89ed7c
Revert "configurable ListenAddress setting" since it prevents server from starting.
...
This reverts commit 1304a9d9e1f9f85b991d99a1ca96e02505eb430f.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@767205 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 16:21:15 +00:00
fb0e28d664
configurable ListenAddress setting. allows running multiple instances of Cassandra on a single machine or VM. patch by Per Mellqvist; reviewed by Eric Evans for #43
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@767168 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 14:56:22 +00:00
f0f5ec427c
don't manually create commitlog directory; cassandra will do it automatically. also put commitlog under cassandra/ with other server artifacts. patch by jbellis; reviewed by Eric Evans for #6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@763386 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 20:49:33 +00:00
b3d4f4a93d
add log4j.properties for testing; output is to build/test/logs/system.log. patch by jbellis; reviewed by Jun Rao for #64
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762913 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 19:17:54 +00:00
9cdc839ee8
write get_columns_since test to exercise sequenceFile.next(timeRange). patch by jbellis; reviewed by Jun Rau. see #52
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@762375 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 15:10:07 +00:00
e7ef989821
create test dirs and separate test config xml. patch from johano. fixes #22
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@760464 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 14:41:55 +00:00
Stefan Podkowinski