merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9efe99d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9efe99d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9efe99d9 Branch: refs/heads/trunk Commit: 9efe99d92a4c9d0cbe5f552a21b6f0e3596e2d46 Parents: 263f192 48a2269 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 2 09:53:41 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed May 2 09:53:41 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamily.java | 2 +- .../cassandra/io/sstable/SSTableWriterTest.java | 56 +++++++++++++++ 3 files changed, 58 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9efe99d9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c37dd93,bd508c6..49719f4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,67 -1,7 +1,68 @@@ -1.0.10 +1.1.1-dev + * Optimize reads when row deletion timestamps allow us to restrict + the set of sstables we check (CASSANDRA-4116) + * incremental repair by token range (CASSANDRA-3912) + * streaming commitlog backup + pitr (CASSANDRA-3690) + * avoid generating redundant compaction tasks during streaming + (CASSANDRA-4174) + * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to + StorageService mbean (CASSANDRA-556) + * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) + * optimize truncate when autosnapshot is disabled (CASSANDRA-4153) + * add support for commitlog archiving and point-in-time recovery + (CASSANDRA-3647) + * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966) + * add column limit to cli (CASSANDRA-3012, 4098) + * clean up and optimize DataOutputBuffer, used by CQL compression and + CompositeType (CASSANDRA-4072) + * optimize commitlog checksumming (CASSANDRA-3610) + * identify and blacklist corrupted SSTables from future compactions + (CASSANDRA-2261) + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) + * Expose repairing by a user provided range (CASSANDRA-3912) + * Add way to force the cassandra-cli to refresh it's schema (CASSANDRA-4052) + * Avoids having replicate on write tasks stacking up at CL.ONE (CASSANDRA-2889) +Merged from 1.0: + * Fix super columns bug where cache is not updated (CASSANDRA-4190) + * fix maxTimestamp to include row tombstones (CASSANDRA-4116) + + +1.1.0-final + * average a reduced liveRatio estimate with the previous one (CASSANDRA-4065) + * Allow KS and CF names up to 48 characters (CASSANDRA-4157) + * fix stress build (CASSANDRA-4140) + * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167) + * (cql) fix NPE in cql3 ALTER TABLE (CASSANDRA-4163) + * (cql) Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156) + * (cql) Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170) + * (cql) Throw invalid exception from CQL3 on obsolete options (CASSANDRA-4171) + * (cqlsh) fix recognizing uppercase SELECT keyword (CASSANDRA-4161) + * Pig: wide row support (CASSANDRA-3909) +Merged from 1.0: * avoid streaming empty files with bulk loader if sstablewriter errors out (CASSANDRA-3946) + + +1.1-rc1 + * Include stress tool in binary builds (CASSANDRA-4103) + * (Hadoop) fix wide row iteration when last row read was deleted + (CASSANDRA-4154) + * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114) + * Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042) + * Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087) + * fix KEYS index from skipping results (CASSANDRA-3996) + * Remove sliced_buffer_size_in_kb dead option (CASSANDRA-4076) + * make loadNewSStable preserve sstable version (CASSANDRA-4077) + * Respect 1.0 cache settings as much as possible when upgrading + (CASSANDRA-4088) + * relax path length requirement for sstable files when upgrading on + non-Windows platforms (CASSANDRA-4110) + * fix terminination of the stress.java when errors were encountered + (CASSANDRA-4128) + * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) + * Fix get_paged_slice (CASSANDRA-4136) + * CQL3: Support slice with exclusive start and stop (CASSANDRA-3785) +Merged from 1.0: * support PropertyFileSnitch in bulk loader (CASSANDRA-4145) * add auto_snapshot option allowing disabling snapshot before drop/truncate (CASSANDRA-3710) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9efe99d9/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9efe99d9/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java index 0000000,0754ec5..ba6f125 mode 000000,100644..100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java @@@ -1,0 -1,56 +1,56 @@@ + package org.apache.cassandra.io.sstable; + /* + * + * 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. + * + */ + + + import static org.junit.Assert.assertEquals; + + import java.io.IOException; + import java.nio.ByteBuffer; + import java.util.concurrent.ExecutionException; + -import org.apache.cassandra.CleanupHelper; ++import org.apache.cassandra.SchemaLoader; + import org.apache.cassandra.db.ColumnFamilyStore; + import org.apache.cassandra.db.RowMutation; + import org.apache.cassandra.db.Table; + import org.apache.cassandra.db.filter.QueryPath; + import org.apache.cassandra.utils.ByteBufferUtil; + import org.junit.Test; + -public class SSTableWriterTest extends CleanupHelper ++public class SSTableWriterTest extends SchemaLoader + { + @Test + public void testRowDeleteTimestampRecordedCorrectly() throws IOException, ExecutionException, InterruptedException + { + Table table = Table.open("Keyspace1"); + ColumnFamilyStore store = table.getColumnFamilyStore("Standard2"); + ByteBuffer key = ByteBufferUtil.bytes(String.valueOf("key1")); + + RowMutation rm = new RowMutation("Keyspace1", key); + rm.delete(new QueryPath("Standard2"), 0); + rm.apply(); + + store.forceBlockingFlush(); + + SSTableReader sstable = store.getSSTables().iterator().next(); + assertEquals(0, sstable.getMaxTimestamp()); + } + }
