Commit Graph

91 Commits

Author SHA1 Message Date
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
2014-05-21 13:27:55 -07:00
Mikhail Stepura 355e69b7ff Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-05-08 13:45:22 -07:00
Mikhail Stepura a626c6dcbc CQLSH: adjusted compaction_strategy_options with the latest docs
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7185
2014-05-08 13:43:42 -07:00
Mikhail Stepura 477a0a28b5 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-04-18 18:13:45 -07:00
Mikhail Stepura 167af2b252 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
	bin/cqlsh
	pylib/cqlshlib/cql3handling.py
2014-04-18 18:10:44 -07:00
Mikhail Stepura 13d3a47461 cqlsh: Updated CQL3 parser to support functions and BLOB literals
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7018
2014-04-18 18:01:41 -07:00
Mikhail Stepura fab5509898 Minor tweaks for 'caching' option 2014-03-13 10:06:56 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
2014-03-12 15:02:14 -07:00
Marcus Eriksson da444a6903 Update syntax for changing caching options.
Patch by marcuse, reviewed by slebresne for CASSANDRA-6745.
2014-03-12 14:06:05 +01:00
Mikhail Stepura e2a719ad0d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-04 11:51:38 -08:00
Mikhail Stepura b07f4b8c77 Handle static columns in cqlsh.
Patch by Mikhail Stepura for CASSANDRA-6703; reviewed by Aleksey Yeschenko
2014-03-04 11:47:58 -08:00
Mikhail Stepura 0508a155e5 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-21 15:39:59 -08:00
Mikhail Stepura 50e544f282 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-21 15:39:34 -08:00
Mikhail Stepura dceca93b79 Completer shall always return a collection 2014-02-21 15:38:49 -08:00
Mikhail Stepura e5199eeac1 User types support for cqlsh.
Patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-6305
2014-02-14 10:55:32 -08:00
Aleksey Yeschenko ee477cc4dd Replace index_interval with min/max_index_interval
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6379
2014-02-14 01:34:47 +03:00
Marcus Eriksson ab6eaed8f6 Make it possible to cache a configurable amount of rows in row cache.
Patch by pcmanus and marcuse, reviewed by pcmanus for CASSANDRA-5357
2014-02-06 10:08:55 +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 941cd456ae cqlsh: add SHOW SESSION <tracing-session> command
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6228
2013-10-23 22:35:14 +08:00
Aleksey Yeschenko 12413ad1f8 Backport CASSANDRA-6196 to 1.2
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
2013-10-22 14:22:13 +08:00
Aleksey Yeschenko c4c8bca8d5 cqlsh: fix CREATE/ALTER WITH completion
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
2013-10-22 03:14:24 +08:00
Aleksey Yeschenko 20f1b816b3 cqlsh: ignore empty 'value alias' in DESCRIBE
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6139
2013-10-21 23:14:37 +08:00
Yuki Morishita 88944ffcd8 Allow alter keyspace on system_traces
patch by yukim; reviewed by jbellis for CASSANDRA-6016
2013-10-02 10:06:53 -05:00
Aleksey Yeschenko f31c668f26 Merge branch 'cassandra-2.0.0' into cassandra-2.0 2013-08-24 03:27:16 +03:00
Aleksey Yeschenko 9a42e28d9f Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
	src/java/org/apache/cassandra/cql3/Cql.g
2013-08-24 03:26:51 +03:00
Aleksey Yeschenko 17186d8254 Correct minor CQL3 grammar rules (USING) 2013-08-24 03:21:52 +03: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
Aleksey Yeschenko 0ad0031fd8 Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
	CHANGES.txt
	bin/cqlsh
2013-08-16 21:50:18 +03:00
Aleksey Yeschenko 41409770d4 cqlsh: add support for multiline comments
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5798
2013-08-16 21:46:42 +03:00
Aleksey Yeschenko 703bd684ca Fix (some) 2i on composite components omissions
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5851
2013-08-12 12:55:56 +02:00
Aleksey Yeschenko 1c606bb8af Merge branch 'cassandra-1.2' into cassandra-2.0.0
Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
2013-08-12 12:39:46 +02:00
Aleksey Yeschenko cb0a0cd2f8 Remove the vestiges of default_{read,write}_consistency 2013-08-12 12:36:43 +02:00
Aleksey Yeschenko 2bcfab03c6 Drop CQL3 obsolete keywords support in CREATE 2013-08-09 17:51:53 +02:00
Aleksey Yeschenko 3828cc5195 Merge branch 'cassandra-1.2' into trunk
Conflicts:
	bin/cqlsh
2013-07-15 18:38:16 +03:00
Aleksey Yeschenko f79a2d3a6f cqlsh: handle CUSTOM 2i in DESCRIBE output
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5760
2013-07-15 18:35:33 +03:00
Aleksey Yeschenko 62b90340d6 cqlsh: add missing table options to DESCRIBE output
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5749
2013-07-15 13:48:09 +03:00
Aleksey Yeschenko 36a661394e Merge branch 'cassandra-1.2' into trunk 2013-07-08 23:34:44 +03:00
Aleksey Yeschenko 61772d3d7b cqlsh: support the new TimestampType
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5729
2013-07-08 23:08:19 +03:00
Aleksey Yeschenko c1d71213bd cqlsh: fix handling of semicolons inside BATCH queries
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5697
2013-07-08 22:57:35 +03:00
Aleksey Yeschenko 6258c58cdb Merge branch 'cassandra-1.2' into trunk
Conflicts:
	pylib/cqlshlib/helptopics.py
2013-06-26 20:50:22 +03:00
Aleksey Yeschenko b97b490dff cqlsh: Add ALTER TABLE RENAME autocompletion and docs 2013-06-26 20:41:38 +03: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
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
Aleksey Yeschenko 7f6ac19efb cqlsh: drop CQL2/CQL3-beta support
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5585
2013-05-22 00:47:44 +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 5917281000 Merge branch 'cassandra-1.2' into trunk
Conflicts:
	bin/cqlsh
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
2013-05-01 20:03:26 +03:00