You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ms...@apache.org on 2018/03/05 14:51:58 UTC
[1/3] cassandra git commit: Fix CQL documentation typos
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 465d86904 -> d6982cd22
refs/heads/trunk 2201e364b -> 551744a99
Fix CQL documentation typos
Patch by An Wu; Reviewed by Michael Shuler for CASSANDRA-13686
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6982cd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6982cd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6982cd2
Branch: refs/heads/cassandra-3.11
Commit: d6982cd221ae6482cbe1cb796fe73d61160a89e0
Parents: 465d869
Author: An Wu <an...@andrew.cmu.edu>
Authored: Mon Mar 5 08:48:37 2018 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Mon Mar 5 08:48:37 2018 -0600
----------------------------------------------------------------------
doc/source/cql/ddl.rst | 2 +-
doc/source/cql/definitions.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6982cd2/doc/source/cql/ddl.rst
----------------------------------------------------------------------
diff --git a/doc/source/cql/ddl.rst b/doc/source/cql/ddl.rst
index be87a7d..3027775 100644
--- a/doc/source/cql/ddl.rst
+++ b/doc/source/cql/ddl.rst
@@ -374,7 +374,7 @@ then the rows (which all belong to the same partition) are all stored internally
``b`` column (the order they are displayed above). So where the partition key of the table allows to group rows on the
same replica set, the clustering columns controls how those rows are stored on the replica. That sorting allows the
retrieval of a range of rows within a partition (for instance, in the example above, ``SELECT * FROM t WHERE a = 0 AND b
-> 1 and b <= 3``) very efficient.
+> 1 and b <= 3``) to be very efficient.
.. _create-table-options:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6982cd2/doc/source/cql/definitions.rst
----------------------------------------------------------------------
diff --git a/doc/source/cql/definitions.rst b/doc/source/cql/definitions.rst
index e54bcd7..d4a5b59 100644
--- a/doc/source/cql/definitions.rst
+++ b/doc/source/cql/definitions.rst
@@ -102,7 +102,7 @@ In other words:
- A string constant is an arbitrary sequence of characters enclosed by single-quote(``'``). A single-quote
can be included by repeating it, e.g. ``'It''s raining today'``. Those are not to be confused with quoted
:ref:`identifiers` that use double-quotes. Alternatively, a string can be defined by enclosing the arbitrary sequence
- of characters by two dollar characters, in which case single-quote can be use without escaping (``$$It's raining
+ of characters by two dollar characters, in which case single-quote can be used without escaping (``$$It's raining
today$$``). That latter form is often used when defining :ref:`user-defined functions <udfs>` to avoid having to
escape single-quote characters in function body (as they are more likely to occur than ``$$``).
- Integer, float and boolean constant are defined as expected. Note however than float allows the special ``NaN`` and
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ms...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/551744a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/551744a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/551744a9
Branch: refs/heads/trunk
Commit: 551744a990022fa7c5ff76529817b05590d89b68
Parents: 2201e36 d6982cd
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Mon Mar 5 08:51:26 2018 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Mon Mar 5 08:51:26 2018 -0600
----------------------------------------------------------------------
doc/source/cql/ddl.rst | 2 +-
doc/source/cql/definitions.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/551744a9/doc/source/cql/ddl.rst
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/551744a9/doc/source/cql/definitions.rst
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: Fix CQL documentation typos
Posted by ms...@apache.org.
Fix CQL documentation typos
Patch by An Wu; Reviewed by Michael Shuler for CASSANDRA-13686
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6982cd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6982cd2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6982cd2
Branch: refs/heads/trunk
Commit: d6982cd221ae6482cbe1cb796fe73d61160a89e0
Parents: 465d869
Author: An Wu <an...@andrew.cmu.edu>
Authored: Mon Mar 5 08:48:37 2018 -0600
Committer: Michael Shuler <mi...@pbandjelly.org>
Committed: Mon Mar 5 08:48:37 2018 -0600
----------------------------------------------------------------------
doc/source/cql/ddl.rst | 2 +-
doc/source/cql/definitions.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6982cd2/doc/source/cql/ddl.rst
----------------------------------------------------------------------
diff --git a/doc/source/cql/ddl.rst b/doc/source/cql/ddl.rst
index be87a7d..3027775 100644
--- a/doc/source/cql/ddl.rst
+++ b/doc/source/cql/ddl.rst
@@ -374,7 +374,7 @@ then the rows (which all belong to the same partition) are all stored internally
``b`` column (the order they are displayed above). So where the partition key of the table allows to group rows on the
same replica set, the clustering columns controls how those rows are stored on the replica. That sorting allows the
retrieval of a range of rows within a partition (for instance, in the example above, ``SELECT * FROM t WHERE a = 0 AND b
-> 1 and b <= 3``) very efficient.
+> 1 and b <= 3``) to be very efficient.
.. _create-table-options:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6982cd2/doc/source/cql/definitions.rst
----------------------------------------------------------------------
diff --git a/doc/source/cql/definitions.rst b/doc/source/cql/definitions.rst
index e54bcd7..d4a5b59 100644
--- a/doc/source/cql/definitions.rst
+++ b/doc/source/cql/definitions.rst
@@ -102,7 +102,7 @@ In other words:
- A string constant is an arbitrary sequence of characters enclosed by single-quote(``'``). A single-quote
can be included by repeating it, e.g. ``'It''s raining today'``. Those are not to be confused with quoted
:ref:`identifiers` that use double-quotes. Alternatively, a string can be defined by enclosing the arbitrary sequence
- of characters by two dollar characters, in which case single-quote can be use without escaping (``$$It's raining
+ of characters by two dollar characters, in which case single-quote can be used without escaping (``$$It's raining
today$$``). That latter form is often used when defining :ref:`user-defined functions <udfs>` to avoid having to
escape single-quote characters in function body (as they are more likely to occur than ``$$``).
- Integer, float and boolean constant are defined as expected. Note however than float allows the special ``NaN`` and
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org