You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/11/21 20:27:42 UTC
[1/3] cassandra git commit: Ninja: fix check for duplicate cols in
INSERT
Repository: cassandra
Updated Branches:
refs/heads/trunk 07893d704 -> c7a932c57
Ninja: fix check for duplicate cols in INSERT
This was caused by the changes for CASSANDRA-8178
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/025b4060
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/025b4060
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/025b4060
Branch: refs/heads/trunk
Commit: 025b4060cb3088f8815909e1710801f757e7a497
Parents: 084d93d
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Nov 21 13:21:36 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Nov 21 13:21:36 2014 -0600
----------------------------------------------------------------------
.../cassandra/cql3/statements/UpdateStatement.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/025b4060/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index 022af26..e2da251 100644
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@ -138,13 +138,17 @@ public class UpdateStatement extends ModificationStatement
for (int i = 0; i < columnNames.size(); i++)
{
- CFDefinition.Name name = cfDef.get(columnNames.get(i).prepare(cfDef.cfm));
+ ColumnIdentifier id = columnNames.get(i).prepare(cfDef.cfm);
+ CFDefinition.Name name = cfDef.get(id);
if (name == null)
- throw new InvalidRequestException(String.format("Unknown identifier %s", columnNames.get(i)));
+ throw new InvalidRequestException(String.format("Unknown identifier %s", id));
for (int j = 0; j < i; j++)
- if (name.name.equals(columnNames.get(j)))
- throw new InvalidRequestException(String.format("Multiple definitions found for column %s", name));
+ {
+ ColumnIdentifier otherId = columnNames.get(j).prepare(cfDef.cfm);
+ if (id.equals(otherId))
+ throw new InvalidRequestException(String.format("Multiple definitions found for column %s", id));
+ }
Term.Raw value = columnValues.get(i);
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6826888b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6826888b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6826888b
Branch: refs/heads/trunk
Commit: 6826888be8604b3336e994c18f4c0e51f393d071
Parents: 705e5e4 025b406
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Nov 21 13:25:41 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Nov 21 13:25:41 2014 -0600
----------------------------------------------------------------------
.../cassandra/cql3/statements/UpdateStatement.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6826888b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index b11173a,e2da251..2c87173
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@@ -136,13 -138,17 +136,17 @@@ public class UpdateStatement extends Mo
for (int i = 0; i < columnNames.size(); i++)
{
- ColumnDefinition def = cfm.getColumnDefinition(columnNames.get(i).prepare(cfm));
- ColumnIdentifier id = columnNames.get(i).prepare(cfDef.cfm);
- CFDefinition.Name name = cfDef.get(id);
- if (name == null)
++ ColumnIdentifier id = columnNames.get(i).prepare(cfm);
++ ColumnDefinition def = cfm.getColumnDefinition(id);
+ if (def == null)
- throw new InvalidRequestException(String.format("Unknown identifier %s", columnNames.get(i)));
+ throw new InvalidRequestException(String.format("Unknown identifier %s", id));
for (int j = 0; j < i; j++)
- if (def.name.equals(columnNames.get(j)))
- throw new InvalidRequestException(String.format("Multiple definitions found for column %s", def.name));
+ {
- ColumnIdentifier otherId = columnNames.get(j).prepare(cfDef.cfm);
++ ColumnIdentifier otherId = columnNames.get(j).prepare(cfm);
+ if (id.equals(otherId))
+ throw new InvalidRequestException(String.format("Multiple definitions found for column %s", id));
+ }
Term.Raw value = columnValues.get(i);
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@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/c7a932c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7a932c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7a932c5
Branch: refs/heads/trunk
Commit: c7a932c57add10c7c455fb2b87d86f74b4e0cd3d
Parents: 07893d7 6826888
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Nov 21 13:26:27 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Nov 21 13:26:27 2014 -0600
----------------------------------------------------------------------
.../cassandra/cql3/statements/UpdateStatement.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7a932c5/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------