Commit Graph

321 Commits

Author SHA1 Message Date
Sylvain Lebresne 33f1edcce9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 09:49:33 +01:00
Sylvain Lebresne 6e929628f6 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-30 09:49:01 +01:00
Sylvain Lebresne 83fb3cc422 Mention that named values are broken for batch (CASSANDRA-10246) in the native protocol spec 2015-10-30 09:47:45 +01:00
blerer 27304dafe7 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-13 09:56:20 +02:00
blerer 35cf8a3f82 Add smallint and tinyint to the CQL documentation
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10372
2015-10-13 09:54:02 +02:00
Sylvain Lebresne b99c863158 Implement backward compatibility for paging states
Pre-3.0 nodes serialize a full cellname in the paging state, but doing
so is wasteful for 3.0 nodes. We can't however guarantee to which nodes
a particular paging state will be sent so we need to have a backward
compatibility.

The patch preserve the pre-existing format for the paging state (thus
requiring more work for 3.0 nodes) for the native protocol v3, but
change to a more efficient (for 3.0) format for the protocol v4. It is
then documented that paging states  shouldn't be used across protocol
versions.
2015-09-18 13:01:59 +02:00
blerer 90661a3259 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-17 22:17:40 +02:00
blerer eecfb07d46 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-17 22:13:49 +02:00
blerer 4e3555c1d9 Make "truncate table X" an alias for "truncate X"
patch by Benjamin Lerer; reviewed by Robert Stupp  for CASSANDRA-9585
2015-09-17 22:02:45 +02:00
blerer 0d4e0cd226 Merge branch cassandra-2.2 into cassandra-3.0 2015-09-16 10:34:00 +02:00
blerer e7c2952d31 Merge branch cassandra-2.1 into cassandra-2.2 2015-09-16 10:21:58 +02:00
Paulo Motta 3b46e5bda6 Document post-2.1 caching table options syntax
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9964
2015-09-16 10:11:47 +02:00
blerer 8439e74e6f Drop support for protocol v1 and v2
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10146
2015-09-10 22:05:20 +02:00
blerer 2e3727e3ff Allow range deletions in CQL
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-6237
2015-09-04 21:10:29 +02:00
Marcus Eriksson df52cd64ed Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-20 18:16:06 +02:00
Marcus Eriksson a6dd2b8934 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-20 18:15:55 +02:00
Marcus Eriksson df9e798de6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-08-20 18:15:43 +02:00
Marcus Eriksson 500c035d21 Update CQL docs with DateTieredCompactionStrategy
Patch by marcuse; reviewed by yukim for CASSANDRA-8199
2015-08-20 18:14:41 +02:00
T Jake Luciani 3c43775c75 Revert "Revert "Materialized Views""
This reverts commit 24d185d72b.
2015-07-29 18:29:32 -04:00
Jonathan Ellis 24d185d72b Revert "Materialized Views"
This reverts commit 3bdcaa336a.
2015-07-29 17:03:52 -05:00
Carl Yeksigian 3bdcaa336a Materialized Views
patch by carl; reviewed by jmckenzie for CASSANDRA-6477
2015-07-29 16:15:53 -04:00
Robert Stupp 030762aa29 Merge branch 'cassandra-2.2' into trunk 2015-07-18 17:54:00 +02:00
Christopher Batey e651fdd5f6 UDF / UDA execution time in trace
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-9723
2015-07-18 17:51:00 +02:00
blerer 689582c044 Merge 'cassandra-2.2' into trunk
Conflicts:
	test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
2015-07-16 23:02:47 +02:00
blerer 2b99b5d354 Allow the selection of columns together with aggregates
Patch by Benjamin Lerer; reviewed by Robert Stupp for
CASSANDRA-9767
2015-07-16 22:51:40 +02:00
blerer 056115fff9 Change CREATE/ALTER TABLE syntax for compression
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-8384
2015-07-12 17:58:49 +03:00
Robert Stupp fc202a756e Revert CASSANDRA-9542 (allow native functions in UDA)
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9771
2015-07-12 10:51:25 +02:00
Tyler Hobbs 136ffeda73 Clarify CQL literal handling of JSON in CQL3 docs 2015-07-09 11:54:11 -05:00
Christoher Batey fe07092361 Fix broken CQL.textile and "ant generate-cql-html"
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-9725
2015-07-06 20:58:09 +07:00
Sylvain Lebresne c1e7643aa6 Udpate CQL version for 2.2
patch by blerer; reviewed by slebresne for CASSANDRA-9680
2015-06-30 13:32:10 +02:00
Adam Holmberg 6e1bdeb142 Update keyword list in CQL documenation
Patch by Adam Holmberg; reviewed by Benjamin Lerer for CASSANDRA-9503
2015-06-23 11:24:46 -05:00
Robert Stupp d6312c5f4d Allow native functions in user-defined aggregates
patch by Robert Stupp; reviewed by Aleksey Yeschenko CASSANDRA-9542
2015-06-22 17:19:20 +02:00
Tyler Hobbs 84136cefde Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-16 12:32:42 -05:00
Tyler Hobbs 8934a0298e Fix identifier regex in CQL documentation
The regex was correct, but for some reason it wasn't generating the
correct HTML.
2015-06-16 12:31:43 -05:00
Tyler Hobbs a5be8f1991 Add collections, tuple, and UDT to JSON type documentation
These were accidentally omitted when the docs were first written for
CASSANDRA-7970.
2015-06-12 13:39:44 -05:00
Benjamin Lerer c08aaabd95 Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf
patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-9229
2015-06-11 10:18:05 +02:00
Sam Tunnicliffe 94a68a17c7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 18:24:40 +01:00
Sam Tunnicliffe 14a332470c Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2015-06-01 18:12:50 +01:00
Sam Tunnicliffe 63819cbee3 Update CQL docs with auth and DCL info
Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-7558
2015-06-01 18:08:31 +01:00
Christopher Batey 860141229a Example UDFs don't work
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-9480
2015-05-27 17:55:14 +02:00
Robert Stupp e4eba25382 Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-9429
2015-05-20 08:48:53 +02:00
Tyler Hobbs d085ebb4cb Change 3.0 => 2.2 in CQL3 documentation 2015-05-19 11:48:58 -05:00
Josh McKenzie 63f5967271 Commit 9214 on 2.2 branch 2015-05-15 14:13:17 -05:00
Robert Stupp 1937bed903 Better support of null for UDF
patch by Ronbert Stupp; reviewed by Benjamin Lerer for CASSANDRA-8374
2015-05-15 19:34:32 +02:00
Benjamin Lerer 35a945e2bf Add smallint and tinyint data types
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-8951
2015-05-15 17:43:57 +03:00
Carl Yeksigian b2abcb7fc9 Remove DETERMINISTIC/NON DETERMINISTIC function distinction
patch by Carl Yeksigian; reviewed by Aleksey Yeschenko for
CASSANDRA-9383
2015-05-14 21:02:23 +03:00
Carl Yeksigian 68722e7e59 Add client warnings to native protocol v4
patch by Carl Yeksigan; reviewed by Tyler Hobbs and Aleksey Yeschenko
for CASSANDRA-8930
2015-05-14 17:24:57 +03:00
Tyler Hobbs 68b2d28580 Merge branch 'cassandra-2.1' into trunk 2015-05-12 16:25:07 -05:00
Tyler Hobbs 75e5b3b55a Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-12 16:23:32 -05:00
Tyler Hobbs 28cfbfa685 Add missing type for <blockfor> in protocol specs 2015-05-12 16:21:58 -05:00