Ninja s/substract/subtract
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a9d8cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a9d8cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a9d8cc Branch: refs/heads/trunk Commit: 44a9d8cc689ffe9f3a5628a1e816730e75736bbf Parents: cb62ef4 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Aug 27 18:16:19 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Aug 27 18:16:36 2014 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/helptopics.py | 2 +- src/java/org/apache/cassandra/cql3/Operation.java | 4 ++-- src/java/org/apache/cassandra/cql3/Sets.java | 2 +- test/unit/org/apache/cassandra/cql3/CollectionsTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/pylib/cqlshlib/helptopics.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/helptopics.py b/pylib/cqlshlib/helptopics.py index 9848c71..34584ff 100644 --- a/pylib/cqlshlib/helptopics.py +++ b/pylib/cqlshlib/helptopics.py @@ -388,7 +388,7 @@ class CQLHelpTopics(object): Counter columns can be incremented or decremented by an arbitrary numeric value though the assignment of an expression that adds or - substracts the value. + subtracts the value. """ def help_update_where(self): http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/src/java/org/apache/cassandra/cql3/Operation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Operation.java b/src/java/org/apache/cassandra/cql3/Operation.java index ace466c..ebcb30b 100644 --- a/src/java/org/apache/cassandra/cql3/Operation.java +++ b/src/java/org/apache/cassandra/cql3/Operation.java @@ -92,7 +92,7 @@ public abstract class Operation * This can be one of: * - Setting a value: c = v * - Setting an element of a collection: c[x] = v - * - An addition/substraction to a variable: c = c +/- v (where v can be a collection literal) + * - An addition/subtraction to a variable: c = c +/- v (where v can be a collection literal) * - An prepend operation: c = v + c */ public interface RawUpdate @@ -303,7 +303,7 @@ public abstract class Operation case SET: return new Sets.Discarder(receiver, value.prepare(keyspace, receiver)); case MAP: - // The value for a map substraction is actually a set + // The value for a map subtraction is actually a set ColumnSpecification vr = new ColumnSpecification(receiver.ksName, receiver.cfName, receiver.name, http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/src/java/org/apache/cassandra/cql3/Sets.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Sets.java b/src/java/org/apache/cassandra/cql3/Sets.java index 20d9ac5..315d7d3 100644 --- a/src/java/org/apache/cassandra/cql3/Sets.java +++ b/src/java/org/apache/cassandra/cql3/Sets.java @@ -282,7 +282,7 @@ public abstract class Sets } } - // Note that this is reused for Map substraction too (we substract a set from a map) + // Note that this is reused for Map subtraction too (we subtract a set from a map) public static class Discarder extends Operation { public Discarder(ColumnDefinition column, Term t) http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a9d8cc/test/unit/org/apache/cassandra/cql3/CollectionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/CollectionsTest.java b/test/unit/org/apache/cassandra/cql3/CollectionsTest.java index 72a24f0..01e05f2 100644 --- a/test/unit/org/apache/cassandra/cql3/CollectionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/CollectionsTest.java @@ -76,7 +76,7 @@ public class CollectionsTest extends CQLTester assertInvalid("UPDATE %s SET m = m + ? WHERE k = 0", list("a", "b")); assertInvalid("UPDATE %s SET m = m - [ 'a', 'b' ] WHERE k = 0"); assertInvalid("UPDATE %s SET m = m + ? WHERE k = 0", set("a", "b")); - // Note that we do allow substracting a set from a map, but not a map from a map + // Note that we do allow subtracting a set from a map, but not a map from a map // TODO: We should remove this 'if' once #7833 is resolved if (!usePrepared()) assertInvalid("UPDATE %s SET m = m - ? WHERE k = 0", map("a", "b", "c", "d"));
