Commit Graph

280 Commits

Author SHA1 Message Date
Stefania ae5108645f BATCH statement is broken in cqlsh
patch by Stefania; reviewed by Robert Stupp for CASSANDRA-10272
2015-09-13 11:33:14 +02:00
Sylvain Lebresne 30f39a2312 Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
2015-09-11 16:48:43 +02:00
Philip Thompson 72f2cc4b17 Make cqlsh PEP8 compliant (and other cleanups) - 2.2 patch
patch by philipthompson; reviewed by Stefania for CASSANDRA-10066
2015-09-11 16:47:18 +02:00
Philip Thompson 9faa193e9a Make cqlsh PEP8 compliant (and other cleanups)
patch by philipthompson; reviewed by Stefania for CASSANDRA-10066
2015-09-11 16:44:09 +02:00
Tyler Hobbs 65ee15f98b Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/cql3handling.py
2015-08-25 10:03:22 -05:00
Tyler Hobbs 134bcda0cd Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/cql3handling.py
2015-08-25 09:57:18 -05:00
Stefania Alborghetti 386f197da3 cqlsh: use python driver for CQL keyword list
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-9232
2015-08-25 09:54:16 -05:00
Marcus Eriksson 6f0c12f3a4 Add option to only purge tombstones from repaired sstables
Patch by marcuse; reviewed by yukim for CASSANDRA-6434
2015-08-11 08:25:55 +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
Aleksey Yeschenko 7d6c876ec9 Move schema tables to the new system_schema keyspace
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-6717
2015-07-10 15:28:37 +03:00
Tyler Hobbs 239927d324 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-26 13:43:15 -05:00
Tyler Hobbs d5698f4ef5 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-06-26 13:32:17 -05:00
Alex Buck 5aaa5cad6e cqlsh: Add min_threshold to DTCS autocomplete options
Patch by Alex Buck; reviewed by Tyler Hobbs for CASSANDRA-9385
2015-06-26 13:29:51 -05:00
Robert Stupp cfab9dac19 Update cqlsh for UDFs
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7556
2015-06-23 19:19:57 +02:00
Stefania Alborghetti 33d71b825f (cqlsh) Add support for native protocol 4
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9399
2015-05-22 00:47:27 +03: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
Sam Tunnicliffe cb5897f3cb User/role permissions for UDFs
Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-7557
2015-04-14 12:46:40 -05:00
Jim Witschey 23e77f10a4 Update cqlsh tests for latest trunk
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9173
2015-04-14 11:39:33 -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
Sam Tunnicliffe 2f3fd416fa Make syntax for Role options consistent with other statements
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8850
2015-03-11 02:43:42 -07: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
Marcus Eriksson 33a9adac8e Remove cold_reads_to_omit from STCS
Patch by marcuse; reviewed by thobbs for CASSANDRA-8860
2015-03-04 09:09:18 +01:00
Marcus Eriksson b5b1af7036 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	NEWS.txt
	test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
2015-03-04 09:08:04 +01:00
Marcus Eriksson f6d0cf395f Remove cold_reads_to_omit from STCS
Patch by marcuse; reviewed by thobbs for CASSANDRA-8860
2015-03-04 08:42:34 +01:00
Sam Tunnicliffe ee5e487955 Make = optional in CREATE/ALTER ROLE statements 2015-02-20 14:43:54 -08:00
Tyler Hobbs 187624b114 Merge branch 'cassandra-2.1' into trunk 2015-02-10 13:21:37 -06:00
Tyler Hobbs ad91d41628 nija: fix cqlsh completion for full() collection indexes 2015-02-10 13:20:51 -06:00
Sam Tunnicliffe 217721ae95 Add new Role management permissions
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8650
2015-02-06 03:40:12 +03:00
Tyler Hobbs 296d11b985 Merge branch 'cassandra-2.1' into trunk 2015-02-04 11:27:17 -06:00
Tyler Hobbs bcfb652b1a Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/cql3handling.py
2015-02-04 11:26:55 -06:00
Prajakta Bhosale 0f5ab577bc Add support for UPDATE ... IF EXISTS
Patch by Prajakta Bhosale; reviewed by Tyler Hobbs for CASSANDRA-8610
2015-02-04 11:23:41 -06:00
Sam Tunnicliffe 879b694d34 Introduce role based access control
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7653
2015-01-14 22:48:39 +03:00
Tyler Hobbs 34f9c97a5e Merge branch 'cassandra-2.1' into trunk 2015-01-07 13:36:12 -06:00
blerer 68be72fdc6 Fix case-sensitivity of index name on CREATE/DROP INDEX
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8365
2015-01-07 13:35:20 -06:00
Samuel Klock 3f55c35b8c Support indexing key/value entries in map collections
Patch by Samuel Klock; reviewed by Tyler Hobbs for CASSANDRA-8473
2014-12-18 17:30:26 -06:00
Robert Stupp e2f35c767e Support for user-defined aggregate functions
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-8053
2014-12-11 11:46:28 -06:00
Robert Stupp b4d7f3bed0 Deal with conflicts between system functions and UDFs
patch by Robert Stupp; reviewed by Benjamin Lerer for CASSANDRA-7813
2014-11-14 18:20:29 +03:00
blerer 4ff6e7dfff Fix aggregation fn on empty selection, column names
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8229
2014-11-13 11:34:39 -06:00
Tyler Hobbs fb4356a36a Merge branch 'cassandra-2.1' into trunk
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/TypeParser.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
2014-11-11 13:33:31 -06:00
Tyler Hobbs ee55f361b7 Support for frozen collections
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
2014-11-11 12:40:48 -06:00
Mikhail Stepura 8856934fc8 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	pylib/cqlshlib/cql3handling.py
2014-11-05 15:37:43 -08:00
Philip Thompson 8515029020 (cqlsh) SELECT ... TOKEN() function broken in C* 2.1.1
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8258
2014-11-05 15:31:10 -08:00
Tyler Hobbs 525ac00c0f Merge branch 'cassandra-2.1' into trunk
Conflicts:
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/db/CleanupTest.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
	test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java
