natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,674 Commits 17 Branches 338 Tags 665 MiB
Commit Graph

227 Commits

Author SHA1 Message Date
Benjamin Lerer e017f94948 Allow to remove TTLs on table with default_time_to_live 
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11207
 2016-03-07 15:01:17 +01:00
Marcus Eriksson 9adc6d8209 Merge branch 'cassandra-3.0' into trunk 2016-02-09 07:16:00 +01:00
Marcus Eriksson a598ebeef4 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-09 07:15:40 +01:00
Marcus Eriksson c08aaf69b4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-09 07:14:00 +01:00
Marcus Eriksson b8408f068b Make it clear what timestamp_resolution is used for 
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
 2016-02-09 07:08:22 +01:00
Benjamin Lerer 83064bfd58 Merge branch cassandra-3.0 into cassandra-3.3 2016-01-21 12:03:45 +01:00
Tyler Hobbs 7226718957 Update CQL documentation (CASSANDRA-10899) 
patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-10899
 2016-01-21 11:57:35 +01:00
Sylvain Lebresne a6170ef802 Merge branch 'cassandra-3.0' into cassandra-3.3 2016-01-18 11:27:55 +01:00
Sylvain Lebresne a3360afa81 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-01-18 11:27:40 +01:00
Sylvain Lebresne 79b9492363 Add warning regarding quoted identifiers in CQL doc 2016-01-18 11:27:24 +01:00
Tyler Hobbs 5f83f6c298 Merge branch 'cassandra-3.0' into trunk 2015-12-31 15:33:31 -06:00
Tyler Hobbs 4d0f1405cb Fix MV doc formatting in CQL.textile 2015-12-31 15:33:08 -06:00
Sylvain Lebresne 72094a41c2 Merge branch 'cassandra-3.0' into trunk 2015-12-22 12:28:24 +01:00
Sylvain Lebresne 4e5867affc Bump CQL version for 3.0 (CASSANDRA-10921) 2015-12-22 12:26:51 +01:00
Sylvain Lebresne 7950d80330 Merge branch 'cassandra-3.0' into trunk 2015-12-22 11:55:46 +01:00
Sylvain Lebresne 450fca99df Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-22 11:54:21 +01:00
Sylvain Lebresne e654c1bf04 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-22 11:53:40 +01:00
Sylvain Lebresne e438831377 Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701) 2015-12-22 11:52:36 +01:00
Robert Stupp b3ff132438 Merge branch 'cassandra-3.1' into trunk 2015-11-27 09:21:49 +01:00
Robert Stupp 489d6474cc Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 09:21:25 +01:00
Robert Stupp 53e777a295 CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC 
patch by Robert Stupp; reviewed by Sylvain Lebresne for CASSANDRA-10747
 2015-11-27 09:19:28 +01:00
blerer 269c5d4f85 Add support for type casting in selection clause 
patch by Benjamin Lerer; reviewed by Robert Stupp for (CASSANDRA-10310)
 2015-11-16 15:08:09 +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
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 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
Tyler Hobbs d085ebb4cb Change 3.0 => 2.2 in CQL3 documentation 2015-05-19 11:48:58 -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
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
Joshua McKenzie 7f29201ce2 Revert "Add date and time types" on 2.1 branch 
This reverts commit 107545b392.

Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cqlsh
	pylib/cqlshlib/test/test_keyspace_init.cql
 2015-04-21 08:42:31 -05:00
Tyler Hobbs c7b02d1a6d Add SELECT/INSERT JSON support, toJson(), fromJson() 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne and Robert Stupp for
CASSANDRA-7970
 2015-04-01 12:42:01 -05:00
Joshua McKenzie 3d11ec5dd3 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2015-03-09 12:26:24 -05:00
Joshua McKenzie 107545b392 Add date and time types 
Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523
 2015-03-09 12:20:28 -05:00
Tyler Hobbs 56e190b1cd Merge branch 'cassandra-2.1' into trunk 2015-03-05 12:54:58 -06:00
Tyler Hobbs 59ed491ac8 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-05 12:54:40 -06:00
Jon Åslund d04602d3da Fix link to CREATE KEYSPACE in CQL3 docs 
Patch by Jon Åslund; reviewed by Tyler Hobbs
 2015-03-05 12:54:01 -06:00
