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

360 Commits

Author SHA1 Message Date
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
Tyler Hobbs fccf0b4f66 Merge branch 'cassandra-2.1' into trunk 2015-03-03 12:50:48 -06:00
Tyler Hobbs 3f6ad3c988 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-03 12:50:20 -06:00
Michael Penick 72c6ed2883 Add missing MOVED_NODE event to native protocol spec 
Patch by Michael Penick; reviewed by Tyler Hobbs for CASSANDRA-7816
 2015-03-03 12:47:41 -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
Robert Stupp e3c0186288 Add an FunctionExecutionException to the protocol 
Patch by Robert Stupp; Reviewed by Aleksey Yeschenko for CASSANDRA-8528
 2015-02-15 20:06:29 +01:00
Tyler Hobbs f61bc44a71 Merge branch 'cassandra-2.1' into trunk 2015-02-13 17:07:08 -06:00
Tyler Hobbs 7747463981 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-13 17:05:27 -06:00
Tyler Hobbs 782b0b616f Add type serialization formats to native protocol spec 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-8495
 2015-02-13 17:03:54 -06:00
Tyler Hobbs 223d0e755e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
 2015-02-06 16:47:00 -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 83f559003f Merge branch 'cassandra-2.1' into trunk 2015-02-05 02:55:26 +03: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
Christian Spriegel c6525da86e Add ReadFailureException, better TombstoneOE logging 
Patch by Christian Spriegel; reviewed by Tyler Hobbs for CASSANDRA-7886
 2015-01-09 13:30:22 -06:00
Robert Stupp dcc3bb0541 Schema change events/results for UDFs and aggregates 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7708
 2014-12-30 12:25:17 -06:00
Sylvain Lebresne 45084f182a Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/Selection.java
 2014-10-29 10:49:20 +01:00
Sylvain Lebresne 1d285eadad Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/UpdateParameters.java
 2014-10-29 10:40:51 +01:00
Sylvain Lebresne b912505562 Add protocol v4 spec document 2014-10-02 11:34:34 +02:00
Mikhail Stepura b1774b7879 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	pylib/cqlshlib/cql3handling.py
 2014-09-09 15:13:12 -07: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 fafcfc7871 Merge branch 'cassandra-2.1' into trunk 2014-07-30 17:14:09 -05:00
Tyler Hobbs ff992442ac Fix typo in v3 native protocol spec 
Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652
 2014-07-30 17:13:10 -05:00
Tyler Hobbs a09f363540 Merge branch 'cassandra-2.1' into trunk 2014-07-25 13:16:31 -05:00
Tyler Hobbs 9082281929 Use "keyspace updated" message for UDT changes in v1/2 protocols 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7617
 2014-07-25 13:15:40 -05:00
Tyler Hobbs f9e0210dbc Merge branch 'cassandra-2.1' into trunk 2014-07-23 12:08:54 -05: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 e740c29795 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-07-22 12:04:34 -05:00
Tyler Hobbs 9906a4e5de Ninja: add note about CQL2 removal to CQL2 docs 2014-07-22 12:00:24 -05:00
Tyler Hobbs 07ea172d6e Merge branch 'cassandra-2.1' into trunk 2014-07-16 15:38:30 -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 6319dc804f 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:20:08 -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
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
 2014-07-03 21:35:39 +03:00
Sylvain Lebresne 51db18cf03 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-06-20 18:34:46 +02:00
Sylvain Lebresne 2fe6de6a11 Change schema change response in native protocol v3 
patch by slebresne; reviewed by thobbs for CASSANDRA-7413
 2014-06-20 18:32:45 +02:00
Tyler Hobbs 535353cd85 Merge branch 'cassandra-2.1' into trunk 2014-06-03 17:33:20 -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 e3df7e21c6 Merge branch 'cassandra-2.1' into trunk 2014-05-29 23:00:25 +03: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
Aleksey Yeschenko 47c3dbdc0d Merge branch 'cassandra-2.1' into trunk 2014-05-29 18:10:34 +03:00
Aleksey Yeschenko a4bea74aeb Support more concurrent requests in native protocol 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7231
 2014-05-29 18:08:37 +03:00
Sylvain Lebresne 56c2f0ab11 Merge branch 'cassandra-2.1' into trunk 2014-05-29 11:36:28 +02:00
Sylvain Lebresne 0932ed670c Tuple types 
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
 2014-05-29 11:33:11 +02:00
Marcus Eriksson 1b62f3d39b Merge branch 'cassandra-2.1' into trunk 2014-05-27 10:49:25 +02: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 c4248c7c32 Merge branch 'cassandra-2.1' into trunk 2014-05-23 11:22:14 -05: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
Sylvain Lebresne d3e7787064 Merge branch 'cassandra-2.1' into trunk 2014-05-20 18:30:06 +02:00
Sylvain Lebresne db9ef0b6db Change serialization format for UDT 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7209
 2014-05-20 18:29:52 +02:00
