Commit Graph

785 Commits

Author SHA1 Message Date
Stefania Alborghetti 106691b2ff Merge branch 'cassandra-3.11' into trunk 2017-06-06 08:53:47 +08:00
Stefania Alborghetti 92e304277c Merge branch 'cassandra-3.0' into cassandra-3.11 2017-06-06 08:53:34 +08:00
Stefania Alborghetti 17a7a806c8 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-06-06 08:52:19 +08:00
Kurt 5807eca8bb cqlsh COPY FROM: increment error count only for failures, not for attempts
patch by Kurt Greaves; reviewed by Stefania Alborghetti for CASSANDRA-13209
2017-06-06 08:49:17 +08:00
Sylvain Lebresne 4ebab66163 Allow selecting Map values and Set elements
patch and review by Robert Stupp, Sylvain Lebresne and Benjamin Lerer for CASSANDRA-7396
2017-06-01 16:57:13 +02:00
Benjamin Lerer 7b149ce4a4 Merge branch cassandra-3.11 into trunk 2017-05-29 17:43:42 +02:00
Akhil Mehra 5a860a70f2 Fix formatting of duration columns in CQLSH
patch by Akhil Mehra; reviewed by Benjamin Lerer for CASSANDRA-13549
2017-05-29 17:42:29 +02:00
Stefania Alborghetti e0f3770008 Merge branch 'cassandra-3.11' into trunk 2017-04-07 09:06:13 +08:00
Stefania Alborghetti 980f32d563 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-04-07 09:05:53 +08:00
Stefania Alborghetti a8a3d4e282 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-04-07 09:03:54 +08:00
Stefania Alborghetti 377f6117ce Merge branch 'cassandra-2.1' into cassandra-2.2 2017-04-07 09:02:40 +08:00
Stefania Alborghetti 010b5f3a56 Fix ParseError unhashable type list in cqlsh copy from
patch by Stefania Alborghetti; reviewed by Alex Petrov for CASSANDRA-13364
2017-04-07 08:57:54 +08:00
Branimir Lambov b953f9eb2a Change default min_compress_ratio to 0 to avoid sending parameter to old
nodes

Follow-up commit to CASSANDRA-10520

