You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/24 07:45:00 UTC
git commit: fix merge-created bad map key lookup type
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e0502ea29 -> f64dc4527
fix merge-created bad map key lookup type
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f64dc452
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f64dc452
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f64dc452
Branch: refs/heads/cassandra-2.1
Commit: f64dc45276282016ae4a5642555ea27ad6f6d1a6
Parents: e0502ea
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 24 01:44:37 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 24 01:44:37 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f64dc452/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 765cbac..501ef45 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1549,7 +1549,7 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
return stmt.columnRestrictions[def.position()];
case REGULAR:
case STATIC:
- return stmt.metadataRestrictions.get(def);
+ return stmt.metadataRestrictions.get(def.name);
default:
throw new AssertionError();
}