Tyler Hobbs b533135333 Merge branch 'cassandra-2.1' into trunk 2015-03-03 14:03:07 -06:00
Tyler Hobbs f6d82a55fb Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-03 14:02:47 -06:00
Tyler Hobbs 6ee0c757c3 Document bind markers for TIMESTAMP, TLL, and LIMIT 
Patch by Tyler Hobbs for CASSANDRA-8889
 2015-03-03 14:01:43 -06:00
Robert Stupp 93ebff33b0 Update CQL docs for UDFs and aggregates 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7737
 2015-02-18 14:00:35 -06:00
Tyler Hobbs 1512264703 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-06 16:38:06 -06:00
Tyler Hobbs 08deff70a0 Clarify default timestamp in CQL docs 
Patch by Tyler Hobbs for CASSANDRA-8538
 2015-02-06 16:37:45 -06:00
Aleksey Yeschenko 90144989fe Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-05 02:54:32 +03:00
Jon Haddad 1467b9f787 Add default_time_to_live details to CQL 3 documentation 
patch by Jon Haddad; reviewed by Aleksey Yeschenko for CASSANDRA-8742
 2015-02-05 02:52:33 +03:00
Mikhail Stepura 1456ec8318 (cqlsh) tab completion for triggers 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7824
 2014-09-09 15:03:57 -07:00
Tyler Hobbs 4cdfa85156 Ninja: fix index name spec for CREATE INDEX in CQL docs 
Follow-up for CASSANDRA-7527
 2014-07-23 12:05:00 -05:00
Tyler Hobbs 6b988fddd0 Ninja: fix grammar for tuple type in CQL docs 
Follow up for CASSANDRA-7527
 2014-07-16 15:36:58 -05:00
Tyler Hobbs e60b4e6d1d Bump CQL version to 3.2.0 and update CQL docs 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
 2014-07-15 18:18:15 -05:00
Tyler Hobbs 6a4144b418 Add optional keyspace to DROP INDEX statement 
Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
 2014-06-03 17:32:17 -05:00
Aleksey Yeschenko a8d18c9c19 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-29 23:00:03 +03:00
Aleksey Yeschenko 7216639e51 Add conditional CREATE/DROP USER support 
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7264
 2014-05-29 22:55:38 +03:00
Marcus Eriksson 86b6ec5299 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
 2014-05-27 10:43:50 +02:00
Marcus Eriksson 367c741931 Add option to do more aggressive tombstone compaction. 
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
 2014-05-27 10:39:17 +02:00
Tyler Hobbs 0b9b1fca0a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-23 11:21:01 -05:00
Tyler Hobbs 926f639a53 Bump CQL version to 3.1.7, update CQL docs 
Follow up for CASSANDRA-6875
 2014-05-23 11:20:10 -05:00
Tyler Hobbs a89fd4d1d6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-08 15:59:03 -05:00
Tyler Hobbs 46f7f84cea Ninja: add missing "enabled" option to compaction options docs 
Done for CASSANDRA-7185
 2014-05-08 15:57:35 -05:00
Tyler Hobbs 1491f75dd6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-01 13:05:52 -05:00
Tyler Hobbs 427fdd476a Document lack of order guarantees for BATCH statements 
Patch by Tyler Hobbs, reviewed by Sylvain Lebresnse and Alex Popescu for
CASSANDRA-7123
 2014-05-01 13:03:56 -05:00
Sylvain Lebresne 3e6b299256 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-04-22 10:12:47 +02:00
Sylvain Lebresne 48d7e40808 Fix CQL version number for CASSANDRA-7055 2014-04-22 10:12:19 +02:00
Tyler Hobbs 2a2141ce65 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-19 11:42:45 -05:00
Tyler Hobbs c80f61b682 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-03-19 11:40:40 -05:00
Jonathan Ellis a45fea8fc6 merge from 2.0 2014-03-19 11:38:54 -05:00
Carl Yeksigian 32c15c2fb0 Add uuid() function 
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
 2014-03-19 11:38:26 -05:00
Tyler Hobbs 7e870018dc Add UNLOGGED, COUNTER options to BATCH docs 
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
 2014-03-19 11:37:09 -05:00
Mikhail Stepura d227aa0ec3 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-13 15:42:39 -07:00
Mikhail Stepura bed60fb6e5 Ninja-commit for "Add LZ4Compressor in CQL document" CASSANDRA-6331 2014-03-13 15:41:48 -07:00
Aleksey Yeschenko 362148dd23 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/service/StorageProxy.java
 2014-03-11 15:20:45 +03:00