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

4045 Commits

Author SHA1 Message Date
Sam Tunnicliffe 13e9fd55ff Correctly mark indexes built/removed when rebuilding 
Patch by Sam Tunnicliffe; reviewed by Benjamin Lerer for CASSANDRA-10601
 2015-10-28 11:36:44 +00:00
Sam Tunnicliffe 81183d6e2f Merge branch 'cassandra-3.0' into trunk 2015-10-28 09:41:01 +00:00
Sam Tunnicliffe 5bc3c4b6d5 Secondary indexes which aren't registered are not initialized 
This commit also removes Index::getIndexName in favour of accessing
IndexMetadata.name directly

Patch by Sam Tunnicliffe; reviewed by Sergio Bossa for CASSANDRA-10595
 2015-10-28 09:38:43 +00:00
Marcus Eriksson 5995de3b63 Merge branch 'cassandra-3.0' into trunk 2015-10-28 09:06:01 +01:00
Marcus Eriksson 27ca4915e9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-28 09:04:30 +01:00
Marcus Eriksson 5a356a7063 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-28 08:50:44 +01:00
Marcus Eriksson cedcf07c54 Do size tiered compaction in date tiered compaction windows 
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-10276
 2015-10-28 08:40:12 +01:00
Sylvain Lebresne d3617a347d Merge branch 'cassandra-3.0' into trunk 2015-10-27 13:55:21 +01:00
Sylvain Lebresne f901a74c88 Keep columns for different tables separated in BatchStatement 
patch by slebresne; reviewed by blambov for CASSANDRA-10554
 2015-10-27 13:54:50 +01:00
Jaebin Lee c0f2dc5d3d Fix build, change to ASCII char 
Patch by Jaebin Lee; reviewed by Robert Stupp for CASSANDRA-10597
 2015-10-27 12:29:35 +01:00
Benedict Elliott Smith 928e4c28c6 Merge branch 'cassandra-3.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
	src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java
	src/java/org/apache/cassandra/service/pager/QueryPager.java
 2015-10-26 21:08:07 +00:00
Benedict Elliott Smith 6094974714 9975: Flatten Iterator Transformation Hierarchy 
To improve clarity of control flow, all iterator transformations
are applied via a single class that manages an explicit stack of
named transformation objects.

patch by benedict; reviewed by branimir for CASSANDRA-9975
 2015-10-26 20:59:06 +00:00
Joshua McKenzie 3a2dd0cf60 Merge branch 'cassandra-3.0' into trunk 2015-10-23 17:43:32 -04:00
Stefania Alborghetti 73781a9a49 Fix potential issue with LogTransaction only checking single dir for files 
Patch by stefania; reviewed by aweisberg for CASSANDRA-10421
 2015-10-23 17:40:46 -04:00
Robert Stupp 71d9dba063 Merge branch 'cassandra-3.0' into trunk 2015-10-23 14:44:32 +02:00
Norman Maurer 535c3ac759 Support encrypted and plain traffic on the same port 
patch by Norman Maurer; reviewed by Robert Stupp for CASSANDRA-10559
 2015-10-23 14:44:18 +02:00
Yuki Morishita 04fa645743 Merge branch 'cassandra-3.0' into trunk 2015-10-22 09:47:29 -05:00
Yuki Morishita 079890579b Make ScrubTest pass 
patch by yukim; reviewed by slebresne for CASSANDRA-10558
 2015-10-22 09:44:01 -05:00
Sylvain Lebresne 05eb6022c3 Merge branch 'cassandra-3.0' into trunk 2015-10-21 15:38:14 +02:00
Blake Eggleston c0a1cce4c8 Truncate cfs between SinglePartitionSliceCommandTest tests 
patch by bdeggleston; reviewed by slebresne for CASSANDRA-10336
 2015-10-21 15:37:10 +02:00
Robert Stupp f8fa3a4271 Merge branch 'cassandra-3.0' into trunk 2015-10-20 17:45:43 +02:00
Robert Stupp 615945d275 Aggregate with Initial Condition fails with C* 3.0 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10367
 2015-10-20 17:45:30 +02:00
