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
Sylvain Lebresne ba1443173f Merge branch 'cassandra-3.1' into trunk 2015-11-24 14:51:01 +01:00
Joel Knighton 9dac99f817 Use constant nowInSec for SinglePartitionReadCommands in QueryPager test 
patch by jkni; reviewed by slebresne for CASSANDRA-10754
 2015-11-24 14:48:38 +01:00
Aleksey Yeschenko 2e8bb3a645 Merge branch 'cassandra-3.1' into trunk 2015-11-23 20:24:33 +00:00
Aleksey Yeschenko c7e74f3494 Test an NTS keyspace migration in LegacySchemaMigratorTest 2015-11-23 20:23:46 +00:00
Yuki Morishita fa4c17383a Merge branch 'cassandra-3.1' into trunk 2015-11-23 14:00:19 -06:00
Yuki Morishita 0b3cfae4e6 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-23 13:58:58 -06:00
Yuki Morishita 056055febd Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-23 13:17:39 -06:00
Pavel Yaskevich 440366edd0 Make index building pluggable 
Patch and review by Pavel Yaskevich and Sam Tunnicliffe for
CASSANDRA-10681
 2015-11-23 18:47:55 +00:00
Chris Moos 8b9a9161ca Fix CompressedInputStream for proper cleanup 
patch by Chris Moos and yukim; reviewed by Paulo Motta for CASSANDRA-10012
 2015-11-23 12:33:09 -06:00
Robert Stupp 945a4192d4 Merge branch 'cassandra-3.1' into trunk 2015-11-23 16:48:59 +01:00
Robert Stupp 174a0aa7d1 Unable to create a function with argument of type Inet 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-10741

Merge branch 'cassandra-2.2' into cassandra-3.0
 2015-11-23 16:47:52 +01:00
Robert Stupp d425fe496a Unable to create a function with argument of type Inet 
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-10741
 2015-11-23 16:47:08 +01:00
Marcus Eriksson 0caa17de0e Merge branch 'cassandra-3.1' into trunk 2015-11-20 11:07:09 +01:00
Marcus Eriksson f4ae344871 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 11:06:48 +01:00
Marcus Eriksson 073f06262a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-20 11:05:01 +01:00
Marcus Eriksson 99617a5293 Limit size of windows with DTCS 
Patch by marcuse; reviewed by Branimir Lambov for CASSANDRA-10280
 2015-11-20 10:59:46 +01:00
Pavel Yaskevich f81a91d3fe Add sstable flush observer 
patch by Pavel Yaskevich; reviewed by Sam Tunnicliffe for CASSANDRA-10678
 2015-11-19 14:16:59 -08:00
Branimir Lambov c000da1356 Improve NTS endpoints calculation 
patch by Branimir Lambov; reviewed by Aleksey Yeschenko for
CASSANDRA-10200
 2015-11-18 15:44:21 +00:00
Marcus Eriksson d09b6c69e0 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-18 13:59:09 +01:00
Marcus Eriksson 246cb883ab Don't remove level info when running upgradesstables 
Patch by marcuse; reviewed by yukim for CASSANDRA-10692
 2015-11-18 13:58:08 +01:00
Yuki Morishita aff6994c8f Merge branch 'cassandra-3.1' into trunk 2015-11-17 19:31:51 -06:00
Yuki Morishita 5cc02dd9ac Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-17 19:31:38 -06:00
Yuki Morishita ae64cc0da4 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-17 18:07:42 -06:00
Yuki Morishita 8385bb639a Create compression chunk when sending file only 
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10680
 2015-11-17 17:58:37 -06:00
Aleksey Yeschenko b1f7ac8afb Merge branch 'cassandra-3.1' into trunk 2015-11-17 16:56:35 +00:00
Aleksey Yeschenko aa21bd295a Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-17 16:52:16 +00:00
Aleksey Yeschenko a68f8bd700 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-17 16:47:41 +00:00
Aleksey Yeschenko 5414950d6a Forbid compact clustering column type changes in ALTER TABLE 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-8879
 2015-11-17 16:44:37 +00:00
Stefania Alborghetti 6312f33559 Improve performance of the folderSize function 
patch by briareus; reviewed by Stefania for CASSANDRA-10677
 2015-11-17 12:09:21 +01:00
Sylvain Lebresne b59b26ba5b Merge branch 'cassandra-3.1' into trunk 2015-11-17 11:52:57 +01:00
Stefania Alborghetti 9a78608193 Don't clean test folder twice in unit tests 
patch by Stefania; reviewed by slebresne for CASSANDRA-10682
 2015-11-17 11:51:13 +01:00
Marcus Eriksson 6645062caa Merge branch 'cassandra-3.1' into trunk 2015-11-17 10:15:58 +01:00
Marcus Eriksson eb8afb71f5 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-17 10:13:18 +01:00
Ariel Weisberg 99b82dbb43 Don't do anticompaction after subrange repair 
Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422
 2015-11-17 10:07:59 +01:00
Marcus Eriksson d434a33ace Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-17 10:07:04 +01:00
Ariel Weisberg a8e8a67306 Reject incremental repair requests combined with subrange repair 
Patch by Ariel Weisberg; reviewed by marcuse for CASSANDRA-10422
 2015-11-17 09:57:15 +01:00
