You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/12/05 11:23:16 UTC
[1/3] cassandra git commit: Conditionally update index build status
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 918a06212 -> afbc2e850
refs/heads/trunk 7e668271a -> bc70e4903
Conditionally update index build status
Patch by Corentin Chary; reviewed by Sam Tunnicliffe for CASSANDRA-12969
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afbc2e85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afbc2e85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afbc2e85
Branch: refs/heads/cassandra-3.X
Commit: afbc2e8502a8a8d1d6a319017dfc3c2a45bebaca
Parents: 918a062
Author: Corentin Chary <c....@criteo.com>
Authored: Mon Nov 28 16:23:01 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Dec 5 11:20:51 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/afbc2e85/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a3fedf..3d27690 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
* Add support for arithmetic operators (CASSANDRA-11935)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/afbc2e85/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 31a461b..aac424d 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -1043,7 +1043,7 @@ public final class SystemKeyspace
public static void setIndexBuilt(String keyspaceName, String indexName)
{
- String req = "INSERT INTO %s.\"%s\" (table_name, index_name) VALUES (?, ?)";
+ String req = "INSERT INTO %s.\"%s\" (table_name, index_name) VALUES (?, ?) IF NOT EXISTS;";
executeInternal(String.format(req, SchemaConstants.SYSTEM_KEYSPACE_NAME, BUILT_INDEXES), keyspaceName, indexName);
forceBlockingFlush(BUILT_INDEXES);
}
[2/3] cassandra git commit: Conditionally update index build status
Posted by sa...@apache.org.
Conditionally update index build status
Patch by Corentin Chary; reviewed by Sam Tunnicliffe for CASSANDRA-12969
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afbc2e85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afbc2e85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afbc2e85
Branch: refs/heads/trunk
Commit: afbc2e8502a8a8d1d6a319017dfc3c2a45bebaca
Parents: 918a062
Author: Corentin Chary <c....@criteo.com>
Authored: Mon Nov 28 16:23:01 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Dec 5 11:20:51 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/afbc2e85/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a3fedf..3d27690 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.12
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
* Add support for arithmetic operators (CASSANDRA-11935)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/afbc2e85/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 31a461b..aac424d 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -1043,7 +1043,7 @@ public final class SystemKeyspace
public static void setIndexBuilt(String keyspaceName, String indexName)
{
- String req = "INSERT INTO %s.\"%s\" (table_name, index_name) VALUES (?, ?)";
+ String req = "INSERT INTO %s.\"%s\" (table_name, index_name) VALUES (?, ?) IF NOT EXISTS;";
executeInternal(String.format(req, SchemaConstants.SYSTEM_KEYSPACE_NAME, BUILT_INDEXES), keyspaceName, indexName);
forceBlockingFlush(BUILT_INDEXES);
}
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc70e490
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc70e490
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc70e490
Branch: refs/heads/trunk
Commit: bc70e49037b17298f9273da3ae23220209c3eeca
Parents: 7e66827 afbc2e8
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Dec 5 11:21:04 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Dec 5 11:21:04 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 14e45be,3d27690..f428e31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
+4.0
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+
+
3.12
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
* Add support for arithmetic operators (CASSANDRA-11935)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc70e490/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------