Jeff Jirsa 881e2da0a4 Fix ReadCommandTest 
Patch by jjirsa; reviewed by stefania for CASSANDRA-10555
 2015-10-20 11:32:52 -04:00
blerer fcdc4e1d70 Merge branch cassandra-3.0 into trunk 2015-10-20 14:12:41 +02:00
blerer a880739187 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-20 14:10:15 +02:00
blerer a33790730a Merge branch cassandra-2.1 into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2015-10-20 14:06:45 +02:00
blerer 9b3b1cb03c Fix conditions on static columns 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10264
 2015-10-20 13:54:46 +02:00
Sam Tunnicliffe dec76593f9 Merge branch 'cassandra-3.0' into trunk 2015-10-16 20:24:47 +01:00
Sam Tunnicliffe bc89bc66cb Partially revert #9839 to remove reference loop 
Patch by Sam Tunnicliffe; reviewed by Benedict Elliot Smith for
CASSANDRA-10543
 2015-10-16 20:19:37 +01:00
Sam Tunnicliffe 09c94a667a Merge branch 'cassandra-3.0' into trunk 2015-10-16 18:01:11 +01:00
Sam Tunnicliffe aad3ae2cbe Ensure indexed values are only validated once per partition 
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-10536
 2015-10-16 17:59:51 +01:00
Sylvain Lebresne 89293efc7d Update current format sstables for LegacySSTableTest 2015-10-16 17:18:45 +02:00
Sylvain Lebresne 4034dc904e Merge branch 'cassandra-3.0' into trunk 2015-10-16 14:58:21 +02:00
Sylvain Lebresne d413ddff8b Followup to CASSANDRA-10468: fix reverse case and add unit test 
patch by slebresne; reviewed by blerer for CASSANDRA-10468
 2015-10-16 14:57:32 +02:00
blerer 737a3385ce Merge branch cassandra-3.0 into trunk 2015-10-16 14:51:54 +02:00
blerer 1b93eb403b Merge branch cassandra-2.2 into cassandra-3.0 2015-10-16 14:48:12 +02:00
blerer f497c13ee3 Merge branch cassandra-2.1 into cassandra-2.2 2015-10-16 14:45:08 +02:00
blerer f587397c9c Fix sorting for queries with an IN condition on partition key columns 
patch by Benjamin Lerer; reviewed by Sam Tunnicliffe for CASSANDRA-10363
 2015-10-16 14:41:54 +02:00
Aleksey Yeschenko 6f2b855c6e Merge branch 'cassandra-3.0' into trunk 2015-10-16 13:29:30 +01:00
Aleksey Yeschenko 56cfc6ea35 Remove Pig support 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10542
 2015-10-16 13:23:20 +01:00
Marcus Eriksson 3b7ccdfb15 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-10-15 15:33:29 +02:00
Branimir Lambov a61fc01f41 Skip redundant tombstones on compaction. 
Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-7953
 2015-10-15 15:28:42 +02:00
Aleksey Yeschenko 1b23b2a1ca Merge branch 'cassandra-3.0' into trunk 2015-10-14 16:49:16 +01:00
Ariel Weisberg 0556fbfa59 Fix TeeingAppender causing some logs to be truncated/empty 
patch by Ariel Weisberg; reviewed by Paulo Motta for CASSANDRA-10447
 2015-10-14 16:48:52 +01:00
Sylvain Lebresne 8644338fc8 Merge branch 'cassandra-3.0' into trunk 
Conflicts:
	CHANGES.txt
 2015-10-13 11:04:28 +02:00
Jeff Jirsa dc61fa6cff When more than one table exists, be sure the MV base table matches query table 
patch by jjirsa; reviewed by carlyeks for CASSANDRA-10503
 2015-10-13 11:00:16 +02:00
blerer d8994896c5 Merge branch cassandra-3.0 into trunk 2015-10-12 21:44:45 +02:00
blerer fce444f683 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-12 21:40:55 +02:00
blerer 20c0acc149 Fix regression in select count with limit 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10487
 2015-10-12 21:37:06 +02:00
