natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,625 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

15625 Commits

Author SHA1 Message Date
Sam Tunnicliffe 17de36f246 Ignore Paxos commits for truncated tables 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7538
 2014-11-24 16:07:17 +03:00
Aleksey Yeschenko 41435ef6c1 Merge branch 'cassandra-2.1' into trunk 2014-11-24 15:19:33 +03:00
Aleksey Yeschenko cab2b25b0a Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
 2014-11-24 15:14:14 +03:00
Sam Tunnicliffe 0e3d9fc14b Validate size of indexed column values 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8280
 2014-11-24 14:50:14 +03:00
Marcus Eriksson 065aeeb4a9 Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk 2014-11-24 10:39:05 +01:00
Marcus Eriksson 35f173a0e2 Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1 2014-11-24 10:38:30 +01:00
Marcus Eriksson cd4f729e9d Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2014-11-24 10:37:13 +01:00
Sylvain Lebresne 528cc3dd19 Merge branch 'cassandra-2.1' into trunk 2014-11-24 10:33:32 +01:00
Sylvain Lebresne 6ae1b420a6 Better jamm 0.3.0 jar 2014-11-24 10:32:46 +01:00
Marcus Eriksson 0d01c36599 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
	src/java/org/apache/cassandra/io/util/DiskAwareRunnable.java
 2014-11-24 10:27:50 +01:00
Marcus Eriksson 2ce1ad8e6f Make LCS split compaction results over many directories 
Patch by marcuse; reviewed by yukim for CASSANDRA-8329
 2014-11-24 09:43:47 +01:00
Tyler Hobbs be0b451b7c Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:43:21 -06:00
Tyler Hobbs f02d19451a Add missing jamm jar from CASSANDRA-8231 commit 2014-11-21 15:42:49 -06:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements 
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
 2014-11-21 14:54:47 -06:00
Tyler Hobbs c7a932c57a Merge branch 'cassandra-2.1' into trunk 2014-11-21 13:26:27 -06:00
Tyler Hobbs 6826888be8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
 2014-11-21 13:25:41 -06:00
Tyler Hobbs 025b4060cb Ninja: fix check for duplicate cols in INSERT 
This was caused by the changes for CASSANDRA-8178
 2014-11-21 13:21:36 -06:00
Branimir Lambov 07893d7045 Remove hidden references to partitioner in Tokens 
Patch by blambov; reviewed by jmckenzie for CASSANDRA-8244
 2014-11-21 07:58:28 -08:00
Brandon Williams 68fdb2db2f Merge branch 'cassandra-2.1' into trunk 2014-11-20 14:32:08 -06:00
Brandon Williams 705e5e47d1 bump python version to 2.7 2014-11-20 14:31:59 -06:00
Yuki Morishita 201a055117 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/db/compaction/Scrubber.java
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/streaming/StreamReader.java
 2014-11-19 17:31:34 -06:00
Robert Stupp 2291a60e9e improve JBOD disk utilization 2014-11-19 17:17:40 -06:00
Aleksey Yeschenko 8badc28566 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/service/StorageService.java
	test/unit/org/apache/cassandra/db/KeyCacheTest.java
 2014-11-20 02:10:40 +03:00
Sam Tunnicliffe 4397c34476 Centralize shared executors 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8055
 2014-11-20 01:57:01 +03:00
Tyler Hobbs 1bd5c64ba1 Merge branch 'cassandra-2.1' into trunk 2014-11-19 11:38:17 -06:00
Tyler Hobbs e3862bc3e0 Fix CONTAINS (KEY) filtering on frozen collection clustering cols 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8302
 2014-11-19 11:37:26 -06:00
Tyler Hobbs 9075918511 Merge branch 'cassandra-2.1' into trunk 2014-11-19 11:28:58 -06:00
Tyler Hobbs 25a4c9e1f7 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-11-19 11:28:51 -06:00
Tyler Hobbs 084d93daf6 Fix multicolumn relation + COMPACT STORAGE issues 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8264
 2014-11-19 11:25:09 -06:00
Tyler Hobbs b8cf17284e Merge branch 'cassandra-2.1' into trunk 2014-11-19 11:11:37 -06:00
Tyler Hobbs 289314a60f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-11-19 11:09:23 -06:00
Tyler Hobbs 1945384fdf Fix IRE with ORDER BY, treating all selections as fns 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8286
 2014-11-19 11:06:03 -06:00
Tyler Hobbs 3cc9a0c87f Temporary fix for CASSANDRA-8326 
This is a temporary python driver fix for CASSANDRA-8326.  The patch
has not been properly reviewed and tested by the python driver team.
The driver version bundled here can be found at the following branch:

https://github.com/thobbs/python-driver/tree/CASSANDRA-8326-temp-fix
 2014-11-18 15:36:47 -06:00
Robert Stupp 2877bc235a Ninja: fix test for js return type under rhino engine 2014-11-18 14:31:47 -06:00
Dave Brosius 2c3f9ba048 avoid npe chance, use == with enums 2014-11-15 16:22:33 -05:00
Dave Brosius 9c564f10fd remove dead field 2014-11-15 15:26:55 -05:00
Dave Brosius ce2a99d433 don't declare throwing exceptions that aren't 2014-11-15 15:14:30 -05:00
Yuki Morishita 105360cb14 fix test throw unknown keyspace error 2014-11-14 15:36:04 -06:00
Aleksey Yeschenko 3ad82c730e Merge branch 'cassandra-2.1' into trunk 2014-11-15 00:07:16 +03:00
Aleksey Yeschenko 1b21aef815 Fix CFMetaData compaction-related warnings 2014-11-15 00:06:59 +03:00
Aleksey Yeschenko cbbc1191ce Remove post-2.1 dead schema migrations and columns 2014-11-14 20:58:33 +03:00
Joshua McKenzie 58fdc6b5c0 Allow snapshot-based repair on Windows for 3.0 
Patch by jmckenzie; reviewed by yukim for CASSANDRA-8309
 2014-11-14 10:52:28 -06:00
Robert Stupp b4d7f3bed0 Deal with conflicts between system functions and UDFs 
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-7813
 2014-11-14 18:20:29 +03:00
Marcus Eriksson 41a35ec74e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
 2014-11-14 11:10:09 +01:00
Marcus Eriksson abbcfc5f72 Do more aggressive ttl expiration checks to be able to drop more sstables 
Patch by Bjorn Hegerfors; reviewed by marcuse and slebresne for CASSANDRA-8243
 2014-11-14 11:02:45 +01:00
Marcus Eriksson 3b6edc6afd Merge branch 'cassandra-2.1' into trunk 2014-11-14 08:04:48 +01:00
Marcus Eriksson 054beee45d Add more logging to be able to debug what files readMeter can be null for. 
Patch by marcuse; reviewed by thobbs for CASSANDRA-8238
 2014-11-14 08:01:27 +01:00
Jason Brown 0c6050bcaf Merge branch 'cassandra-2.1' into trunk 2014-11-13 18:27:31 -08:00
Jason Brown 1470cee588 add check of the system wall clock time at startup 
patch by jasobrown; reviewed by driftx for CASSANDRA-8305
 2014-11-13 18:23:46 -08:00