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

785 Commits

Author SHA1 Message Date
Benjamin Lerer 8644aa9b82 Fix CQLSH auto completion for PER PARTITION LIMIT 
patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-12803
 2016-10-25 12:12:26 +02:00
Marcus Eriksson 747a62f607 Merge branch 'cassandra-3.X' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-3.X 2016-10-18 14:10:34 +02:00
Benjamin Lerer ecf05b8826 Add duration data type 
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11873
 2016-10-18 14:01:05 +02:00
Dikang Gu 9fc14bc5a5 Make the fanout size for LeveledCompactionStrategy to be configurable 
Patch by Dikang Gu; reviewed by Marcus Eriksson for CASSANDRA-11550
 2016-10-18 08:46:35 +02:00
Stefania Alborghetti a0419085d5 cqlsh fails to format collections when using aliases 
Patch by Stefania Alborghetti; reviewed by Robert Stupp for CASSANDRA-11534
 2016-10-13 09:26:16 +08:00
Stefania Alborghetti e0a35e5852 Merge branch 'cassandra-3.0' into cassandra-3.X 2016-10-11 11:26:24 +08:00
Stefania Alborghetti 72c9eb2dc6 Abort cqlsh copy-from in case of no answer after prolonged period of time 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12740
 2016-10-11 11:25:03 +08:00
Stefania Alborghetti 45f96c86e6 Merge branch 'cassandra-3.0' into trunk 2016-09-01 10:22:01 +08:00
Stefania Alborghetti 20dd606e7b Merge branch 'cassandra-2.2' into cassandra-3.0 2016-09-01 10:19:25 +08:00
Stefania Alborghetti 40c2d45c5e cqlshlib tests: increase default execute timeout 
Patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12481
 2016-09-01 10:18:35 +08:00
Stefania Alborghetti 03659d7b94 Merge branch 'cassandra-3.0' into trunk 2016-08-25 09:11:01 +08:00
Stefania Alborghetti 431ecdb6b4 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-25 09:10:20 +08:00
Stefania Alborghetti b9fc6a5e45 cqlsh copy: fix missing counter values 
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-12476
 2016-08-25 09:09:07 +08:00
Stefania Alborghetti 21dda88ba0 Merge branch 'cassandra-3.9' into trunk 2016-08-22 09:07:46 +08:00
Stefania Alborghetti 2b8672d2a3 Merge branch 'cassandra-3.0' into cassandra-3.8 2016-08-22 09:06:18 +08:00
Stefania Alborghetti a86ddac344 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-08-22 09:02:23 +08:00
Stefania Alborghetti 59da27560c cqlsh copy: fixed possible race in initializing feeding thread 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11701
 2016-08-22 09:00:49 +08:00
Stefania Alborghetti 78e9180243 Ninja: added blank line following recent commit for CASSANDRA-10707 that broke TestCqlsh.test_pep8_compliance 2016-08-05 15:43:43 +08:00
Benjamin Lerer 4205011c0f Add support for GROUP BY to SELECT statement 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10707
 2016-08-04 17:09:38 +02:00
Hiroyuki Nishi a59689ad81 COPY FROM should raise error for non-existing input files 
patch by Hiroyuki Nishi; reviewed by Stefania Alborghetti for CASSANDRA-12174
 2016-07-27 12:27:44 +08:00
Stefania Alborghetti 78a91dbe75 Merge branch 'cassandra-3.9' into trunk 2016-07-25 09:24:46 +08:00
Stefania Alborghetti 9501c64f6d Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 09:24:17 +08:00
Stefania Alborghetti 659be5f5e7 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 09:23:00 +08:00
Stefania Alborghetti b92ab60f72 cqlsh copyutil should get host metadata by connected address 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11979
 2016-07-25 09:21:15 +08:00
Stefania Alborghetti d588af1856 Merge branch 'cassandra-3.9' into trunk 2016-07-25 08:45:56 +08:00
Stefania Alborghetti 7ca3e28cd5 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-25 08:45:04 +08:00
Stefania Alborghetti c3bf2f47b9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-25 08:41:55 +08:00
Stefania Alborghetti 3a7cfbd19b Merge branch 'cassandra-2.1' into cassandra-2.2 2016-07-25 08:40:35 +08:00
Tyler Hobbs 584eae3910 Ninja: update cqlsh completion tests for CASSANDRA-8844 
In CASSANDRA-8844, a new 'cdc' table option was added.  The python
driver added this as a recognized option, which caused it to show up in
cqlsh autocomplete suggestions.  However, the cqlsh tests were not
updated to match this.