Robert Stupp c0480d8bbd ninja-fix javac warning 2015-11-16 17:39:13 +01:00
blerer 269c5d4f85 Add support for type casting in selection clause 
patch by Benjamin Lerer; reviewed by Robert Stupp for (CASSANDRA-10310)
 2015-11-16 15:08:09 +01:00
Tyler Hobbs 334fbad7b0 Merge branch 'cassandra-3.1' into trunk 2015-11-13 15:37:20 -06:00
Tyler Hobbs c2320c92fd Preserve deletion info when notifying 2ary index of row update 
Patch by Tyler Hobbs; reviewed by Sam Tunnicliffe for CASSANDRA-10694
 2015-11-13 15:35:40 -06:00
Sam Tunnicliffe d8ad0f0f2a Merge branch 'cassandra-3.1' into trunk 2015-11-13 17:56:32 +00:00
Sam Tunnicliffe 5730e7b9f8 Notify indexers of partition deletion during cleanup 
Patch by Sam Tunnicliffe; reviewed by Sergio Bossa for CASSANDRA-10685
 2015-11-13 17:15:11 +00:00
Joshua McKenzie 9f021823fe Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	test/unit/org/apache/cassandra/db/HintedHandOffTest.java
 2015-11-13 09:48:03 -05:00
Paulo Motta e291382fd0 Fix missing host ID on hinted handoff write 
Patch by pauloricardomg; reviewed by aweisberg for CASSANDRA-10485
 2015-11-13 09:46:57 -05:00
blerer 0781bccc92 Merge branch cassandra-3.1 into trunk 2015-11-12 21:14:59 +01:00
blerer 464f8f0768 Merge branch cassandra-2.2 into cassandra-3.0 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java
 2015-11-12 21:07:08 +01:00
blerer b05fe4ffee Fix SimpleDateType type compatibility 
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-10027
 2015-11-12 20:53:42 +01:00
Yuki Morishita 186efefe86 Merge branch 'cassandra-3.1' into trunk 2015-11-11 16:16:58 -06:00
Yuki Morishita 0de23f20ae Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-11 16:16:23 -06:00
Yuki Morishita e487553575 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-11 16:13:58 -06:00
Paulo Motta 1c3ff9242a Invalidate row/counter cache after stream receive task is completed 
patch by Paulo Motta; reviewed by yukim for CASSANDRA-10341
 2015-11-11 15:52:37 -06:00
Joshua McKenzie 7d6dbf897c Merge branch 'cassandra-3.1' into trunk 2015-11-11 15:06:23 -05:00
Stefania Alborghetti 9a90e9894e 10089 - 3.0 patch 2015-11-11 15:05:35 -05:00
Stefania Alborghetti 6bb6bb0051 10089 - 2.2 patch 2015-11-11 15:04:25 -05:00
Stefania Alborghetti 6bad57fc3c Fix NPE in Gossip handleStateNormal 
Patch by stefania; reviewed by jknighton for CASSANDRA-10089
 2015-11-11 15:02:26 -05:00
Marcus Eriksson 55811e5610 Merge branch 'cassandra-3.1' into trunk 2015-11-11 08:56:12 +01:00
Marcus Eriksson 49c9c01f5b Keep the file open in trySkipCache 
Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-10669
 2015-11-11 08:52:28 +01:00
Aleksey Yeschenko 3ea35bda6e Merge branch 'cassandra-3.1' into trunk 2015-11-10 14:43:04 +00:00
Aleksey Yeschenko d766f4fb20 Fix CQLSSTableWriterTest 2015-11-10 14:42:01 +00:00
Aleksey Yeschenko 41c69ac556 Merge branch 'cassandra-3.1' into trunk 2015-11-10 13:47:27 +00:00
Aleksey Yeschenko 1e64a9d036 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-10 13:46:21 +00:00
Aleksey Yeschenko ef0e447add Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-10 13:44:49 +00:00
Paulo Motta 3674ad9dab Reject counter writes in CQLSSTableWriter 
patch by Paulo Motta; reviewed by Aleksey Yeschenko for CASSANDRA-10258
 2015-11-10 13:41:01 +00:00
Aleksey Yeschenko 48b685e852 Revert "Simplify row cache invalidation code" 
This reverts commit d867ac1f41.
 2015-11-09 20:15:44 +00:00
Jonathan Ellis d867ac1f41 Simplify row cache invalidation code 
patch by Jonathan Ellis; reviewed by Aleksey Yeschenko for
CASSANDRA-10396
 2015-11-09 20:05:32 +00:00
T Jake Luciani be01d8eb8f Merge branch 'cassandra-3.0' into trunk 2015-11-06 14:33:29 -05:00
Tyler Hobbs 2998bb3cc4 Fix AssertionError while flushing memtable due to materialized views incorrectly inserting empty rows 
Patch by thobbs; reviewed by tjake for CASSANDRA-10614
 2015-11-06 14:32:51 -05:00
Aleksey Yeschenko 59a32211a0 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 19:21:28 +00:00
Paulo Motta ff9b6bb973 Improve json2sstable error reporting on nonexistent columns 
patch by Paulo Motta; reviewed by Ariel Weisberg for CASSANDRA-10401
 2015-11-06 19:19:13 +00:00
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