Benedict Elliott Smith 4acc3a69d3 ninja comment out broken test line in MmappedFileDataInputTest 2015-10-12 15:13:09 +01:00
Benedict Elliott Smith 352928467b Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-10-10 09:22:46 +01:00
Benedict Elliott Smith f87e34ed3c Fix seeking to end of mmap segment 
patch by benedict; reviewed by jake for CASSANDRA-10478
 2015-10-10 09:20:16 +01:00
Sylvain Lebresne e8d8941cc8 Merge branch 'cassandra-3.0' into trunk 2015-10-09 18:07:18 +02:00
Sylvain Lebresne 6584331c88 Add row size to sstable format for faster skipping 
patch by slebresne; reviewed by benedict for CASSANDRA-10378
 2015-10-09 18:07:01 +02:00
Sylvain Lebresne f8358b8ea7 Merge branch 'cassandra-3.0' into trunk 2015-10-09 14:58:54 +02:00
Sylvain Lebresne 028c3f779f Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	test/unit/org/apache/cassandra/db/KeyCacheTest.java
 2015-10-09 14:58:40 +02:00
Sylvain Lebresne 3573faf49e Merge fixup 2015-10-09 14:49:34 +02:00
Sylvain Lebresne 757dac9c0e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-09 14:01:54 +02:00
Sylvain Lebresne 94b6471b93 Add Branimir's test from CASSANDRA-10219 2015-10-09 14:00:30 +02:00
Sam Tunnicliffe 38d1fced1a Merge branch 'cassandra-3.0' into trunk 2015-10-09 11:37:05 +01:00
Sam Tunnicliffe cf365e3021 Fix bug in schema conversion of index options to thrift format 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10483
 2015-10-09 11:28:39 +01:00
Robert Stupp f5b3962a78 Merge branch 'cassandra-3.0' into trunk 2015-10-08 20:45:50 +02:00
Robert Stupp e1eed527f8 Problem upgrading to 3.0 with UDA 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10434
 2015-10-08 20:45:29 +02:00
Sylvain Lebresne 9515fca769 Merge branch 'cassandra-3.0' into trunk 2015-10-08 12:07:04 +02:00
Carl Yeksigian d76d3a5d59 Validate ALTER for involved views as well as to the base table 
patch by carlyeks; reviewed by slebresne for CASSANDRA-10424
 2015-10-08 12:06:48 +02:00
Sam Tunnicliffe 7a7fb8e362 Merge branch 'cassandra-3.0' into trunk 2015-10-08 10:55:28 +01:00
Sam Tunnicliffe 4f4918f6ff Only include modified column data in indexing delta 
Patch by Sam Tunnicliffe; reviewed by Ariel Weisberg for CASSANDRA-10438
 2015-10-08 10:34:59 +01:00
Yuki Morishita 3971452197 Merge branch 'cassandra-3.0' into trunk 2015-10-07 16:54:31 -05:00
Carl Yeksigian 9415c8460c Do not load keyspace when creating sstable writer 
patch by carlyeks; reviewed by yukim for CASSANDRA-10443
 2015-10-07 16:53:55 -05:00
Branimir Lambov 127f7c5844 Clean resource usage warnings. 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-10385
 2015-10-07 14:04:02 -04:00
Branimir Lambov e77730179c Clean resource usage warnings. 
Patch by Branimir Lambov; reviewed by tjake for CASSANDRA-10385
 2015-10-07 13:20:18 -04:00
Sylvain Lebresne 07782aa4a5 Merge branch 'cassandra-3.0' into trunk 2015-10-07 10:48:48 +02:00
Sylvain Lebresne 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
Stefania Alborghetti 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
Sam Tunnicliffe 5860efa9ad Merge branch 'cassandra-3.0' into trunk 2015-10-02 18:10:10 +01:00
Sam Tunnicliffe 5ffae4f45a Custom index expression in SELECT forces index selection 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10436
 2015-10-02 18:05:41 +01:00
Sam Tunnicliffe e0dce5f856 Merge branch 'cassandra-3.0' into trunk 2015-10-02 17:06:38 +01:00
Sam Tunnicliffe 2d472370b4 Fix index selectivity comparison 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10435
 2015-10-02 17:05:42 +01:00