This should fix the following failing tests:
 - test_complete_in_create_table
 - test_complete_in_create_columnfamily
 2016-07-20 16:01:03 -05:00
Aleksey Yeschenko 058faff6f9 Merge branch 'cassandra-3.9' into trunk 2016-07-20 15:03:42 +01:00
Mike Adamson 0b49b1776e cqlsh: Fix handling of $$-escaped strings 
patch by Mike Adamson; reviewed by Alex Petrov for CASSANDRA-12189
 2016-07-20 15:02:41 +01:00
Stefania Alborghetti f129dea869 Merge branch 'cassandra-3.9' into trunk 2016-07-20 10:00:12 +08:00
Stefania Alborghetti 8df6d4d4c6 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-20 09:58:40 +08:00
Stefania Alborghetti dce4537410 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-20 09:56:12 +08:00
Stefania Alborghetti e8186fe390 Fixed cqlshlib.test.remove_test_db 
patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12214
 2016-07-20 09:54:53 +08:00
Tyler Hobbs cc582855ea Ninja: update cqlsh completion tests for CASSANDRA-8844 
In CASSANDRA-8844, a new 'cdc' table option was added.  The python
driver added this as a recognized option, which caused it to show up in
cqlsh autocomplete suggestions.  However, the cqlsh tests were not
updated to match this.

This should fix the following failing tests:
 - test_complete_in_create_table
 - test_complete_in_create_columnfamily
 2016-07-19 14:40:55 -05:00
Yusuke Takata 74647a8cc5 cqlsh does not automatically downgrade CQL version 
patch by Yusuke Takata and Stefania Alborghetti;
reviewed by Stefania Alborghetti and Tyler Hobbs for CASSANDRA-12150
 2016-07-13 10:00:21 +08:00
Tyler Hobbs ff8d078c5b Merge branch 'cassandra-3.0' into trunk 
Conflicts:
	CHANGES.txt
 2016-06-23 10:36:03 -05:00
Tyler Hobbs edaa693701 cqlsh: Handle report_error() calls without a chunk arg 
Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for
CASSANDRA-12070
 2016-06-23 10:35:00 -05:00
Josh McKenzie e31e216234 Add Change Data Capture 
Patch by jmckenzie; reviewed by cyeksigian and blambov for CASSANDRA-8844
 2016-06-16 10:01:39 -04:00
Sylvain Lebresne 4ed00607df Allow terms in selection clauses 
patch by slebresne; reviewed by blerer for CASSANDRA-10783
 2016-06-15 09:33:06 +02:00
Stefania Alborghetti db8df91530 Merge branch 'cassandra-3.0' into trunk 2016-06-10 15:56:47 -05:00
Stefania Alborghetti 3d211e9fbf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-06-10 15:56:15 -05:00
Stefania Alborghetti 593bbf57dd Merge branch 'cassandra-2.1' into cassandra-2.2 2016-06-10 15:52:44 -05:00
Stefania Alborghetti 68319f7c3b cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections 
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11749
 2016-06-10 15:49:51 -05:00
Marcus Eriksson 8ef1e2ce25 Merge branch 'cassandra-3.0' into trunk 2016-06-07 07:45:10 +02:00
Jeff Jirsa 6c867f0030 Add TimeWindowCompactionStrategy 
Patch by Jeff Jirsa; reviewed by marcuse for CASSANDRA-9666
 2016-06-07 07:38:22 +02:00
Tyler Hobbs c7e086d611 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-06-01 12:39:39 -05:00
Tyler Hobbs 6932bbd909 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-06-01 12:39:23 -05:00
Mahdi Mohammadi b8f5c1fcec cqlsh: Fix tab completion for case-sensitive identifiers 
Patch by Mahdi Mohammadi; reviewed by Tyler Hobbs for CASSANDRA-11664
 2016-06-01 12:38:49 -05:00
