Commit Graph

335 Commits

Author SHA1 Message Date
Robert Stupp 6f848db4c0 Merge branch 'cassandra-3.0' into trunk 2015-10-26 13:39:38 +01:00
Robert Stupp db7feb4c25 Remove token generator
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-5261
2015-10-26 13:38:30 +01:00
Ryan McGuire e4467a0f6d Provide graphing tool w/cassandra-stress
Patch by rmcguire; reviewed by jmckenzie for CASSANDRA-7918
2015-10-21 15:40:26 -04:00
T Jake Luciani 16b9f8bba4 Choose better poolingOptions for protocol v4 in cassandra-stress
Patch by tjake; reviewed by Alan Boudreault for CASSANDRA-10182
2015-08-27 16:00:18 -04:00
Benedict Elliott Smith 342e33ffb1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-23 11:30:57 +01:00
Benedict Elliott Smith a6d6540446 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-23 11:30:43 +01:00
phact 5bee617fea Support BigDecimal in cassanra-stress
patch by Sebastian Estevez; reviewed by Benedict for CASSANDRA-10048
2015-08-23 11:27:16 +01:00
Sam Tunnicliffe 06c130e3cb Move 2i metadata out of system_schema.columns and ColumnDefinition
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko and Robert Stupp
for CASSANDRA-6717
2015-08-18 14:59:44 +01:00
Joshua McKenzie d054181b9e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-11 12:35:28 -04:00
Paulo Motta 6c723101f7 Add sstablerepairedset.bat
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-9982
2015-08-11 12:34:51 -04:00
Marcus Eriksson 213aab8c1f Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
2015-08-11 10:21:54 +02:00
Marcus Eriksson 5431a88d7b Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
2015-08-11 10:18:03 +02:00
Marcus Eriksson 012b987e26 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
2015-08-11 10:11:15 +02:00
Marcus Eriksson 028e7cb5af Add tool to find why expired sstables are not getting dropped
Patch by marcuse; reviewed by stefania for CASSANDRA-10015
2015-08-11 09:31:30 +02:00
Joshua McKenzie 4d1b3d2687 Merge branch 'cassandra-2.2' into trunk 2015-08-03 14:53:21 -04:00
Paulo Motta 4765cd6f17 Add sstableofflinerelevel.bat and sstablelevelreset.bat
Patch by pmotta; reviewed by pthompson for CASSANDRA-9942
2015-08-03 14:52:23 -04:00
Benedict Elliott Smith 019471a567 sysexit on cassandra-stress main thread error
patch by benedict; reviewed by ryan for CASSANDRA-9864
2015-07-22 23:38:51 +01:00
T Jake Luciani 5e89136d10 Allow extra schema definitions in cassandra-stress yaml
Patch by tjake; reviewed by benedict for CASSANDRA-9850
2015-07-21 11:28:38 -04:00
T Jake Luciani f708c1e416 Fix default ratio in stress (ninja) 2015-07-02 10:52:27 -04:00
T Jake Luciani 6d29ed0662 New option for cassandra-stress to leave a ratio of columns null
Patch by tjake; reviewed by Jim Witschey for (CASSANDRA-9522)
2015-07-01 17:01:44 -04:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099
Initial patch, see ticket for details
2015-06-30 12:47:01 +02:00
T Jake Luciani 9a71238706 Merge branch 'cassandra-2.2' into trunk 2015-06-25 14:35:10 -04:00
Andrew Tolbert 26bd5124ef Optimize stress driver config for 2.2
Patch by Andrew Tolbert; reviewed by tjake for CASSANDRA-9558
2015-06-25 14:28:31 -04:00
Josh McKenzie bc9b0be321 Merge branch 'cassandra-2.2' into trunk 2015-06-24 12:13:15 -04:00
Stefania Alborghetti 01115f72fc 2.2 commit for CASSANDRA-9160 2015-06-24 12:11:46 -04:00
Stefania Alborghetti f797bfa4da Migrate CQL tests from dtest to unit tests
Patch by stefania; reviewed by jmckenzie for CASSANDRA-9160
2015-06-24 12:10:29 -04:00
Josh McKenzie 115ed236aa Merge branch 'cassandra-2.2' into trunk 2015-06-22 17:27:46 -04:00
Josh McKenzie d6d32d26ff Change Windows Kernel default timer resolution
Patch by jmckenzie; reviewed by tjake for CASSANDRA-9634
2015-06-22 17:27:08 -04:00
Chris Burroughs 8c19fd638d undeprecate cache recentHitRate metrics
patch by Chris Burroughs; reviewed by benedict for CASSANDRA-6591
2015-06-12 12:22:30 +01:00
stefania 17dd4ccc78 Remove FileCacheService, instead pooling buffers
patch by stefania and benedict for CASSANDRA-8897
2015-06-09 10:08:24 +01:00
Jonathan Ellis 823d8579c5 Merge branch 'cassandra-2.2' into trunk 2015-06-08 09:34:59 -05:00
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Robert Stupp 78c03052c5 Merge branch 'cassandra-2.2' into trunk 2015-06-04 11:17:42 +02:00
Robert Stupp 16b02887df Integrate pre-release Java Driver 2.2-rc1, custom build
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-9493
2015-06-04 11:17:05 +02:00
Jonathan Ellis cc6d142983 Merge branch 'cassandra-2.2' into trunk 2015-06-01 10:28:01 -05:00
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Dave Brosius e994805749 simplify throws clauses wrt Thrift 2015-05-17 15:39:03 -04:00
T Jake Luciani a16c4fe0a5 Remove thrift schema creation when native driver is used
Patch by tjake; reviewed by Aleksey Yeschenko for CASSANDRA-9374
2015-05-15 09:40:03 -04:00
Robert Stupp 1e44d2bd8b Merge branch 'cassandra-2.1' into trunk 2015-05-14 10:39:19 +02:00
Robert Stupp 5e631a8fda Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-14 10:39:04 +02:00
Robert Stupp 1611ef3d19 token-generator - generated tokens too long
Patch by Robert Stupp; Reviewed by Stefania for CASSANDRA-9300
2015-05-14 10:35:35 +02:00
T Jake Luciani d26bfe9a4d fix stress to not use thrift unless requested 2015-05-12 15:37:45 -04:00
T Jake Luciani 5893472e7e Merge branch 'cassandra-2.1' into trunk 2015-05-12 14:55:07 -04:00
T Jake Luciani 8b5434f3df Add missing consistency levels to cassandra-stress
Patch by Mario Lazaro; reviewed by tjake for CASSANDRA-9361
2015-05-12 14:53:10 -04:00
Dave Brosius 2da468d9bb Merge branch 'cassandra-2.1' into trunk 2015-05-08 16:09:04 -04:00
Dave Brosius def6b5fa19 fixup last fix for bad lock guard 2015-05-08 16:08:36 -04:00
Dave Brosius 81c93084ba Merge branch 'cassandra-2.1' into trunk 2015-05-08 15:59:37 -04:00