Sylvain Lebresne 30e14a30da Make CQLMetricsTest tests independent of each other 2015-10-02 17:53:40 +02:00
Sylvain Lebresne 2d991a7e4c Minor optimizations 
patch by slebresne; reviewed by blambov for CASSANDRA-10410

The patch includes the 3 minor optimizations desribed below:
1) Faster copy in CompositeType.build(). We call CompositeType.build()
   relatively often when a table has a composite partition key. When
   copying source buffers into the composite result in that method, we
   can use our existing ByteBuffer.arrayCopy() method which is supposed
   to be faster since it uses FastByteOperations and saves the
   duplication of the buffer to copy
2) Faster UUID->ByteBuffer. We convert UUID to their ByteBuffer
    representation in a few places and do that by converting the UUID to
    a byte[] and then wrapping it. But our convertion of UUID to byte[]
    writes the 2 long the UUID is composed of byte by byte, while for a
    ByteBuffer we can easily just "put" both long. So the patch
    introduces a specific method to do that. That's arguably cleaner
    anyway.
3) Memoize hash value for DataResource. Every request does a hash map
   lookup on a DataResource (for validating access rights) which imply
   calling DataResource.hashCode(). Currently that uses
   Objects.hashCode(), which is a varargs methods and allocate an array
   (which, according to MissionControl seems to not be stack allocated).
   The patch does 2 things: it computes the hash only once in the ctor
   and it stores the DataResource for each table in the CFMetaData and
   uses that when checking access permissions for SelectStatement and
   ModificationStatement (the 2 statements where performance matters).
   The 2nd point also saves some unecessary test that the table exists
   when we actually know it does.
 2015-10-02 15:51:07 +02:00
Tyler Hobbs c3be5ab022 Merge branch 'cassandra-3.0' into trunk 2015-10-01 14:26:42 -05:00
Tyler Hobbs 5c2912d1ce Flush system schema tables after local schema changes 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-10429
 2015-10-01 14:25:54 -05:00
Benedict Elliott Smith 5d38559908 Merge branch 'cassandra-3.0' into trunk 2015-09-30 19:57:02 +01:00
Benedict Elliott Smith 40f4daa367 Save space in WriteCallbackInfo (CASSANDRA-9833) 
Performs decision to save hint mutation eagerly, and
saves only the mutation itself

patch by benedict; reviewed by branimir for CASSANDRA-9833
 2015-09-30 19:56:49 +01:00
Benedict Elliott Smith 25de92e321 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
	src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
	src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
 2015-09-30 19:47:14 +01:00
Benedict Elliott Smith c37562e345 Fix Mmapped File Boundaries 
This patch fixes two bugs with mmap segment boundary
tracking, and introduces automated correction of
this bug on startup

patch by benedict; reviewed by tjake for CASSANDRA-10357
 2015-09-30 19:45:49 +01:00
Robert Stupp 247bc2e67e Merge branch 'cassandra-3.0' into trunk 2015-09-30 13:25:13 +02:00
Robert Stupp 3ae01ddcc0 UFPureScriptTest fails with pre-3.0 java-driver 
patch by Robert Stupp; reviewed by Joshua McKenzie for CASSANDRA-10141
 2015-09-30 13:24:55 +02:00
Joshua McKenzie 8765e6a869 Merge branch 'cassandra-3.0' into trunk 2015-09-29 12:14:46 -04:00
Joshua McKenzie cf0b737f1f Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-29 12:14:34 -04:00
Joshua McKenzie a323641ef3 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-29 12:14:18 -04:00
Paul Macintosh 39ab9e0524 Inspect cause and suppressed exceptions in JVMStabilityInspector 
Patch by Paul Macintosh; reviewed by aweisberg for CASSANDRA-10228
 2015-09-29 12:11:32 -04:00
blerer 56d81ac53b Merge branch cassandra-3.0 into trunk 2015-09-22 20:53:18 +02:00
blerer 96eb58a0fb Add a NEWS.txt entry about LIMIT behavior change and unit tests 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10380
 2015-09-22 20:49:48 +02:00