Stefania Alborghetti 33ddb67984 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-18 08:58:51 +08:00
Stefania Alborghetti 54b7438252 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-05-18 08:55:36 +08:00
Stefania Alborghetti e8e917ff9f Add seconds to cqlsh tracing session duration 
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11753
 2016-05-18 08:52:43 +08:00
Tyler Hobbs 58d3b9a904 Merge branch 'cassandra-3.0' into cassandra-3.7 2016-05-05 11:36:29 -05:00
Tyler Hobbs d689da3677 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-05-05 11:34:56 -05:00
Tyler Hobbs 5de9de1f58 cqlsh: Handle non-ascii chars in error messages 
Patch by Tyler Hobbs; reviewed by Paulo Motta for CASSANDRA-11626
 2016-05-05 11:33:35 -05:00
Sam Tunnicliffe 7b0c7164aa Integrated JMX Authentication and Authorization 
Patch by Jan Karlsson and Sam Tunnicliffe; reviewed by Jake Luciani for
CASSANDRA-10091
 2016-05-02 11:44:48 +01:00
Stefania Alborghetti e6505a606f Merge branch 'cassandra-3.0' into trunk 2016-04-27 09:10:17 +08:00
Stefania Alborghetti f2afd04e73 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 09:09:10 +08:00
Stefania Alborghetti b6b2517700 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-27 09:07:48 +08:00
Stefania Alborghetti 72057c6971 cqlsh COPY FROM fails for null values with non-prepared statements 
patch by Stefania Alborghetti and Robert Stupp; reviewed by Robert Stupp for CASSANDRA-11631
 2016-04-27 09:05:48 +08:00
Stefania Alborghetti 0b81f72ed0 Merge branch 'cassandra-3.0' into trunk 2016-04-27 08:45:55 +08:00
Stefania Alborghetti fae7bf9c22 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 08:45:14 +08:00
Stefania Alborghetti 2dbcb5dae1 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-27 08:44:04 +08:00
Stefania Alborghetti b25139f8ac Make cython optional in pylib/setup.py 
patch by Stefania Alborghetti; reviewed by tjake for CASSANDRA-11630
 2016-04-27 08:42:32 +08:00
Robert Stupp db7d07cfa4 Merge branch 'cassandra-3.0' into trunk 2016-04-25 10:22:47 +02:00
Robert Stupp c9285d0e30 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 10:21:25 +02:00
Robert Stupp 5f99629a37 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 10:18:16 +02:00
Robert Stupp 07c9fa2cac cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-11633
 2016-04-25 10:16:28 +02:00
Stefania Alborghetti a18402ca08 Merge branch 'cassandra-3.0' into trunk 2016-04-22 09:44:37 +08:00
Stefania Alborghetti f050133f20 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-22 09:44:19 +08:00
Stefania Alborghetti 7713c821ca Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-22 09:42:57 +08:00
Stefania Alborghetti 666bee6125 clqsh: COPY FROM throws TypeError with Cython extensions enabled 
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11574
 2016-04-22 09:42:06 +08:00
Stefania Alborghetti 5062bb6eb0 Merge branch 'cassandra-3.0' into trunk 2016-04-21 10:18:26 +08:00
Stefania Alborghetti bb68078e7c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 10:17:50 +08:00
Stefania Alborghetti b80ff541e2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-21 10:12:24 +08:00
Stefania Alborghetti c8914c0725 cqlsh: COPY FROM ignores NULL values in conversion 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11549
 2016-04-21 10:10:37 +08:00
Stefania Alborghetti 2b08690def Merge branch 'cassandra-3.0' into trunk 2016-04-21 09:48:22 +08:00
Stefania Alborghetti c568efee54 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 09:45:49 +08:00
Stefania Alborghetti eb072a0fa0 cqlsh: COPY FROM should use regular inserts for single statement batches 
and report errors correctly if workers processes crash on initialization

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11474
 2016-04-21 09:43:35 +08:00
Tyler Hobbs e865e396cd Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-20 13:55:28 -05:00
Stefania Alborghetti 4389c9cfd8 cqlsh: Fix potential COPY deadlock 
This deadlock could occur when the parent process is terminating child
processes (partial backport of CASSANDRA-11320).

Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11505
 2016-04-20 13:52:08 -05:00
