You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/08/21 10:38:59 UTC
[1/3] git commit: Correctly remove tmplink files
Repository: cassandra
Updated Branches:
refs/heads/trunk 8bd1bf664 -> 5ec10197f
Correctly remove tmplink files
Patch by marcuse; reviewed by benedict for CASSANDRA-7803
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a41d5270
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a41d5270
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a41d5270
Branch: refs/heads/trunk
Commit: a41d5270fb39a5aaddf72a015aab44eb7e2db4a1
Parents: af646fb
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Aug 21 10:34:58 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Aug 21 10:36:45 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41d5270/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 92a177d..d7c3dea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0
+ * Correctly remove tmplink files (CASSANDRA-7803)
* (cqlsh) Fix column name formatting for functions, CAS operations,
and UDT field selections (CASSANDRA-7806)
* (cqlsh) Fix COPY FROM handling of null/empty primary key
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a41d5270/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
index bdc6c65..e4559d3 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableDeletingTask.java
@@ -51,8 +51,16 @@ public class SSTableDeletingTask implements Runnable
public SSTableDeletingTask(SSTableReader referent)
{
this.referent = referent;
- this.desc = referent.descriptor;
- this.components = referent.components;
+ if (referent.isOpenEarly)
+ {
+ this.desc = referent.descriptor.asType(Descriptor.Type.TEMPLINK);
+ this.components = Sets.newHashSet(Component.DATA, Component.PRIMARY_INDEX);
+ }
+ else
+ {
+ this.desc = referent.descriptor;
+ this.components = referent.components;
+ }
this.size = referent.bytesOnDisk();
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ec10197
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ec10197
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ec10197
Branch: refs/heads/trunk
Commit: 5ec10197f970ab5753a111947cf2a94b1ea287d9
Parents: 8bd1bf6 f36d1b5
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Aug 21 10:38:01 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Aug 21 10:38:01 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec10197/CHANGES.txt
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f36d1b51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f36d1b51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f36d1b51
Branch: refs/heads/trunk
Commit: f36d1b51b7c467ee6e54096328ebc28ba1bbf67b
Parents: 5aee128 a41d527
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Aug 21 10:37:36 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Aug 21 10:37:36 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f36d1b51/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f466b72,d7c3dea..2320653
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,5 +1,43 @@@
+2.1.1
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
+ * Throw InvalidRequestException when queries contain relations on entire
+ collection columns (CASSANDRA-7506)
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+Merged from 1.2:
+ * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
+
+
2.1.0
+ * Correctly remove tmplink files (CASSANDRA-7803)
* (cqlsh) Fix column name formatting for functions, CAS operations,
and UDT field selections (CASSANDRA-7806)
* (cqlsh) Fix COPY FROM handling of null/empty primary key