Aleksey Yeschenko 4bb5976a7b Merge branch 'cassandra-3.0' into trunk 2015-09-19 17:50:38 +01:00
Aleksey Yeschenko cffa93c629 Set hints_directory in cassandra_pig.yaml 2015-09-19 17:50:06 +01:00
Tyler Hobbs e44e21ce55 Merge branch 'cassandra-3.0' into trunk 2015-09-19 10:07:31 -05:00
Tyler Hobbs 5a4253b6a1 Allow MV's SELECT to restrict PK columns 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-9664
 2015-09-19 10:06:45 -05:00
Sam Tunnicliffe fe15e6c3c4 Merge branch 'cassandra-3.0' into trunk 2015-09-19 11:47:50 +01:00
Paulo Motta e25453ba55 Moved crc_check_chance out of compression options 
Patch by Paulo Motta; reviewed by Sam Tunnicliffe for CASSANDRA-9839
 2015-09-19 11:38:55 +01:00
Aleksey Yeschenko be8b9f299e Merge branch 'cassandra-3.0' into trunk 2015-09-18 22:12:37 +01:00
Benedict Elliott Smith aef71696e6 Fix descending iteration past end of BTreeSearchIterator 
patch by benedict; reviewed by branimir for CASSANDRA-10301
 2015-09-18 21:47:28 +01:00
Aleksey Yeschenko 6f5c7a4ea2 Merge branch 'cassandra-3.0' into trunk 2015-09-18 18:28:00 +01:00
Branimir Lambov a29d206532 Follow-up to CASSANDRA-8143 
stops Schema initializing tables in client mode

patch by Branimir Lambov; reviewed by Aleksey Yeschenko for
CASSANDRA-8143
 2015-09-18 18:26:14 +01:00
Benedict Elliott Smith aefb2a6ff8 Merge branch 'cassandra-3.0' into trunk 2015-09-18 13:19:45 +01:00
Stefania Alborghetti c163d0bc36 Refactor TransactionLog code and fix order of cleanup bug on Windows 
patch by stefania; reviewed by benedict for CASSANDRA-10286
 2015-09-18 13:18:05 +01:00
Sylvain Lebresne 9967303f6e Merge branch 'cassandra-3.0' into trunk 2015-09-18 13:24:15 +02:00
Sylvain Lebresne b99c863158 Implement backward compatibility for paging states 
Pre-3.0 nodes serialize a full cellname in the paging state, but doing
so is wasteful for 3.0 nodes. We can't however guarantee to which nodes
a particular paging state will be sent so we need to have a backward
compatibility.

The patch preserve the pre-existing format for the paging state (thus
requiring more work for 3.0 nodes) for the native protocol v3, but
change to a more efficient (for 3.0) format for the protocol v4. It is
then documented that paging states  shouldn't be used across protocol
versions.
 2015-09-18 13:01:59 +02:00
Robert Stupp 46c0a55ea5 Merge branch 'cassandra-3.0' into trunk 2015-09-18 12:36:48 +02:00
Robert Stupp 1b823ec2c1 Ninja fix failing LegacySSTableTest 2015-09-18 12:36:26 +02:00
Sam Tunnicliffe 0c3575fabd Merge branch 'cassandra-3.0' into trunk 2015-09-18 11:32:35 +01:00
Sam Tunnicliffe 64e2f5ddaa Support for custom index expressions in SELECT 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10217
 2015-09-18 11:30:32 +01:00
Sylvain Lebresne 5400b93bbc Merge branch 'cassandra-3.0' into trunk 2015-09-18 12:13:21 +02:00
Carl Yeksigian 9f335fe482 Issues with MVs caused by updateAffectsView and createForDeletionInfo 
patch by carlyeks; reviewed by slebresne for CASSANDRA-10362
 2015-09-18 12:13:07 +02:00
Sam Tunnicliffe 82dfc290db Merge branch 'cassandra-3.0' into trunk 2015-09-18 11:05:35 +01:00
Sam Tunnicliffe df3972e949 Support for indexes with 0,1 or multiple targets 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10124
 2015-09-18 11:02:08 +01:00