Stefania Alborghetti 754379507c Make number of cores used by cqlsh COPY visible to testing code 
patch by Stefania Alborghetti; reviewed by Jim Witschey for CASSANDRA-11437
 2016-04-18 08:03:03 +08:00
Tyler Hobbs 677230df69 Support for non-frozen UDTS 
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-7423
 2016-04-08 15:26:12 -05:00
Tyler Hobbs 3efcdc5f45 Merge branch 'cassandra-3.5' into trunk 2016-04-01 12:36:42 -05:00
Tyler Hobbs 496418ce07 Merge branch 'cassandra-3.0' into cassandra-3.5 
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/copyutil.py
 2016-04-01 12:32:01 -05:00
Stefania Alborghetti 98086b65d0 cqlsh: Improve backoff policy for COPY FROM 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11320
 2016-04-01 12:29:01 -05:00
Stefania Alborghetti 5a45aa62dd COPY FROM fails when importing blob 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
 2016-03-29 17:56:33 +01:00
Josh McKenzie 8602918722 Merge branch 'cassandra-3.5' into trunk 2016-03-28 13:56:13 -04:00
Josh McKenzie c7ef7c91c2 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-28 13:55:54 -04:00
Josh McKenzie 3efc609e01 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-28 13:55:11 -04:00
Josh McKenzie 6c1ef2ba4e Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-28 13:54:54 -04:00
Stefania Alborghetti a9b5422057 COPY FROM on large datasets: fixed problem on single core machines 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11053
 2016-03-28 13:54:37 -04:00
Yuki Morishita 207d08f86c Merge branch 'cassandra-3.5' into trunk 2016-03-22 15:50:42 -05:00
Yuki Morishita 1ee550262b Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-22 15:50:35 -05:00
Yuki Morishita 842e7c3fbf Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-22 15:50:21 -05:00
Stefania Alborghetti c74df40176 cqlsh: COPY FROM should check that explicit column names are valid 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11333
 2016-03-22 15:49:20 -05:00
Stefania Alborghetti 1ad9d55675 COPY TO should have higher double precision 
patch by Stefania; reviewed by slebresne for CASSANDRA-11255
 2016-03-18 10:56:49 +01:00
Stefania Alborghetti 2ab6299370 Add client to cqlsh SHOW_SESSION 
patch by Stefania; reviewed by slebresne for CASSANDRA-8958
 2016-03-17 15:15:47 +01:00
Stefania Alborghetti 1de4a983b2 (cqlsh) interpret CQL type for formatting blobs 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11274
 2016-03-11 00:41:14 +00:00
Sylvain Lebresne 6329d54a6c Merge commit '49c616cf0fc9c8d4649e2ec71a07fb9fd7831318' into cassandra-3.5 2016-03-08 10:25:54 +01:00
Sylvain Lebresne 49c616cf0f Merge commit 'b74ffeafd2e08a7669013d6b4ba87980e1ad5379' into cassandra-3.0 2016-03-08 10:24:26 +01:00
Sylvain Lebresne b74ffeafd2 Merge commit 'c3d2f26f46c2d37b6cf918cbb5565fe57a5904cc' into cassandra-2.2 2016-03-08 10:23:08 +01:00
Stefania Alborghetti c3d2f26f46 COPY FROM on large datasets: fix progress report and debug performance 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-11053
 2016-03-08 10:19:13 +01:00
Stefania Alborghetti 07df8a22d1 ninja 10397 - cqlsh: Fix sub second precision support 2016-02-19 14:44:52 -05:00
Joshua McKenzie 9492efb3c4 Merge branch 'cassandra-3.0' into trunk 2016-02-17 19:24:06 -05:00
Joshua McKenzie 5dbab32042 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 19:23:10 -05:00
Stefan Podkowinski 128d144c0d cqlsh: Add local timezone support to cqlsh 
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10397
 2016-02-17 19:22:17 -05:00
Stefania Alborghetti 81ffa524bd test_timestamp_output in the cqlshlib tests is failing 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11135
 2016-02-17 19:05:30 -05:00