Tyler Hobbs 94c029924d Merge branch 'cassandra-2.1' into trunk 2014-05-08 15:59:43 -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 f74063c6ea Merge branch 'cassandra-2.1' into trunk 2014-05-01 13:06:31 -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 6b4d980357 Merge branch 'cassandra-2.1' into trunk 2014-04-30 20:22:53 +02:00
Sylvain Lebresne 9872b74ef2 Native protocol v3 
patch by slebresne; reviewed by thobbs for CASSANDRA-6855
 2014-04-30 20:21:35 +02:00
Sylvain Lebresne 68aa62bde1 Merge branch 'cassandra-2.1' into trunk 2014-04-22 10:13:26 +02: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
Aleksey Yeschenko 3b14239459 Merge branch 'cassandra-2.1' into trunk 2014-04-01 04:26:04 +03:00
Sylvain Lebresne 2bb30af662 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-31 17:44:22 +02:00
Sylvain Lebresne 07dc6e1891 Add missing entry in protocol spec (#6954) 2014-03-31 17:43:41 +02:00
Tyler Hobbs 00317fc8f3 Merge branch 'cassandra-2.1' into trunk 2014-03-19 11:43:36 -05: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 96b55cecc3 Merge branch 'cassandra-2.1' into trunk 2014-03-19 11:39:13 -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 e964c0278f Merge branch 'cassandra-2.1' into trunk 2014-03-13 15:42:50 -07: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 2d92f14baa Merge branch 'cassandra-2.1' into trunk 2014-03-11 15:33:10 +03: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
Sylvain Lebresne 3f38361271 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-10 18:02:46 +01:00
Sylvain Lebresne dfd28d226a Fix CQL doc 2014-03-10 18:02:30 +01:00
Brandon Williams 30f438ff4d Merge branch 'cassandra-2.1' into trunk 2014-02-27 13:57:56 -06:00
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
Aleksey Yeschenko 2621707128 Remove CQL2 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
 2014-02-20 22:36:28 +03: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
Jason Brown 09c7dee255 ninja-correcting the the constant for LOCAL_ONE in v2 of the native_protocol doc. 2013-12-17 11:05:06 -08:00
Jason Brown 3bd65965fd Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-17 11:04:03 -08:00
Jason Brown 1b4c9b45cb ninja-correcting the the constant for LOCAL_ONE. 2013-12-17 11:02:42 -08: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
Sylvain Lebresne a999b15b88 Fix native protocol spec v2 2013-10-29 11:05:13 +01:00
Jason Brown 20d91b0ba9 add update cql-internal-only zip 2013-10-17 14:06:29 -07: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
Yuki Morishita 830507b031 Added lines for BATCH response to v2 spec 2013-08-13 14:51:03 -05: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 bfd73beaf1 DC-local CAS 
patch by slebresne; reviewed by jbellis for CASSANDRA-5797
 2013-07-26 17:29:26 +02: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 5a18e37064 Native protocol event don't respect the protocol version 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5778
 2013-07-19 17:21:40 +02:00
Sylvain Lebresne 57769f6bb5 Fix bugs in the native protocol v2 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5770
 2013-07-19 08:49:30 +02:00
Sylvain Lebresne 4c129ae7ef Add LZ4 compression to the native protocol 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5765
 2013-07-19 08:40:27 +02:00
Sylvain Lebresne b068a9c4fa Allow coordinator failover for cursors 
patch by slebresne; reviewed by iamaleskey for CASSANDRA-5714
 2013-07-02 20:49:55 +02:00
Sylvain Lebresne dad2f11aa6 Move resultset type information into prepare, not execute 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5649
 2013-07-02 20:48:01 +02:00
Aleksey Yeschenko 3455f1b76d Ninja-fix native proto spec typo (v2) 2013-06-26 00:10:57 +03:00
Aleksey Yeschenko 8db42fed09 Merge branch 'cassandra-1.2' into trunk 2013-06-26 00:10:26 +03:00
Aleksey Yeschenko 40112ec953 Ninja-fix native proto spec typo 2013-06-26 00:09:41 +03:00
Sylvain Lebresne e48ff29387 Add auto paging capability to the native protocol 
This also generalize the paging used internally, and pages CQL3 'select
count' operation to avoid OOM.

patch by slebresne; reviewed by iamaleksey for CASSANDRA-4415
 2013-06-25 10:30:12 +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 40b6c5d9c9 Ninja-remove redundant text type from native proto spec (v2) 2013-06-20 17:41:06 +03: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