Robert Stupp 21b134c2ef Merge branch 'cassandra-3.0' into trunk 2015-09-18 09:52:21 +02:00
Robert Stupp e6f23e63c5 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-18 09:52:08 +02:00
Robert Stupp 1de63e9516 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-18 09:48:53 +02:00
Robert Stupp 98c4a7cd02 Prevent ALTER TYPE from creating circular references 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10339
 2015-09-18 09:48:17 +02:00
Robert Stupp e75ebc4f6b Merge branch 'cassandra-3.0' into trunk 2015-09-17 23:24:20 +02:00
Robert Stupp 6e5d16b373 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-17 23:24:14 +02:00
Robert Stupp 93745c05c7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-17 23:23:35 +02:00
Ariel Weisberg 0b8b67bfe2 Saved caches use ambigous keyspace and CF name to identify tables 
patch by Ariel Weisberg; reviewed by Robert Stupp for CASSANDRA-10359
 2015-09-17 23:22:56 +02:00
blerer 04e5ec34da Merge branch cassandra-3.0 into trunk 2015-09-17 22:20:03 +02:00
blerer 90661a3259 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-17 22:17:40 +02:00
blerer eecfb07d46 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-17 22:13:49 +02:00
blerer 4e3555c1d9 Make "truncate table X" an alias for "truncate X" 
patch by Benjamin Lerer; reviewed by Robert Stupp  for CASSANDRA-9585
 2015-09-17 22:02:45 +02:00
blerer d6d5698b8d Merge branch cassandra-3.0 into trunk 2015-09-17 21:48:48 +02:00
blerer caadcf69ee Make DropTableStatement throw an error if the table is a view 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko  for CASSANDRA-10361
 2015-09-17 21:42:15 +02:00
blerer a90de7c61d Merge cassandra-2.2 into cassandra-3.0 2015-09-17 21:40:52 +02:00
Vovodroid 1a2a1d2c24 Fix IndexOutOfBoundsException when using empty BATCH statements 
patch by Vovodroid; reviewed by Benjamin Lerer for CASSANDRA-10277
 2015-09-17 20:57:51 +02:00
Robert Stupp 10b11835ac Merge branch 'cassandra-3.0' into trunk 2015-09-16 22:00:57 +02:00
Robert Stupp 9218d7456b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-16 22:00:32 +02:00
Robert Stupp e63dacf793 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-16 22:00:25 +02:00
Ariel Weisberg e889ee408b 2i key cache load fails 
patch by Ariel Weisberg; reviewed by Robert Stupp for CASSANDRA-10155
 2015-09-16 21:57:54 +02:00
Sam Tunnicliffe f5cf571678 Merge branch 'cassandra-3.0' into trunk 2015-09-16 17:28:24 +01:00
Sam Tunnicliffe fde97c3b3d Remove target_columns from index metadata 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10216
 2015-09-16 17:25:23 +01:00
Aleksey Yeschenko 43ddec31b6 Merge branch 'cassandra-3.0' into trunk 2015-09-16 15:35:25 +01:00
Carl Yeksigian a3a8dbca5c Improve MV schema representation 
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9921
 2015-09-16 15:34:18 +01:00
Yuki Morishita 2f82a69ea2 Merge branch 'cassandra-3.0' into trunk 2015-09-16 08:47:19 -05:00
Yuki Morishita f542a20eaa Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-16 08:47:14 -05:00
Yuki Morishita 426109c50b Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-16 08:39:29 -05:00
Yuki Morishita 588dc06eb8 Fix NPE in nodetool compactionhistory 
patch by Pierre N. and yukim; reviewed by yukim for CASSANDRA-9758
 2015-09-16 08:36:50 -05:00
Aleksey Yeschenko f3ff8df054 Merge branch 'cassandra-3.0' into trunk 2015-09-16 12:05:22 +01:00
Aleksey Yeschenko 8134f09c2b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-16 12:04:53 +01:00
Aleksey Yeschenko 5b05b68264 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-16 11:48:56 +01:00
Aleksey Yeschenko 4b1d59e131 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-09-16 11:44:28 +01:00
Stefania Alborghetti 257cdaa08d Fix consolidating racks violating the RF contract 
patch by Stefania Alborghetti; reviewed by Blake Eggleston for
CASSANDRA-10238
 2015-09-16 11:40:31 +01:00