2014-11-04 10:39:36 -06:00
blerer 52a701f295 Fix issues w/ CONTAINS (KEY) queries on 2ary indexes
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
2014-11-04 10:16:57 -06:00
Marcus Eriksson 175d34777b Merge branch 'cassandra-2.1' into trunk 2014-10-16 18:40:50 +02:00
Marcus Eriksson 1dea983962 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	NEWS.txt
2014-10-16 18:33:24 +02:00
Bjorn Hegerfors 77dae508cf Add DateTieredCompactionStrategy
Patch by Bjorn Hegerfors; reviewed by marcuse for CASSANDRA-6602
2014-10-16 18:17:21 +02:00
Mikhail Stepura 13c4719f77 Merge branch 'cassandra-2.1' into trunk 2014-10-14 10:38:42 -07:00
Mikhail Stepura e57d027c94 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-10-14 10:38:30 -07:00
Rajanarayanan Thottuvaikkatumana 1d02d7b34e Fix autocompletion for alter keyspace
patch by Rajanarayanan Thottuvaikkatumana; reviewed by Mikhail Stepura for CASSANDRA-8021
2014-10-14 10:36:53 -07:00
Sylvain Lebresne 9333f86cf0 Remove UDF-as-class functionality
patch by snazy; reviewed by slebresne for CASSANDRA-8063
2014-10-13 15:57:01 +02:00
Robert Stupp 6618bd89d3 Accept dollar-quoted strings in CQL
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7769
2014-09-23 15:19:13 -05:00
Mikhail Stepura cfb7aceac5 Merge branch 'cassandra-2.1' into trunk 2014-09-19 18:24:17 -07:00
Philip Thompson 6e5dd2329d (cqlsh) Tab completeion for indexes on map keys.
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-7972
2014-09-19 18:23:58 -07:00
Tyler Hobbs 0ef0394dfd Merge branch 'cassandra-2.1' into trunk 2014-09-19 16:03:07 -05:00
Philip Thompson 8589d04739 cqlsh: Fix UDT field selection
Patch by Philip Thompson; reviewed by Tyler Hobbs for CASSANDRA-7891
2014-09-19 16:02:40 -05: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
Mikhail Stepura 131097c2cb Merge branch 'cassandra-2.1' into trunk 2014-09-06 19:58:09 -07:00
Mikhail Stepura 9aff086a48 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-06 19:57:56 -07:00
Mikhail Stepura 1b3afd8173 (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
patch by Mikhail Stepura; reviewed by <committer> for CASSANDRA-7895
2014-09-06 18:45:08 -07:00
Tyler Hobbs bf52074f6b Merge branch 'cassandra-2.1' into trunk 2014-08-27 14:22:38 -05:00
Tyler Hobbs c7f9c8d21a Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-27 14:20:52 -05:00
Tyler Hobbs 58c09cbd42 cqlsh: fix case insensitivity
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7834
2014-08-27 14:20:12 -05:00
Sylvain Lebresne aad152d81c Add USING to CREATE FUNCTION for CASSANDRA-7811 2014-08-22 11:47:13 +02:00
Tyler Hobbs df9cac094c Merge branch 'cassandra-2.1' into trunk 2014-08-21 14:00:50 -05:00
Tyler Hobbs d088f02993 Use python driver for UDTs in DESCRIBE output
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7659
2014-08-21 13:59:26 -05:00
Tyler Hobbs 9a4f6bdf05 Merge branch 'cassandra-2.1' into trunk 2014-08-21 11:55:35 -05:00
Tyler Hobbs d586ea8980 cqlsh: Fix handling of CAS statement results
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7671
2014-08-21 11:54:47 -05:00
Tyler Hobbs f6ef8ef4d9 Ninja: fix cqlsh grammar for functions
Follow up for CASSANDRA-7740
2014-08-21 11:43:25 -05:00
Sylvain Lebresne f7cb008ceb Fix parsing of UDF body
patch by snazy; reviewed by slebresne for CASSANDRA-7740
2014-08-21 14:20:46 +02:00
Tyler Hobbs b42a15b896 Merge branch 'cassandra-2.1' into trunk 2014-08-20 17:52:04 -05:00
Tyler Hobbs 1aea6d5917 Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
	bin/cqlsh
2014-08-20 17:51:40 -05:00
Tyler Hobbs c4191ed1c9 cqlsh: preserve original result column names
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7806
2014-08-20 17:46:41 -05:00
Tyler Hobbs 7192f17e3c Merge branch 'cassandra-2.1' into trunk 2014-08-19 11:21:11 -05:00
Tyler Hobbs 7d7d529f6d Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-08-19 11:20:24 -05:00
Robert Stupp 25411bf1d1 Support pure user-defined functions
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7395
2014-08-08 14:11:01 -05:00
Tyler Hobbs bc1f53aaf7 Add cqlsh completion for IF [NOT] EXISTS in CREATE/DROP USER
Patch by Michał Michalski; review by Tyler Hobbs for CASSANDRA-7611

Conflicts:
	CHANGES.txt
2014-07-24 18:01:45 -05:00
Tyler Hobbs 59c7e25068 Add cqlsh completion for IF [NOT] EXISTS in CREATE/DROP USER
Patch by Michał Michalski; review by Tyler Hobbs for CASSANDRA-7611
2014-07-24 17:56:29 -05:00
Brandon Williams 992a27e03f Add ALLOW FILTERING and CONTAINS to cqlsh post-6910
Patch by Robert Stupp, reviewed by brandonwilliams for CASSANDRA-7588
2014-07-22 14:09:04 -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
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
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
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
Sylvain Lebresne 199cd0b785 Disallow renaming columns one at a time when when the table don't have CQL3 metadata yet
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5531
2013-05-01 16:23:40 +02:00
Aleksey Yeschenko 624d823087 Merge branch 'cassandra-1.2' into trunk 2013-02-19 07:26:50 +03:00
Aleksey Yeschenko df6983bbad cqlsh: Add username autocompletion
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5231
2013-02-19 07:21:08 +03:00
Aleksey Yeschenko c6204b595d Merge branch 'cassandra-1.2' into trunk 2013-02-14 01:20:47 +03:00
Aleksey Yeschenko 265964064b Simplify auth setup and make system_auth ks alterable
Patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5112
2013-02-14 01:19:04 +03:00
Brandon Williams 22f515b376 Allow populate_io_cache_on_flush to be set per-CF.
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
2013-01-31 17:37:24 -06:00
Brandon Williams 21f63a916d Allow populate_io_cache_on_flush to be set per-CF.
Patch by Alexey Zotov, reviewed by brandwonwilliams for CASSANDRA-4694
2013-01-31 15:12:41 -06:00
Aleksey Yeschenko b41fc772e1 Merge branch 'cassandra-1.2' into trunk
Conflicts:
	pylib/cqlshlib/cql3handling.py
2013-01-04 19:26:06 +03:00
Aleksey Yeschenko 3411adfdd2 cqlsh: fix DESCRIBE for 1.1 cfs in CQL3
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5101
2013-01-04 19:24:04 +03:00
Aleksey Yeschenko 8832317ffa Merge branch 'cassandra-1.2' into trunk 2013-01-04 17:17:33 +03:00
Aleksey Yeschenko 0b0a00d245 cqlsh: Add default limit to SELECT statements;
patch by Aleksey Yeschenko, reviewed by Brandon Williams for
CASSANDRA-4972
2013-01-04 17:10:29 +03:00