patch by Branimir Lambov; reviewed by Robert Stupp for CASSANDRA-10520
2017-03-29 14:42:29 +03:00
Stefania Alborghetti f08cf5af0d Merge branch 'cassandra-3.11' into trunk 2017-03-02 10:00:40 +08:00
Stefania Alborghetti 943fb02ffd Merge branch 'cassandra-3.0' into cassandra-3.11 2017-03-02 10:00:20 +08:00
Stefania Alborghetti 496cfa8f5b Cqlsh copy-from should error out when csv contains invalid data for collections
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-13071
2017-03-02 09:58:58 +08:00
Stefania Alborghetti 8bfa827696 ninja: add default min_compress_ratio to cqlshlib tests, follow-up to CASSANDRA-10520 2017-02-27 10:55:39 +08:00
Paulo Motta cc51b4db09 Merge branch 'cassandra-3.11' into trunk 2017-02-22 17:21:09 -03:00
Paulo Motta b3490c0624 Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-22 17:20:37 -03:00
Paulo Motta 5fba118e95 Merge branch 'cassandra-2.2' into cassandra-3.0 2017-02-22 17:19:08 -03:00
Márton Salomváry 88f36a0955 Fix failing COPY TO STDOUT
Patch by Márton Salomváry; Reviewed by Paulo Motta for CASSANDRA-12497
2017-02-22 17:12:34 -03:00
Stefania Alborghetti 95bcaef735 Merge branch 'cassandra-3.11' into trunk 2017-02-22 10:01:27 +00:00
Stefania Alborghetti 10524bda9e Merge branch 'cassandra-3.0' into cassandra-3.11 2017-02-22 10:01:09 +00:00
Stefania Alborghetti f0502aa791 Fix cqlsh COPY for dates before 1900
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-13185
2017-02-22 09:59:08 +00:00
Benjamin Lerer 369e7aa4c1 Merge branch cassandra-3.11 into trunk 2017-01-18 16:18:29 +01:00
Benjamin Lerer d388289533 Merge branch cassandra-3.0 into cassandra-3.11 2017-01-18 16:07:14 +01:00
Carl Yeksigian 5f66d48b38 Remove alter type support
patch by Carl Yeksigian; reviewed by Benjamin Lerer for CASSANDRA-12443
2017-01-18 15:59:10 +01:00
Stefania Alborghetti 84b9b9a49d Merge branch 'cassandra-3.X' into trunk 2017-01-06 10:06:30 +01:00
Stefania Alborghetti 4fefdee591 Merge branch 'cassandra-3.11' into cassandra-3.X 2017-01-06 10:05:00 +01:00
Stefania Alborghetti ad8c23691a Merge branch 'cassandra-3.0' into cassandra-3.11 2017-01-06 10:04:29 +01:00
Stefania Alborghetti 65bd455235 Replace empty strings with null values if they cannot be converted
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-12794
2017-01-06 10:03:11 +01:00
Stefania Alborghetti 72934d5df8 Merge branch 'cassandra-3.X' into trunk 2016-12-22 11:21:19 +08:00
Stefania Alborghetti f6b4ab4170 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-22 11:20:58 +08:00
Stefania Alborghetti b98767868a Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-22 11:20:36 +08:00
Stefania Alborghetti b0f85b96dc Merge branch 'cassandra-2.2' into cassandra-3.0 2016-12-22 11:19:32 +08:00
Stefania Alborghetti f4fd0928e6 cqlsh copy-from: encode column names to avoid primary key parsing errors
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-12909
2016-12-22 11:17:39 +08:00
Stefania Alborghetti 634f495bae Merge branch 'cassandra-3.X' into trunk 2016-12-22 10:29:46 +08:00
Stefania Alborghetti a224b2f6e2 Merge branch 'cassandra-3.11' into cassandra-3.X 2016-12-22 10:29:33 +08:00
Stefania Alborghetti 958ba452e7 Merge branch 'cassandra-3.0' into cassandra-3.11 2016-12-22 10:29:15 +08:00
Stefania Alborghetti 11f7ba9481 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-12-22 10:27:23 +08:00
Stefania Alborghetti 6bce8b0270 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-12-22 10:25:27 +08:00
Stefania Alborghetti bdca25e96e cqlsh copy-from: sort user type fields in csv
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12959
2016-12-22 10:23:57 +08:00
Sylvain Lebresne 4881d9c308 Thrift removal
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11115
2016-12-13 10:27:12 +01:00
Eduard Tudenhoefner 68c828f48a cqlsh auto completion: refactor definition of compaction strategy options
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-12946
2016-11-28 09:05:05 +08:00
Benjamin Lerer 8884302fac Fix CQLSH parser syntax (follow-up CASSANDRA-11935) 2016-11-25 09:47:57 +01:00
Benjamin Lerer 8b3de2f490 Add support for arithmetic operators
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-11935
2016-11-21 18:04:42 +01:00
Eduard Tudenhoefner 578815541a Move cqlsh syntax rules into separate module and allow easier customization
patch by Eduard Tudenhoefner; reviewed by Stefania Alborghetti for CASSANDRA-12897
2016-11-14 14:24:08 +08:00
Stefania Alborghetti 574ca2e2dd Merge branch 'cassandra-3.0' into cassandra-3.X 2016-11-11 11:01:41 +08:00
Stefania Alborghetti 14b52bca30 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-11-11 11:00:13 +08:00
Stefania Alborghetti 2e21cac342 cqlsh COPY: unprotected pk values before converting them if not using prepared statements
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-12863
2016-11-11 10:55:25 +08:00
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