e49853914b
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-06-09 09:45:52 +02:00
c092c4610e
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-06-09 09:44:24 +02:00
334024751c
Remove generated files from apache-cassandra-*-src.tar.gz artifacts
...
patch by Mick Semb Wever; reviewed by Robert Stupp for CASSANDRA-15849
2020-06-08 22:31:41 +02:00
04b0049831
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-06-05 19:26:56 +02:00
880b07c2e6
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-06-05 19:25:27 +02:00
4fef917f98
In-jvm dtest builder should be provided to the factory and expose state
...
Patch by David Capwell; reviewed by Alex Petrov for CASSANDRA-15733.
2020-06-05 19:15:52 +02:00
7014cd5ab0
Merge branch 'cassandra-3.0' into cassandra-3.11
...
# Conflicts:
# CHANGES.txt
# src/java/org/apache/cassandra/db/filter/RowFilter.java
2020-06-05 12:25:28 +01:00
dd255ffa07
Fix replica-side filtering returning stale data with CL > 1
...
patch by Andres de la Peña; reviewed by Benjamin Lerer, Caleb Rackliffe and ZhaoYang for CASSANDRA-8272
2020-06-05 12:01:13 +01:00
056c9eff4b
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-06-04 20:17:31 +02:00
c4064dd80e
Allow recovery from the cases when CQL-created compact sense tables have bytes in EmptyType columns.
...
Patch by Alex Petrov; reviewed by Sylvain Lebresne for CASSANDRA-15778.
2020-06-04 20:04:27 +02:00
ebfd05254f
Merge commit 'c8a2834606d683ba9945e9cc11bdb4207ce269d1' into cassandra-3.11
2020-05-27 17:17:50 +02:00
c8a2834606
Fix LegacyLayout handling of non-selected collection tombstones
...
If a collection tombstone is not included by a query, it can be ignored,
but it currently made `LegacyLayout.CellGrouper#addCollectionTombstone`
return `false`, which made it stop the current row, which is incorrect
(this can potentially lead to a duplicate row). This patch changes it
to return `true`.
Patch by Sylvain Lebresne; reviewed by Marcus Eriksson & Aleksey
Yeschenko for CASSANDRA-15805
2020-05-27 17:08:52 +02:00
8358e19840
Fix legacy handling of RangeTombstone with collection ones
...
When a multi-row range tombstone interacts with a a collection tombstone
within one of a covered row, the resulting range tombstone in the legacy
format will start in the middle of the row and extend past said row and
it needs special handling.
Before this commit, the code deserializing that RT was making it
artificially start at the end of the row (in which the collection
tombstone is), but that means that when `LegacyLayout.CellGrouper`
encountered it, it decided the row was finished, even if it was not,
leading to potential row duplication.
The patch solves this by:
1. making that problematic tombstone start at the beginning of the row
instead of its end (to avoid code deciding the row is over).
2. modify `UnfilteredDeserializer` to 'split' that range tombstone into
a row tombstone for the row it covers, which is handled as a normal row
tombstone, and push the rest of the range tombstone (that starts after
the row and extends to the original end of the RT) to be handled after
that row is fully "grouped".
The patch also removes the possibility of getting an empty row from
`LegacyLayout#getNextRow` to avoid theoretical problems with that.
Patch by Sylvain Lebresne; reviewed by Marcus Eriksson & Aleksey
Yeschenko for CASSANDRA-15805
2020-05-27 17:05:40 +02:00
3cda9d732d
Merge branch cassandra-3.0 into cassandra-3.11
2020-05-25 16:32:52 +02:00
a4b6deb906
Rely on snapshotted session infos on StreamResultFuture.maybeComplete to avoid races
...
patch by Massimiliano Tomassi; reviewed by Sergio Bossa and by ZhaoYang
for CASSANDRA-15667
2020-05-25 16:22:44 +02:00
9519eb3d37
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-20 13:41:31 -07:00
ea202cea28
EmptyType doesn't override writeValue so could attempt to write bytes when expected not to
...
Patch by David Capwell; Reviewed by Jordan West for CASSANDRA-15790
2020-05-20 13:37:49 -07:00
4a4d5e02b0
Merge branch cassandra-3.0 into cassandra-3.11
2020-05-20 11:16:59 +02:00
86e1590042
Fix index queries on partition key columns when some partitions contains only static data
...
patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-13666
2020-05-20 10:32:34 +02:00
e1a0db798a
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-20 08:45:18 +02:00
4d42c189fa
Avoid creating duplicate rows during major upgrades
...
Patch by Aleksey Yeschenko, Sam Tunnicliffe and Marcus Eriksson;
reviewed by Sylvain Lebresne and Alex Petrov for CASSANDRA-15789
2020-05-20 08:37:36 +02:00
406a8596eb
Fix CQL formatting of read command restrictions for slow query log
...
patch by Andres de la Peña; reviewed by Berenguer Blasi for CASSANDRA-15503
2020-05-11 11:14:54 +01:00
b9de3f60f0
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-07 17:15:15 +01:00
f858a800f0
Fix flaky test CustomIndexTest#indexBuildingPagesLargePartitions
...
patch by Andres de la Peña; reviewed by Berenguer Blasi for CASSANDRA-15757
2020-05-07 17:14:57 +01:00
01cf685946
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-07 13:32:32 +02:00
8de45af3f1
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-05-07 13:29:39 +02:00
1c898f9eb2
ninja-fix: slackSend fix on `Jenkins Test Results Report in plaintext for ASF ML`
2020-05-07 13:21:42 +02:00
18736b4136
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-07 10:50:33 +02:00
b105e91967
liveDiskSpaceUsed and totalDiskSpaceUsed get corrupted if IndexSummaryRedistribution gets interrupted
...
Patch by David Capwell; reviewed by marcuse for CASSANDRA-15674
2020-05-07 10:49:43 +02:00
2f8fe3754d
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-06 13:10:15 +02:00
bc7ca568ea
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-05-06 13:09:40 +02:00
94aee924e2
Jenkins Test Results Report in plaintext for ASF ML
...
patch by Mick Semb Wever; reviewed by Eduard Tudenhöfner for CASSANDRA-15729
2020-05-06 13:08:17 +02:00
996c0ada09
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-05-06 12:56:02 +02:00
196e54436f
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-05-06 12:55:00 +02:00
c6a9f5513e
Remove duplicates from tarball
...
patch by Matthias Pfau; reviewed by Eduard Tudenhöfner, Mick Semb Wever for CASSANDRA-15768
2020-05-06 12:39:26 +02:00
4801fef22a
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-30 19:35:56 +02:00
0fd9b5bd6f
Merge branch 'cassandra-2.2' into cassandra-3.0
2020-04-30 19:34:14 +02:00
b44a2140f8
Make all test targets declare the temp directory (java.io.tmpdir) as defined by tmp.dir
...
patch by Mick Semb Wever; reviewed by Berenguer Blasi, Ekaterina Dimitrova for CASSANDRA-15777
2020-04-30 18:32:41 +02:00
8a4e2edcff
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-29 21:09:40 +02:00
ed62641748
Use different package names for the cqlsh-tests matrix values, so final aggregated test reports are distinguished
...
patch by Mick Semb Wever; reviewed by David Capwell for CASSANDRA-15729
2020-04-29 21:07:33 +02:00
5fe434c4ab
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-29 12:03:31 -05:00
469c6496ae
Fix init script for debian Buster
...
Patch by Vicente Jimenez Aguilar, reviewed by brandonwilliams for
CASSANDRA-15770
2020-04-29 12:01:34 -05:00
d7ffdb2d91
fix missing CHANGES entry
2020-04-28 10:02:06 -05:00
8459121a04
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-28 09:55:25 -05:00
4886968c4e
Fix chunk index overflow due to large sstable with small chunk length
...
patch by ZhaoYang; reviewed by brandonwilliams for CASSANDRA-15595
2020-04-27 11:22:06 -05:00
c190ab9fcb
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-27 11:17:18 -05:00
04be7366fc
Fix chunk index overflow due to large sstable with small chunk length
...
patch by ZhaoYang; reviewed by brandonwilliams for CASSANDRA-15595
2020-04-27 11:03:06 -05:00
377ceb675c
Merge branch 'cassandra-3.0' into cassandra-3.11
...
# Conflicts:
# src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java
# src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java
# test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
2020-04-27 16:21:45 +01:00
6cd2d07d9a
Fix infinite loop on index query paging in tables with clustering
...
patch by Andres de la Peña; reviewed by Benjamin Lerer for CASSANDRA-14242
2020-04-27 15:01:31 +01:00
d833df80a9
Merge branch 'cassandra-3.0' into cassandra-3.11
2020-04-21 16:12:54 +02:00
Mick Semb Wever