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

225 Commits

Author SHA1 Message Date
Brandon Williams 7e9cdff968 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-27 13:57:48 -06:00
Brandon Williams 33c75e92ee Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-27 13:57:28 -06:00
Sylvain Lebresne 034ac7d0fc Document that TTL <= 0 means no TTL 2014-02-25 09:54:11 +01:00
Sylvain Lebresne 63b1ef4eeb Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/config/ColumnDefinition.java
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/Constants.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/Lists.java
	src/java/org/apache/cassandra/cql3/Maps.java
	src/java/org/apache/cassandra/cql3/Operation.java
	src/java/org/apache/cassandra/cql3/Sets.java
	src/java/org/apache/cassandra/cql3/functions/TokenFct.java
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/filter/ColumnSlice.java
	src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
	src/java/org/apache/cassandra/thrift/ThriftValidation.java
 2014-02-20 17:51:13 +01:00
Sylvain Lebresne b09d876914 Add static columns in CQL3 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6561
 2014-02-20 10:15:02 +01:00
Sylvain Lebresne 4c727f6f97 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java
	src/java/org/apache/cassandra/cql3/ColumnNameBuilder.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
 2014-02-17 15:02:44 +01:00
Sylvain Lebresne 652ec6a5c3 CQL3: improve support for paginating over composites 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-4851
 2014-02-17 10:30:29 +01:00
Sylvain Lebresne 58d1a4f816 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	CHANGES.txt
 2014-02-05 16:38:18 +01:00
Sylvain Lebresne 49bb972c6f Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
 2014-02-05 16:36:50 +01:00
Sylvain Lebresne 16efdf4a03 Remove/update invalid sentences in CQL doc 2014-02-05 16:32:24 +01:00
Jason Brown d8e9bf172f Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
 2014-01-31 05:46:23 -08:00
Sylvain Lebresne 9d70cf3b90 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	.rat-excludes
	build.xml
	debian/changelog
 2014-01-31 13:25:45 +01:00
Sylvain Lebresne 4cb045a589 Improve CQL3 documentation section on COMPACT STORAGE (CASSANDRA-6642) 2014-01-31 12:58:16 +01:00
Aleksey Yeschenko 714c423360 New counters implementation 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
 2014-01-27 16:37:41 -06:00
Aleksey Yeschenko 5fa6055107 Allow specifying custom secondary index options in CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6480
 2014-01-07 18:03:37 +03:00
Aleksey Yeschenko 21bb531460 Update docs, bump CQL3 version, correct CHANGES.txt for CASSANDRA-6395 2013-12-18 22:07:13 +03:00
Yuki Morishita 1a80a438ce Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
 2013-12-02 12:49:31 -06:00
Sylvain Lebresne c63d068af8 Add warning on collection limitations in CQL doc 2013-12-02 11:23:13 +01:00
Aleksey Yeschenko 6c68b30fef Merge branch 'cassandra-1.2' into cassandra-2.0 2013-11-26 02:30:00 +03:00
Aleksey Yeschenko fce1735324 Ninja-fix CQL3 doc 2013-11-26 02:29:30 +03:00
Sylvain Lebresne 08f2e9797f Support NaN and Infinity as float constants 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6003
 2013-11-21 09:53:00 +01:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jason Brown c9528f9c9c apply local_one changes to 2.0 2013-10-16 15:44:33 -07:00
Aleksey Yeschenko f2eaf9a13e Fix CQL3 doc typos 2013-09-25 15:15:37 +03:00
Sylvain Lebresne 37e9bce381 Support named bind variables in CQL 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6033
 2013-09-19 12:57:48 +02:00
Jonathan Ellis 2648047a44 merge from 1.2 2013-09-18 12:44:31 -05:00
Sylvain Lebresne d28cf3eabd Fix CQL doc imprecision 2013-09-18 17:53:29 +02:00
Sylvain Lebresne e93578b3bd Support variadic parameters for IN clauses 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-4210
 2013-09-18 17:51:17 +02:00
Sylvain Lebresne 12671160bd Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-05 16:37:08 +02:00
Sylvain Lebresne 1f6844261a Rename clustering keys to clustering columns in doc 2013-09-05 16:35:18 +02:00
Aleksey Yeschenko b362aebd30 Add ability for CQL3 to list partition keys 
patch by Aleksey Yeschenko and Dan Jatnieks;
reviewed by Sylvain Lebresne for CASSANDRA-4536
 2013-08-21 19:09:58 +03:00