Robert Stupp 097ce3873f Merge branch 'cassandra-3.0' into trunk 2016-02-17 13:43:00 +01:00
Robert Stupp fcc40e5886 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 13:42:54 +01:00
Robert Stupp 97f3aa681d cqlsh pg-style-strings broken if line ends with ';' 
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-11123
 2016-02-17 13:42:02 +01:00
Tyler Hobbs bc8e878ec6 Merge branch 'cassandra-3.0' into trunk 2016-02-11 15:31:11 -06:00
Tyler Hobbs 604c9df883 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/test/test_cqlsh_completion.py
 2016-02-11 15:31:02 -06:00
Michael Edge af6bd1b3f0 cqlsh: Fix inconsistencies in auto-completion 
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-10733
 2016-02-11 15:29:31 -06: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
Stefania Alborghetti 27d88ee335 cqlsh: Include sub-second precision in timestamps by default 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10428
 2016-02-02 15:04:57 +01:00
Sylvain Lebresne e96fae3ca2 Merge branch 'cassandra-3.0' into cassandra-3.3 2016-02-02 14:59:58 +01:00
Sylvain Lebresne b087b4c7d5 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-02 14:59:41 +01:00
Sylvain Lebresne af2b858429 Merge commit '165f586e6f5e7e5d08f0b85e5b00dbe1f68e3e8f' into cassandra-2.2 2016-02-02 14:58:33 +01:00
Stefania Alborghetti 165f586e6f test_bulk_round_trip_blogposts is failing occasionally 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10938
 2016-02-02 14:51:19 +01:00
Aleksey Yeschenko ed13e05bdc Merge branch 'cassandra-3.0' into cassandra-3.3 2016-01-14 17:12:44 +00:00
Aleksey Yeschenko 58643b0afe Merge branch 'cassandra-2.2' into cassandra-3.0 2016-01-14 17:12:24 +00:00
Aleksey Yeschenko e253bfee13 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-01-14 17:12:09 +00:00
Stefania Alborghetti c42716f2a9 (cqlsh) fix cqlsh_copy_tests when vnodes are disabled 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
 2016-01-14 17:09:40 +00:00
Stefania Alborghetti 26dc07b7db (cqlsh) fix formatting bytearray values 
patch by Stefania Alborghetti; reviewed by Jim Witschey for
CASSANDRA-10839
 2016-01-14 15:48:10 +00:00
