You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/12 02:35:16 UTC
[1/3] git commit: Pass mutated cf to index updater for use by PRSI
Repository: cassandra
Updated Branches:
refs/heads/trunk 0eb9e8cfb -> c7ebc01bb
Pass mutated cf to index updater for use by PRSI
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7742
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59806a8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59806a8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59806a8f
Branch: refs/heads/trunk
Commit: 59806a8f8328250d19b3b7964ac767fe4561f429
Parents: abd1bae
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Aug 12 03:32:29 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 12 03:32:29 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Keyspace.java | 4 +++-
.../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 --------
.../apache/cassandra/db/index/PerRowSecondaryIndexTest.java | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59806a8f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f34b912..a426df4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-rc6
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
* Include stress yaml example in release and deb (CASSANDRA-7717)
* workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59806a8f/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index ff4d272..5770304 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -388,7 +388,9 @@ public class Keyspace
}
Tracing.trace("Adding to {} memtable", cf.metadata().cfName);
- SecondaryIndexManager.Updater updater = updateIndexes ? cfs.indexManager.updaterFor(key, opGroup) : SecondaryIndexManager.nullUpdater;
+ SecondaryIndexManager.Updater updater = updateIndexes
+ ? cfs.indexManager.updaterFor(key, cf, opGroup)
+ : SecondaryIndexManager.nullUpdater;
cfs.apply(key, cf, updater, opGroup, replayPosition);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59806a8f/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 339af8f..c184097 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -512,14 +512,6 @@ public class SecondaryIndexManager
/**
* Updated closure with only the modified row key.
*/
- public Updater updaterFor(DecoratedKey key, OpOrder.Group opGroup)
- {
- return updaterFor(key, null, opGroup);
- }
-
- /**
- * Updated closure with only the modified row key.
- */
public Updater gcUpdaterFor(DecoratedKey key)
{
return new GCUpdater(key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59806a8f/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
index 158dd2c..de78594 100644
--- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
@@ -132,7 +132,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader
QueryFilter filter = QueryFilter.getIdentityFilter(DatabaseDescriptor.getPartitioner().decorateKey(rowKey),
baseCfs.getColumnFamilyName(),
System.currentTimeMillis());
- LAST_INDEXED_ROW = baseCfs.getColumnFamily(filter);
+ LAST_INDEXED_ROW = cf;
LAST_INDEXED_KEY = rowKey;
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@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/c7ebc01b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7ebc01b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7ebc01b
Branch: refs/heads/trunk
Commit: c7ebc01bbc6aa602b91e105b935d6779245c87d1
Parents: 0eb9e8c 5d9621cd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 12 03:34:58 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 12 03:34:58 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Keyspace.java | 4 +++-
.../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 --------
.../apache/cassandra/db/index/PerRowSecondaryIndexTest.java | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ebc01b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ebc01b/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ebc01b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@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/5d9621cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d9621cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d9621cd
Branch: refs/heads/trunk
Commit: 5d9621cd9d13efe7e9a4042097bbc6e5c8796165
Parents: 384f873 59806a8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 12 03:34:11 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 12 03:34:11 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Keyspace.java | 4 +++-
.../org/apache/cassandra/db/index/SecondaryIndexManager.java | 8 --------
.../apache/cassandra/db/index/PerRowSecondaryIndexTest.java | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f7dcbd7,a426df4..916d42b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
+2.1.1
+ * 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:
+ * 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)
+
+
2.1.0-rc6
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
* Include stress yaml example in release and deb (CASSANDRA-7717)
* workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d9621cd/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java
----------------------------------------------------------------------