Sam Tunnicliffe 48da81dc4b Merge branch 'cassandra-3.0' into trunk 2015-09-16 09:40:14 +01:00
Sam Tunnicliffe c694cd62af Correctly identify partition deletions for index transactions 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10343
 2015-09-16 09:37:15 +01:00
Robert Stupp cdaba04d31 Merge branch 'cassandra-3.0' into trunk 2015-09-16 00:43:52 +02:00
Robert Stupp 753a943322 Rename DataOutputBuffer.getFilePointer() to position() 
patch by Robert Stupp; reviewed by Benedict for CASSANDRA-10349
 2015-09-16 00:43:11 +02:00
Benedict Elliott Smith 7a0698ee1b Merge branch 'cassandra-3.0' into trunk 2015-09-15 18:05:35 +01:00
Benedict Elliott Smith 06336377f7 fix bad rebase 2015-09-15 18:05:29 +01:00
Benedict Elliott Smith ac3b1cc2c7 Merge branch 'cassandra-3.0' into trunk 2015-09-15 17:50:43 +01:00
Blake Eggleston b263af93a2 Introduce unit tests for Rows, Cells, and DataResolver 
Fix Rows.diff complex deletion resolution

patch by blake; reviewed by benedict for CASSANDRA-10266
 2015-09-15 17:49:45 +01:00
Aleksey Yeschenko 1944e402cf Merge branch 'cassandra-3.0' into trunk 2015-09-15 16:16:56 +01:00
Aleksey Yeschenko 7ca4db0a11 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-15 16:16:33 +01:00
Aleksey Yeschenko cd4a1e6acc Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-15 16:12:45 +01:00
Alex Liu 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
Sam Tunnicliffe ef54c6c72f Merge branch 'cassandra-3.0' into trunk 2015-09-15 11:22:24 +01:00
Sam Tunnicliffe 7f5580b224 Give more control over building to 2i impls 2015-09-15 11:19:43 +01:00
Robert Stupp acb8fbb8f8 Merge branch 'cassandra-3.0' into trunk 2015-09-14 22:07:18 +02:00
Robert Stupp 51b1a1c6d3 Update index file format 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10314
 2015-09-14 22:06:37 +02:00
Robert Stupp 16497fd93f ninja-fix failing LegacySSTableTest 2015-09-13 14:18:46 +02:00
Robert Stupp d7d7db9340 Merge branch 'cassandra-3.0' into trunk 2015-09-13 14:15:25 +02:00
Robert Stupp ed67154b89 ninja-fix failing LegacySSTableTest 2015-09-13 14:13:40 +02:00
Sam Tunnicliffe 8607900454 Merge branch 'cassandra-3.0' into trunk 2015-09-11 18:04:21 +01:00
Aleksey Yeschenko 0790e48191 Modernize system_schema columns and triggers tables 
Patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-6717
 2015-09-11 18:03:12 +01:00
T Jake Luciani 43e13d9086 Merge branch 'cassandra-3.0' into trunk 2015-09-11 11:26:04 -04:00
Sylvain Lebresne 665f74740c Adds "shadowable" row tombstones for MV timestamp issues 
The patch allow row tombstones to be either regular (as before this
patch) or shadowable. If a row tombstone is shadowable, it only applies to the row
and its content as long as the row timestamp is less than the tombstone
timestamp. As soon as the row is updated with a timestamp greater than
the one of the shadowable tombstone, that tombstone is removed, even if some
cells inside the row may have older timestamps.

Patch by Sylvain Lebresne and tjake; reviewed by Tyler Hobbs for CASSANDRA-10261
 2015-09-11 11:23:58 -04:00