Stefania Alborghetti 85b8d02aae Match cassandra-loader options in COPY FROM (3.2 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 18:00:46 +01:00
Stefania Alborghetti f288387917 Match cassandra-loader options in COPY FROM (3.0 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:58:20 +01:00
Stefania Alborghetti 202cf9b0be Match cassandra-loader options in COPY FROM (2.2 version) 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:56:30 +01:00
Stefania Alborghetti 11716547f8 Match cassandra-loader options in COPY FROM 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-9303
 2016-01-06 17:54:49 +01:00
Joshua McKenzie ce6ad5bf83 Merge branch 'cassandra-3.0' into trunk 2015-12-23 13:21:27 -05:00
Joshua McKenzie 382d9a943b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-23 13:21:19 -05:00
Joshua McKenzie ee36f14c14 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-23 13:21:12 -05:00
Stefania Alborghetti 3ccffc94b8 Fix multiple consecutive delimiters on cqlsh COPY FROM 
Patch by stefania; reviewed by pmotta for CASSANDRA-10854
 2015-12-23 13:20:27 -05:00
Stefania Alborghetti 99880d22de (cqlsh) allow setting TTL with COPY 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for
CASSANDRA-9494
 2015-12-18 23:14:15 +00:00
Aleksey Yeschenko ef37df4e42 Merge branch 'cassandra-3.0' into trunk 2015-12-18 22:48:36 +00:00
Aleksey Yeschenko 2e095833d9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-18 22:48:12 +00:00
Paulo Motta 9dd2b5ea0f Fix cqlshlib tests on Windows 
patch by Paulo Motta; reviewed by Jim Witschey for CASSANDRA-10541
 2015-12-18 22:46:31 +00:00
Aleksey Yeschenko bab66dd1af Merge branch 'cassandra-3.0' into trunk 2015-12-15 21:40:32 +00:00
Aleksey Yeschenko 1deb044321 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-15 21:39:25 +00:00
Aleksey Yeschenko 57d558fc1e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-15 21:37:09 +00:00
Stefania Alborghetti 124f1bd261 (cqlsh) further optimise COPY FROM 
patch by Stefania Alborghetti; reviewed by Adam Holmberg for
CASSANDRA-9302
 2015-12-15 21:03:31 +00:00
Sylvain Lebresne 105ccb3d20 Merge branch 'cassandra-3.0' into trunk 2015-12-11 11:51:49 +01:00
Sylvain Lebresne b55523e975 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-11 11:51:24 +01:00
Stefania Alborghetti 7dd6b7de28 Fix 2 cqlshlib tests 
patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
 2015-12-11 11:50:17 +01:00
Stefania Alborghetti 95dab2730d Rename copy.py to copyutil.py in cqlshlib 
explanation

patch by Stefania; reviewed by pauloricardomg for CASSANDRA-10799
 2015-12-11 11:48:15 +01:00
Joshua McKenzie 5daf8d020f Merge branch 'cassandra-3.1' into trunk 2015-12-01 13:57:04 -05:00
Stefania 803a3d9011 10753-3.0 patch 2015-12-01 13:56:03 -05:00
Stefania 1b81ad19d3 Fix completion problems in cqlsh 
Patch by stefania; reviewed by pmotta for CASSANDRA-10753
 2015-12-01 13:52:09 -05:00
Robert Stupp f55df0b85e Merge branch 'cassandra-3.1' into trunk 2015-12-01 10:41:07 +01:00
Robert Stupp 1cbd82782e Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-01 10:40:07 +01:00
Robert Stupp 8738087edd fix: show CQL help in cqlsh in web browser 
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
 2015-12-01 10:39:05 +01:00
Robert Stupp 306d882fe3 Merge branch 'cassandra-3.1' into trunk 2015-11-27 15:26:13 +01:00
Robert Stupp 9a2fd8ccf3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 15:26:02 +01:00
Robert Stupp 0ee8895b27 Show CQL help in cqlsh in web browser 
patch by Robert Stupp; reviewed by Paulo Motta for CASSANDRA-7225
 2015-11-27 15:24:51 +01:00
Tyler Hobbs 07bc6884b5 Merge branch 'cassandra-3.1' into trunk 2015-11-25 17:54:19 -06:00
Tyler Hobbs 5fd6c545e5 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-25 17:53:15 -06:00
Tyler Hobbs cd75ecd90f Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-25 17:52:58 -06:00
Stefania Alborghetti 9768e57e3e CASSANDRA-9304 follow-up: fix cqlshlib tests 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a
follow-up to CASSANDRA-9304
 2015-11-25 17:50:34 -06:00
Marcus Eriksson 0caa17de0e Merge branch 'cassandra-3.1' into trunk 2015-11-20 11:07:09 +01:00
Marcus Eriksson f4ae344871 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 11:06:48 +01:00
Marcus Eriksson 073f06262a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-20 11:05:01 +01:00
Marcus Eriksson 99617a5293 Limit size of windows with DTCS 
Patch by marcuse; reviewed by Branimir Lambov for CASSANDRA-10280
 2015-11-20 10:59:46 +01:00
Tyler Hobbs 8c511cc45e Merge branch 'cassandra-3.1' into trunk 2015-11-18 18:32:22 -06:00
Tyler Hobbs 74070ee4ab Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-18 18:31:31 -06:00
Tyler Hobbs d2f243ee5c Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-18 18:25:18 -06:00
Stefania Alborghetti 1b629c101b cqlsh: Improve COPY TO perf and error handling 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-9304
 2015-11-18 18:22:28 -06: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
Aleksey Yeschenko 39bc5de68a Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 18:39:42 +00:00
Aleksey Yeschenko cb429063c1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 17:56:33 +00:00
Aleksey Yeschenko b761b8659b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 14:39:37 +00:00
Paulo Motta a306a1bf32 Fix SortedSet cqlsh formatting (follow-up to CASSANDRA-10513) 2015-11-04 14:38:42 +00:00
Joshua McKenzie 1d28a4acf8 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-23 13:59:14 -04:00
Joshua McKenzie 013ce88512 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-23 13:58:59 -04:00
Stefania Alborghetti 34b8d8fcbf Make cqlsh tests work when authentication is configured 
Patch by stefania; reviewed by aholmberg for CASSANDRA-10544
 2015-10-23 13:58:19 -04:00
Stefania Alborghetti 5a1d376489 Make cqlsh support python-2.6 (FOLLOW-UP CASSANDRA-10415) 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-10415
 2015-10-22 10:17:17 +02:00
blerer a880739187 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-20 14:10:15 +02:00
blerer a33790730a Merge branch cassandra-2.1 into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2015-10-20 14:06:45 +02:00
blerer 9b3b1cb03c Fix conditions on static columns 
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10264
 2015-10-20 13:54:46 +02:00
blerer f3143e624c Merge branch cassandra-2.2 into cassandra-3.0 2015-10-16 11:57:22 +02:00
blerer 94a7d0682e Merge branch cassandra-2.1 into cassandra-2.2 2015-10-16 11:53:52 +02:00
Stefania Alborghetti 806378c8c2 Fix cqlsh rules 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for
CASSANDRA-10415
 2015-10-16 11:47:07 +02:00
Tyler Hobbs ebb2b1beda Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-10-14 11:21:28 -05:00
Tyler Hobbs 25366f7d44 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 11:19:35 -05:00
Adam Holmberg 02f88e38e1 cqlsh: Fix display of -infinity 
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-10523
 2015-10-14 11:17:50 -05:00
Robert Stupp 5a808ad9ee Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-09 09:59:51 +02:00
Robert Stupp 87fa9be46d cqlsh pg-style-strings broken 
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-10484
 2015-10-09 09:56:35 +02:00
Aleksey Yeschenko 425bfaf20b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-01 21:21:54 -07:00
Jim Witschey f3cd3ed7bb Fix cqlshlib tests 
patch by Jim Witschey; reviewed by Stefania Alborghetti for
CASSANDRA-10289
 2015-10-01 19:24:48 -07:00
Philip Thompson 2e87c433a9 Fix HELP SELECT_EXPR output in cqlsh 
Patch by pthompson; reviewed by stefania for CASSANDRA-10074
 2015-09-24 09:43:29 -07:00
Stefania Alborghetti aeee9f74d9 Add DESCRIBE MATERIALIZED VIEW to cqlsh 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-9961
 2015-09-18 11:33:54 +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
Robert Stupp 29c6f1d96f Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-13 11:35:58 +02:00
Robert Stupp 9791796096 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-13 11:34:31 +02:00
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
Jonathan Ellis ee9807e3ac merge from 2.2 2015-08-24 20:10:14 -05:00
Jonathan Ellis 1992598ecc merge from 2.1 2015-08-24 20:09:22 -05:00
Jonathan Ellis f5d0595b6e (cqlsh) default load-from-file encoding to utf-8 
patch by Yasuharu Goto; reviewed by Carl Yeksigian for CASSANDRA-9898
 2015-08-24 20:08:51 -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
Tyler Hobbs dfc1a44508 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-07 15:50:07 -05:00
Tyler Hobbs ce7159e102 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	NEWS.txt
	pylib/cqlshlib/formatting.py
 2015-08-07 15:49:42 -05:00
Paulo Motta 1ecc9cd61e cqlsh: Fix timestamps before 1970 on Windows 
This also has the side effect of displaying timestamps in the UTC
timezone instead of the local timezone.

Patch by Paulo Motta; reviewed by Tyler Hobbs for CASSANDRA-10000
 2015-08-07 15:45:16 -05: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
Joshua McKenzie 1f5c4f7ba5 Merge branch 'cassandra-2.2' into trunk 2015-07-23 13:24:53 -04:00
Joshua McKenzie 99decd8efa Fix handling of incorrect %z cqlshlib output on Windows 
Patch by jmckenzie; reviewed by aweisberg for CASSANDRA-9418
 2015-07-23 13:21:10 -04:00
T Jake Luciani 107f141e09 Merge branch 'cassandra-2.2' into trunk 2015-07-17 13:03:19 -04:00
T Jake Luciani 9dc8c21980 Fix cqlsh copy methods and timestamp format issues on windows 
patch by tjake; reviewed by Josh McKenzie for CASSANDRA-9795
 2015-07-17 13:00:38 -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 12ff1cda70 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-07-07 15:49:00 -05:00
Jesse Szwedko 30df089d72 cqlsh: Make SSL protocol version configurable 
Patch by Jesse Szwedko; reviewed by Tyler Hobbs for CASSANDRA-9544
 2015-07-07 15:47:57 -05: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
Tyler Hobbs 24a1a5d719 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
 2015-06-04 11:40:02 -05:00
Tyler Hobbs 5d26943fda cqlsh: Fix using COPY through SOURCE or -f 
Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for
CASSANDRA-9083
 2015-06-04 11:39:00 -05:00
Tyler Hobbs 321f5e82f3 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	pylib/cqlshlib/formatting.py
 2015-05-22 17:40:58 -05:00
Stefania Alborghetti 7f855d113b cqlsh: Improve default float precision behavior 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-9224
 2015-05-22 17:38:46 -05: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
Jim Witschey 00cd9b9fff Add tests for cqlsh's CQL parser 
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9248
 2015-05-01 17:45:56 -05:00
Tyler Hobbs e6bc6385ae Merge branch 'cassandra-2.1' into trunk 2015-04-22 10:50:55 -05:00
Tyler Hobbs 93b36d4b82 Fix write meter for cqlsh COPY TO 
Patch by Tyler Hobbs; reviewed by Stefania Alborghetti for
CASSANDRA-9217
 2015-04-22 10:41:41 -05: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
Jim Witschey 9e7774ac73 cqlsh: add tests for CREATE/DROP/DELETE tab completion 
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9155
 2015-04-09 18:25:11 -05:00
Tyler Hobbs 47a4cbedfe Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-04-07 17:24:17 -05:00
Jim Witschey 879691dd35 cqlsh: Add tests for INSERT, UPDATE tab completion 
Patch by Jim Witschey; reviewed by Tyler Hobbs for CASSANDRA-9125
 2015-04-07 17:23:11 -05:00
Tyler Hobbs adcb8a439a Merge branch 'cassandra-2.1' into trunk 2015-04-03 15:18:17 -05:00
Tyler Hobbs f7162293d2 cqlsh: fix formatting of map keys and values 
Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-9114
 2015-04-03 15:17:20 -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
Tyler Hobbs 237d0bc62e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	bin/cqlsh
 2015-03-20 10:30:28 -05:00
Tyler Hobbs 7110904e40 Improve performance of cqlsh COPY FROM 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8225
 2015-03-20 10:26:47 -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
Tyler Hobbs d76450c798 Merge branch 'cassandra-2.1' into trunk 2015-01-29 14:39:07 -06:00
Abhishek Gupta c49f6666e4 cqlsh: handle unicode BOM at the start of files 
Patch by Abhishek Gupta; reviewed by Tyler Hobbs for CASSANDRA-8638
 2015-01-29 14:37:55 -06:00
Tyler Hobbs 5d3c2c9852 Merge branch 'cassandra-2.1' into trunk 2015-01-21 18:37:21 -06:00
Adam Holmberg 8092d2c654 Update cqlsh formatting for upgraded python driver 
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8664
 2015-01-21 18:36:29 -06:00
Tyler Hobbs a6ae07f168 Merge branch 'cassandra-2.1' into trunk 2015-01-15 11:57:35 -06:00
Tyler Hobbs a3234e191f Update error message in cqlsh test to match latest 2015-01-15 11:57:00 -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
Tyler Hobbs 9274197b4b Merge branch 'cassandra-2.1' into trunk 2014-10-31 14:17:11 -05:00
Tyler Hobbs d2309227c2 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-10-31 14:16:45 -05:00
Ricardo Devis Agullo ef14f51655 Fix typo in cqlsh insert documentation 
Patch by Ricardo Devis Agullo; reviewed by Tyler Hobbs for
CASSANDRA-4959
 2014-10-31 14:15:50 -05: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 f34e829a2f Merge branch 'cassandra-2.1' into trunk 2014-09-07 20:09:56 -07:00
Mikhail Stepura f1f5f5fd3a (cqlsh): Support for query paging 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7514
 2014-09-07 20:09:14 -07:00
Mikhail Stepura 131097c2cb Merge branch 'cassandra-2.1' into trunk 2014-09-06 19:58:09 -07:00