natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cameron/12765-2.2' into cameron/12765-3.0

This commit is contained in:
Marcus Eriksson 2016-10-21 08:55:20 +02:00
parent 8b04ec9088 a370409c80
commit 7976d65af2
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -36,6 +36,7 @@ Merged from 2.2:
(CASSANDRA-12554)
Merged from 2.1:
* Add system property to set the max number of native transport requests in queue (CASSANDRA-11363)
* Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
3.0.9

6
src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
View File

@ -570,7 +570,7 @@ public class SinglePartitionReadCommand extends ReadCommand
{
nonIntersectingSSTables++;
// sstable contains no tombstone if maxLocalDeletionTime == Integer.MAX_VALUE, so we can safely skip those entirely
if (sstable.getSSTableMetadata().maxLocalDeletionTime != Integer.MAX_VALUE)
if (sstable.hasTombstones())
{
if (skippedSSTables == null)
skippedSSTables = new ArrayList<>();
@ -731,14 +731,14 @@ public class SinglePartitionReadCommand extends ReadCommand
// however: if it is set, it impacts everything and must be included. Getting that top-level partition deletion costs us
// some seek in general however (unless the partition is indexed and is in the key cache), so we first check if the sstable
// has any tombstone at all as a shortcut.
if (sstable.getSSTableMetadata().maxLocalDeletionTime == Integer.MAX_VALUE)
if (!sstable.hasTombstones())
continue; // Means no tombstone at all, we can skip that sstable
// We need to get the partition deletion and include it if it's live. In any case though, we're done with that sstable.
sstable.incrementReadCount();
try (UnfilteredRowIterator iter = sstable.iterator(partitionKey(), columnFilter(), filter.isReversed(), isForThrift()))
{
if (iter.partitionLevelDeletion().isLive())
if (!iter.partitionLevelDeletion().isLive())
{
sstablesIterated++;
result = add(UnfilteredRowIterators.noRowsIterator(iter.metadata(), iter.partitionKey(), Rows.EMPTY_STATIC_ROW, iter.partitionLevelDeletion(), filter.isReversed()), result, filter, sstable.isRepaired());

8
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
View File

@ -1840,6 +1840,14 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted<SS
return sstableMetadata.maxLocalDeletionTime;
}
/** sstable contains no tombstones if minLocalDeletionTime == Integer.MAX_VALUE */
public boolean hasTombstones()
{
// sstable contains no tombstone if minLocalDeletionTime is still set to the default value Integer.MAX_VALUE
// which is bigger than any valid deletion times
return getMinLocalDeletionTime() != Integer.MAX_VALUE;
}
public int getMinTTL()
{
return sstableMetadata.minTTL;

41
test/unit/org/apache/cassandra/db/SinglePartitionReadCommandCQLTest.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.cassandra.db;
import org.junit.Test;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.cql3.UntypedResultSet;
import static org.junit.Assert.assertTrue;
public class SinglePartitionReadCommandCQLTest extends CQLTester
{
@Test
public void partitionLevelDeletionTest() throws Throwable
{
createTable("CREATE TABLE %s (bucket_id TEXT,name TEXT,data TEXT,PRIMARY KEY (bucket_id, name))");
execute("insert into %s (bucket_id, name, data) values ('8772618c9009cf8f5a5e0c18', 'test', 'hello')");
getCurrentColumnFamilyStore().forceBlockingFlush();
execute("insert into %s (bucket_id, name, data) values ('8772618c9009cf8f5a5e0c19', 'test2', 'hello');");
execute("delete from %s where bucket_id = '8772618c9009cf8f5a5e0c18'");
getCurrentColumnFamilyStore().forceBlockingFlush();
UntypedResultSet res = execute("select * from %s where bucket_id = '8772618c9009cf8f5a5e0c18' and name = 'test'");
assertTrue(res.isEmpty());
}
}