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

18402 Commits

Author SHA1 Message Date
Paulo Motta 1f1700a67c Follow-up to CASSANDRA-10513 2015-11-04 15:46:53 +00:00
Aleksey Yeschenko b761b8659b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 14:39:37 +00:00
Paulo Motta a306a1bf32 Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513) 2015-11-04 14:38:42 +00:00
Aleksey Yeschenko 1d340befaf Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:36:05 +00:00
Aleksey Yeschenko e3936ff1b1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 14:24:01 +00:00
Aleksey Yeschenko 9404fed01a Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:21:18 +00:00
Aleksey Yeschenko 8f985852f1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 14:05:00 +00:00
Aleksey Yeschenko 5a2d529842 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-04 13:59:17 +00:00
Dikang Gu b6015fa488 Improve handling of dead nodes in gossip 
patch by Dikang Gu; reviewed by Stefania Alborghetti for CASSANDRA-10298
 2015-11-04 13:56:42 +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
Aleksey Yeschenko d2b7864fe9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 12:59:27 +00:00
Aleksey Yeschenko b4b268407f Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-04 12:58:21 +00:00
Mike Adamson dc73c0b31f Fix logback-tools.xml incorrectly configured for outputing to System.err 
patch by Mike Adamson; reviewed by Jeremiah Jordan for CASSANDRA-9937
 2015-11-04 12:26:12 +00:00
Sylvain Lebresne c0c955537b Remove fully commented (and obsolete) test file (as it bothers CI) 2015-11-04 11:49:07 +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
Sam Tunnicliffe 8a8427d730 Pass client address to authenticator when attempting SASL auth 2015-11-03 17:29:28 +00:00
Yuki Morishita 87f5e2e39c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-03 10:03:34 -06:00
Yuki Morishita a549bd085f Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-03 09:40:49 -06:00
Yuki Morishita 068614ccc7 Fix streaming to catch exception so retry not fail 
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10557
 2015-11-03 09:33:37 -06:00
Sylvain Lebresne 0ad0de139b Revert "Exclude sstable based on clustering in query by name path" 
This reverts commit 1e8007b1a0.
 2015-11-03 09:31:07 +01: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 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 1e8007b1a0 Exclude sstable based on clustering in query by name path 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-10571
 2015-11-02 15:35:20 +01:00
Sylvain Lebresne cba5ef609d Proper implementation of LegacyBoundComparator 
patch by slebresne; reviewed by blerer for CASSANDRA-10602
 2015-11-02 15:28:45 +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
Sylvain Lebresne f27cc7ef3c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 14:52:53 +01:00
Sylvain Lebresne 0fbf715916 Revert "Update cqlsh driver for new driver execution API" 
This reverts commit acf67d559c.
 2015-10-30 14:51:26 +01:00
Paulo Motta df7c6581be Fix pre-3.0 counter mutation serialization 
patch by pauloricardomg; reviewed by slebresne for CASSANDRA-10470
 2015-10-30 14:41:34 +01:00
Sylvain Lebresne 10ef01d1ca Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 10:02:15 +01:00
Paulo Motta acf67d559c Update cqlsh driver for new driver execution API 
patch by aholmber; reviewed by pauloricardomg for CASSANDRA-10513
 2015-10-30 09:54:03 +01:00
Sylvain Lebresne 33f1edcce9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 09:49:33 +01:00
Sylvain Lebresne 6e929628f6 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-30 09:49:01 +01:00
Sylvain Lebresne 83fb3cc422 Mention that named values are broken for batch (CASSANDRA-10246) in the native protocol spec 2015-10-30 09:47:45 +01:00
Brandon Williams ad007f0124 Fix debian package build 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-10620
 2015-10-29 16:06:21 -05:00
Sam Tunnicliffe 3d986936fc Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-29 10:54:54 +00: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
Sylvain Lebresne a8014bb7ec Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-29 10:39:05 +01:00
Ariel Weisberg b154622b6c For CASSANDRA-9526, change line separator to the platform independent version when formatting strings in nodetool 2015-10-29 10:37:54 +01:00
Robert Stupp 4b47d711ec Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-28 20:13:49 +01:00
Robert Stupp 83fcc926eb Update cassandra.yaml comments to reflect memory_allocator deprecation, remove in 3.0 
patch by Robert Stupp; reviewed by Jim Witschey for CASSANDRA-10581
 2015-10-28 20:12:25 +01: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
Sam Tunnicliffe 5034f44957 Fix Thrift CAS operations for columns with defined metadata 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10576
 2015-10-28 17:11:04 +00: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
Sylvain Lebresne 4d00468cc3 Fix thrift get() when reading regular columns 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-10586
 2015-10-28 16:10:51 +01:00
Robert Stupp 6903727556 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-28 14:20:02 +01:00
Robert Stupp 734a3bfa78 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-28 14:18:25 +01:00
Norman Maurer 32a6f2059a Support encrypted and plain traffic on the same port 
patch by Norman Maurer; reviewed by Robert Stupp for CASSANDRA-10559
 2015-10-28 14:17:18 +01:00