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

3926 Commits

Author SHA1 Message Date
Robert Stupp fb9e75eb32 Merge branch 'cassandra-3.0' into trunk 2015-11-06 18:28:51 +01:00
Robert Stupp e94032a234 Store UDA initcond as CQL literal in the schema table, instead of a blob 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10650
 2015-11-06 18:28:48 +01:00
Sylvain Lebresne 9084428782 Merge branch 'cassandra-3.0' into trunk 2015-11-06 15:03:52 +01:00
Sylvain Lebresne 5343a75bf5 Don't use -1 as position for partition key in schema 
patch by slebresne; reviewed by beobal for CASSANDRA-10491
 2015-11-06 15:00:20 +01:00
Robert Stupp 155859641a Merge branch 'cassandra-3.0' into trunk 2015-11-06 14:56:45 +01:00
Robert Stupp 0b83c188b9 Make UFTest.testAmokUDF non-flappy 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10662
 2015-11-06 14:56:26 +01:00
Robert Stupp a38f362a04 Merge branch 'cassandra-3.0' into trunk 2015-11-05 18:42:13 +01:00
Robert Stupp 5289a564cf Fix failing DeleteTest 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10656
 2015-11-05 18:42:02 +01:00
Aleksey Yeschenko 1b876bc600 Merge branch 'cassandra-3.0' into trunk 2015-11-04 17:08:43 +00:00
Aleksey Yeschenko 340df43fb7 Use CQL type names in schema metadata tables 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-10365
 2015-11-04 17:06:07 +00:00
Aleksey Yeschenko 81e1b15dbd Merge branch 'cassandra-3.0' into trunk 2015-11-04 13:13:32 +00:00
Branimir Lambov 1492be07cd Guard batchlog replay against integer division by zero 
patch by Branimir Lambov; reviewed by Stefania Alborghetti for
CASSANDRA-9223
 2015-11-04 13:12:59 +00:00
Sylvain Lebresne b40527fcc7 Merge branch 'cassandra-3.0' into trunk 2015-11-04 11:49:22 +01:00
Sylvain Lebresne c0c955537b Remove fully commented (and obsolete) test file (as it bothers CI) 2015-11-04 11:49:07 +01:00
Sylvain Lebresne 5a1d6553e6 Merge branch 'cassandra-3.0' into trunk 2015-11-04 11:40:56 +01:00
Mike Adamson 2c9976150f Check for primary key columns in decodeCellName 
patch by mike_tr_adamson; reviewed by slebresne for CASSANDRA-10608
 2015-11-04 11:39:02 +01:00
Benedict Elliott Smith 663cd43ab1 Merge branch 'cassandra-3.0' into trunk 2015-11-02 19:46:27 +00:00
Benedict Elliott Smith fd59549a39 comment out NativeCellTest, since we don't support it in 3.0 2015-11-02 19:46:19 +00:00
Benedict Elliott Smith fbdeef836a Merge branch 'cassandra-3.0' into trunk 2015-11-02 18:59:35 +00:00
Benedict Elliott Smith 79f230f30d Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	src/java/org/apache/cassandra/utils/btree/TreeBuilder.java
	test/unit/org/apache/cassandra/db/NativeCellTest.java
 2015-11-02 18:59:24 +00:00
Benedict Elliott Smith 82aa7969c1 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
 2015-11-02 18:57:37 +00:00
Benedict Elliott Smith 986a1a7694 10579: fix NativeCell behaviour when clustering components > 32K in size 2015-11-02 16:40:35 +00:00
Sylvain Lebresne b1f2d14f44 Merge branch 'cassandra-3.0' into trunk 2015-11-02 15:16:57 +01:00
Sylvain Lebresne 4beb54da50 Don't use the timestamp ordered path for name queries with counters/collections 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-10572

Name queries usually query sstable sequentially in recency order in the
hope of only needing the more recent sstable(s). We cannot ever save
sstable that way for counters and collections however.

The patch makes name queries with either counters or collections use the
more generic path of looking at all sstables simultaneously. For that,
the patch remove the sublcasses of SinglePartitionReadCommand: those
classes were mostly justified by having name and slice queries using
different path, but it's not fully the case anymore. Both path
(timestamp ordered and all sstable simultaneously) are moved to
SinglePartitionReadCommand and used when relevant.

This actually fix a bug with counters since those were previously using
the timestamp ordered path and were potentially skipping older sstable
which is incorrect.
 2015-11-02 15:11:08 +01:00
Sam Tunnicliffe ca8e9a97b6 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-29 10:50:45 +00:00
Andrés de la Peña 7f1fec1908 Add validation method to PerRowSecondaryIndex 
Patch by Andrés de la Peña; reviewed by Sam Tunnicliffe for
CASSANDRA-10092
 2015-10-29 10:49:19 +00:00
Sam Tunnicliffe a88d3e8962 Merge branch 'cassandra-3.0' into trunk 2015-10-28 17:26:43 +00:00
Sam Tunnicliffe 8210075c57 On CFS::reload, execute the reload task for each secondary index 
Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-10604
 2015-10-28 17:23:57 +00:00
Benjamin Lerer a4fe865d4f Merge branch cassandra-3.0 into trunk 2015-10-28 17:47:33 +01:00
Benjamin Lerer 3615da5831 Fix PartitionUpdate.operationCount()for updates with static column 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10606
 2015-10-28 17:41:03 +01:00
Sam Tunnicliffe 7297b3ca22 Merge branch 'cassandra-3.0' into trunk 2015-10-28 11:37:08 +00:00
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