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 2015/08/18 22:30:16 UTC
[1/3] cassandra git commit: Fix coverity warning for potential NPE
(CASSANDRA-6717 follow up)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 f50e9321f -> 0d7b232bd
refs/heads/trunk 4dbdefb65 -> 9f54e8f6d
Fix coverity warning for potential NPE (CASSANDRA-6717 follow up)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d7b232b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d7b232b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d7b232b
Branch: refs/heads/cassandra-3.0
Commit: 0d7b232bdb406c2a49784f175ea4c8ab9e245cef
Parents: f50e932
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Aug 18 21:28:17 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Aug 18 21:28:17 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7b232b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index f77b2bc..f93ccfd 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -1434,13 +1434,13 @@ public final class SchemaKeyspace
Set<String> targetColumnNames = row.getSet("target_columns", UTF8Type.instance);
assert targetType == IndexMetadata.TargetType.COLUMN : "Per row indexes with dynamic target columns are not supported yet";
- assert targetColumnNames.size() == 1 : "Secondary indexes targetting multiple columns are not supported yet";
Set<ColumnIdentifier> targetColumns = new HashSet<>();
// if it's not a CQL table, we can't assume that the column name is utf8, so
// in that case we have to do a linear scan of the cfm's columns to get the matching one
if (targetColumnNames != null)
{
+ assert targetColumnNames.size() == 1 : "Secondary indexes targetting multiple columns are not supported yet";
targetColumnNames.forEach(targetColumnName -> {
if (cfm.isCQLTable())
targetColumns.add(ColumnIdentifier.getInterned(targetColumnName, true));
[2/3] cassandra git commit: Fix coverity warning for potential NPE
(CASSANDRA-6717 follow up)
Posted by sa...@apache.org.
Fix coverity warning for potential NPE (CASSANDRA-6717 follow up)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d7b232b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d7b232b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d7b232b
Branch: refs/heads/trunk
Commit: 0d7b232bdb406c2a49784f175ea4c8ab9e245cef
Parents: f50e932
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Aug 18 21:28:17 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Aug 18 21:28:17 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d7b232b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index f77b2bc..f93ccfd 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -1434,13 +1434,13 @@ public final class SchemaKeyspace
Set<String> targetColumnNames = row.getSet("target_columns", UTF8Type.instance);
assert targetType == IndexMetadata.TargetType.COLUMN : "Per row indexes with dynamic target columns are not supported yet";
- assert targetColumnNames.size() == 1 : "Secondary indexes targetting multiple columns are not supported yet";
Set<ColumnIdentifier> targetColumns = new HashSet<>();
// if it's not a CQL table, we can't assume that the column name is utf8, so
// in that case we have to do a linear scan of the cfm's columns to get the matching one
if (targetColumnNames != null)
{
+ assert targetColumnNames.size() == 1 : "Secondary indexes targetting multiple columns are not supported yet";
targetColumnNames.forEach(targetColumnName -> {
if (cfm.isCQLTable())
targetColumns.add(ColumnIdentifier.getInterned(targetColumnName, true));
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f54e8f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f54e8f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f54e8f6
Branch: refs/heads/trunk
Commit: 9f54e8f6d8bcb7bf7c878a23bbb7673de160be9a
Parents: 4dbdefb 0d7b232
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Aug 18 21:28:39 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Aug 18 21:28:39 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/schema/SchemaKeyspace.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------