Sylvain Lebresne cd47182458 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 12:15:59 +02:00
Sylvain Lebresne 55fed339cb CQL3 documentation fixes (#5878) 2013-08-21 12:15:14 +02:00
Aleksey Yeschenko 298e91df73 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-10 02:42:25 +02:00
Aleksey Yeschenko 2a8379372e Correct timestamp formatting in CQL3 doc 2013-08-10 02:41:58 +02:00
Aleksey Yeschenko e22025e09f Merge branch 'cassandra-1.2' into trunk 2013-07-26 20:41:39 +03:00
Aleksey Yeschenko 91cd6538e9 Tiny CQL3 doc tweak 2013-07-26 20:41:11 +03:00
Aleksey Yeschenko 1be575da06 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
 2013-07-26 20:37:43 +03:00
Aleksey Yeschenko dc457c5ebc Allow empty IN relations in SELECT/UPDATE/DELETE statements 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5626
 2013-07-26 20:04:02 +03:00
Sylvain Lebresne 283b1a33b4 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	build.xml
	debian/changelog
 2013-07-23 19:00:36 +02:00
Sylvain Lebresne 66bd60590a Document multiline comments 2013-07-23 18:59:43 +02:00
Sylvain Lebresne db70bbe414 Add CAS to the CQL doc 2013-07-23 18:41:32 +02:00
Sylvain Lebresne b73f9d4231 Conditional create/drop ks/table/index statements 
patch by michalm; reviewed by slebresne for CASSANDRA-2737
 2013-06-21 12:02:25 +02:00
Jonathan Ellis b9de5de235 merge from 1.2 2013-06-20 13:56:04 -05:00
Sylvain Lebresne 41f418a09e Never allow partition range queries in CQL3 without token() 
patch by slebresne; reviewed by jbellis for CASSANDRA-5666
 2013-06-20 19:10:24 +02:00
Aleksey Yeschenko 7edd0e0c7e Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
 2013-06-18 17:29:23 +03:00
Aleksey Yeschenko 2397bc8c33 Updated CREATE CUSTOM INDEX syntax 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5639
 2013-06-18 17:20:59 +03:00
Sylvain Lebresne 72ca5e6bfb Fix typo in CQL doc 2013-06-06 13:59:14 -05:00
Sylvain Lebresne 6850cdc3ed Fix typo in CQL doc 2013-06-06 12:16:28 +02:00
Aleksey Yeschenko 5e558cd01d Ninja-fix CQL3 version in CQL.textile 2013-05-15 17:55:33 +03:00
Aleksey Yeschenko c8df27b864 Merge branch 'cassandra-1.2' into trunk 2013-05-15 17:54:50 +03:00
Aleksey Yeschenko 8986e8f9f5 Ninja-fix CQL3 version in CQL.textile 2013-05-15 17:53:32 +03:00
Aleksey Yeschenko 08df0b8604 Add alias support to SELECT statement 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5075
 2013-05-06 23:11:52 +03:00
Aleksey Yeschenko b505b90a88 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	NEWS.txt
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
 2013-05-03 19:38:41 +03:00
Aleksey Yeschenko 64c0d1e7d5 Add custom secondary index support to CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5484
 2013-05-03 17:59:33 +03:00
Aleksey Yeschenko 883c34b7c5 Reenable ALTER TABLE DROP with new semantics 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-3919
 2013-04-17 17:30:38 +03:00
Sylvain Lebresne 31e669ab42 CQL3 refactor to allow conversion function 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5226
 2013-02-08 18:45:22 +01:00
Sylvain Lebresne b251e7aec0 Deprecate but keep strings-as-blob support for now for compatibility sake 2013-02-04 10:44:30 +01:00
Sylvain Lebresne a67f77922a Improve CQL3 type validation 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5198
 2013-01-31 12:19:51 +01:00
Sylvain Lebresne 4df6136d42 Add ALLOW FILTERING to CQL3 documentation 2013-01-31 11:36:24 +01:00
Sylvain Lebresne 9717002498 Add missing mention of 4927 in CQL3 changelog 2013-01-18 14:38:50 +01:00
Sylvain Lebresne 07ebbe552a Support E notation for floating point numbers 
patch by michalm; reviewed by slebresne for CASSANDRA-4927
 2013-01-18 14:35:23 +01:00
Sylvain Lebresne 8be7e5c0eb Fix interpreting dates as valid timeuuid and introduce new methods to work with timeuuid 
patch by slebresne; reviewed by thobbs for CASSANDRA-4936
 2013-01-18 13:56:32 +01:00
Sylvain Lebresne b36a8081c0 Fix CQL3 doc 2013-01-09 17:02:34 +01:00
Sylvain Lebresne 0804de9d46 Minor CQL3 doc fixes 2013-01-02 16:23:48 +01:00
Sylvain Lebresne 64bc3354d3 Document that list append/prepend are not idempotent and should be used with care 2012-11-23 15:36:34 +01:00
Jonathan Ellis 6cdbb2d7b1 fix WITH compaction_strategy -> WITH compaction 
patch by jbellis for CASSANDRA-4968
 2012-11-18 21:19:46 +01:00
Sylvain Lebresne f8b939ab0d Remove ALTER TABLE DROP until #3919 is resolved 2012-11-16 12:33:16 +01:00
Sylvain Lebresne a6c3481525 update CQL3 doc for collections & ttls 2012-11-14 10:38:45 +01:00
Sylvain Lebresne 929b26ecfe Add composite partition keys support to CQL3 doc 2012-11-06 15:20:58 +01:00
Sylvain Lebresne 3b425b5911 Update CQL3 documentation 
patch by urandom; reviewed by slebresne for CASSANDRA-4879
 2012-11-06 15:08:54 +01:00
Sylvain Lebresne c6ddbea438 Add inet support in binary protocol 
patch by slebresne; reviewed by thepaul for CASSANDRA-4627
 2012-09-11 12:10:27 +02:00
Sylvain Lebresne 4a002a5792 Minor edit to CQL3 doc 2012-07-16 19:24:03 +02:00
Sylvain Lebresne fffccd64a3 Fix typo in CQL3 documentation 2012-06-29 13:53:11 +02:00
Sylvain Lebresne e4ce6b3024 Add CQL3 documentation 2012-06-12 14:59:12 +02:00