Repository: cassandra Updated Branches: refs/heads/trunk 20eedd0bd -> b3ff13243
CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10747 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53e777a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53e777a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53e777a2 Branch: refs/heads/trunk Commit: 53e777a2956491cc739ece0ca571c47e5bea96a6 Parents: e4f3dba Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 09:19:00 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 09:19:28 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/53e777a2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d31645a..361bbf6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.4 + * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747) * Fix JSON update with prepared statements (CASSANDRA-10631) * Don't do anticompaction after subrange repair (CASSANDRA-10422) * Fix SimpleDateType type compatibility (CASSANDRA-10027) http://git-wip-us.apache.org/repos/asf/cassandra/blob/53e777a2/doc/cql3/CQL.textile ---------------------------------------------------------------------- diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile index 0752334..860ba08 100644 --- a/doc/cql3/CQL.textile +++ b/doc/cql3/CQL.textile @@ -688,9 +688,9 @@ bc(syntax).. AGGREGATE ( IF NOT EXISTS )? ( <keyspace> '.' )? <aggregate-name> '(' <arg-type> ( ',' <arg-type> )* ')' - SFUNC ( <keyspace> '.' )? <state-functionname> + SFUNC <state-functionname> STYPE <state-type> - ( FINALFUNC ( <keyspace> '.' )? <final-functionname> )? + ( FINALFUNC <final-functionname> )? ( INITCOND <init-cond> )? p. __Sample:__