blerer 492507de65 Merge branch cassandra-3.0 into trunk 2015-09-11 11:24:25 +02:00
blerer d332c7e6e1 Merge branch cassandra-2.2 into cassandra-3.0 
Conflicts:
	src/java/org/apache/cassandra/db/marshal/ReversedType.java
 2015-09-11 11:22:37 +02:00
Carl Yeksigian c12abfb697 Make aggregates work with reversed types 
patch by Carl Yeksigian; reviewed by Benjamin Lerer for CASSANDRA-10296
 2015-09-11 11:18:23 +02:00
Robert Stupp 5f1eee5a49 Merge branch 'cassandra-3.0' into trunk 2015-09-11 10:50:19 +02:00
Robert Stupp 0600d7dc03 CFS.loadNewSSTables() broken for pre-3.0 sstables 
patch by Robert Stupp; reviewed by Blake Eggleston for CASSANDRA-10237
 2015-09-11 10:49:56 +02:00
blerer f6924a1de0 Merge branch cassandra-3.0 into trunk 2015-09-10 22:08:57 +02:00
blerer 8439e74e6f Drop support for protocol v1 and v2 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10146
 2015-09-10 22:05:20 +02:00
blerer a64bcfd731 Deprecate v1 and v2 protocol 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10146
 2015-09-10 21:54:50 +02:00
blerer 7d8663da77 Remove unnecessary check in Frame 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10146
 2015-09-10 21:46:41 +02:00
Marcus Eriksson 55b6e8a072 Merge branch 'cassandra-3.0' into trunk 2015-09-10 14:41:52 +02:00
Marcus Eriksson 9f0509ee35 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
 2015-09-10 14:39:01 +02:00
Marcus Eriksson 362da9bbc1 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
 2015-09-10 14:35:37 +02:00
Marcus Olsson 9dd847135f Fix sstable selection when anticompacting 
Patch by Marcus Olsson; reviewed by marcuse for CASSANDRA-10299
 2015-09-10 14:32:41 +02:00
blerer e5acb56043 Merge branch cassandra-3.0 into trunk 2015-09-09 22:22:55 +02:00
blerer cc0038b7d1 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-09 22:20:58 +02:00
blerer ec4b4d4467 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-09 22:11:58 +02:00
Brett Snyder 21065423c6 Fix update/delete behavior for static lists 
patch by Brett Snyder; reviewed by Benjamin Lerer for CASSANDRA-9838
 2015-09-09 21:49:14 +02:00
Benedict Elliott Smith 322e21ec4e Merge branch 'cassandra-3.0' into trunk 2015-09-08 11:53:45 +01:00
Stefania Alborghetti 351c7caca3 Handle non-atomic directory streams safely (CASSANDRA-10109) 
This patch refactors the lifecycle transaction log and updates
the logic to be robust to non-atomic listings of directories

patch by stefania; reviewed by benedict for CASSANDRA-10109
 2015-09-08 11:53:22 +01:00
Sylvain Lebresne 9d8091fb2b Merge branch 'cassandra-3.0' into trunk 2015-09-08 10:41:05 +02:00
Sylvain Lebresne 60e45c0ae8 Small optimizations of sstable index serialization 
patch by slebresne; reviewed by aweisberg for CASSANDRA-10232
 2015-09-08 10:39:34 +02:00
Robert Stupp 5c9792c9ab Merge branch 'cassandra-3.0' into trunk 2015-09-05 18:28:31 +02:00
Stefan Podkowinski a7895cfb2c Support for both encrypted and unencrypted native transport connections 
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-9590
 2015-09-05 18:23:10 +02:00
blerer 86faf8cb3c Merge branch 'cassandra-3.0' into trunk 2015-09-04 21:13:42 +02:00
blerer 2e3727e3ff Allow range deletions in CQL 
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-6237
 2015-09-04 21:10:29 +02:00
Sylvain Lebresne 10fa329319 Merge branch 'cassandra-3.0' into trunk 2015-09-04 17:30:53 +02:00
Sylvain Lebresne 8f249a67d9 Fix test build 2015-09-04 17:30:41 +02:00
Sylvain Lebresne f05afe5ae4 Merge branch 'cassandra-3.0' into trunk 2015-09-04 17:06:06 +02:00