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

1005 Commits

Author SHA1 Message Date
Tyler Hobbs 22e0a1daa6 Merge branch 'cassandra-3.0' into cassandra-3.7 
Conflicts:
	CHANGES.txt
 2016-05-27 15:48:22 -05:00
Zhongxiang Zheng 7a7704e5fd cqlsh: Suppress stacktraces for Read/WriteFailures 
Patch by Zhongxiang Zheng; reviewed by Tyler Hobbs for CASSANDRA-11032
 2016-05-27 15:47:36 -05: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
Yuki Morishita 73ad99d9df Merge branch 'cassandra-3.0' into trunk 2016-04-25 20:08:51 -05:00
Yuki Morishita 251449ffad Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 20:08:24 -05:00
Yuki Morishita 1d7c0bc210 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 20:05:06 -05:00
Wei Deng c43cf8d79b Change order of directory searching for cassandra.in.sh 
patch by Wei Deng; reviewed by yukim for CASSANDRA-11628
 2016-04-25 20:03:27 -05: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
Sylvain Lebresne 66fb8f51ed Change cql version in cqlsh 2016-04-08 15:25:50 +02: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
Yuki Morishita 5e722ee0a0 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-22 16:09:06 -05:00
Yuki Morishita b6d0a752e4 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-03-22 16:04:58 -05:00
Jeremiah D Jordan 42644c3240 Backport CASSANDRA-10679 
patch by yukim; reviewed by Jeremiah Jordan for CASSANDRA-9598
 2016-03-22 15:56:06 -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
Yuki Morishita 0ac03a20c0 Merge branch 'cassandra-3.5' into trunk 2016-03-11 16:47:49 -06:00
Yuki Morishita de44900a3e Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-11 16:30:21 -06:00
Yuki Morishita 854a243af9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-11 16:27:42 -06:00
Yuki Morishita 971d649543 (cqlsh) Fix error when result is 0 rows with EXPAND ON 
patch by yukim; reviewed by thobbs for CASSANDRA-11092
 2016-03-11 16:20:33 -06: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
Yuki Morishita 32b5f8fe49 Merge branch 'cassandra-3.5' into trunk 2016-03-09 11:43:44 -06:00
Yuki Morishita d2333a9256 Merge branch 'cassandra-3.0' into cassandra-3.5 2016-03-09 11:43:37 -06:00
Yuki Morishita b808a18064 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-03-09 11:42:58 -06:00
Joel Knighton f79158998b Add missing newline at end of bin/cqlsh 2016-03-09 11:41:38 -06:00
Sylvain Lebresne acde508159 Merge branch 'cassandra-3.5' into trunk 2016-03-08 10:26:08 +01: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
Pavel Trukhanov ab793c7f3b (cqlsh) Show static columns in a different color 
patch by Pavel Trukhanov; reviewed by yukim for CASSANDRA-11059
 2016-03-07 16:15:42 -06:00
Stefan Podkowinski 70649a8d65 Add cqlshrc option to always connect using ssl 
patch by Stefan Podkowinski; reviewed by Paulo Motta for CASSANDRA-10458
 2016-02-29 18:21:05 +00:00
Jeremiah D Jordan e856d8f81e Update cqlsh python version checking to find python2.7 
patch by Jeremiah Jordan; reviewed by Stefania Alborghetti for CASSANDRA-11212
 2016-02-24 05:54:20 -08:00
Jason Brown a62397782c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-24 05:52:53 -08:00
Jeremiah D Jordan 941d13dac8 Update cqlsh python version checking to find python2.7 
patch by Jeremiah Jordan; reviewed by Stefania Alborghetti for CASSANDRA-11212
 2016-02-24 05:51:42 -08:00
Paulo Motta a12188cd4e cqlsh: change default encoding to UTF-8 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
 2016-02-24 05:46:08 -08:00
Jason Brown d7e0c30186 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-24 05:44:41 -08:00
Paulo Motta 66b0d3f016 cqlsh: change default encoding to UTF-8 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11124
 2016-02-24 05:43:00 -08:00
Joshua McKenzie 29066afea3 Merge branch 'cassandra-3.0' into trunk 2016-02-19 14:56:55 -05:00
Adam Holmberg 70c8a53de4 cqlsh: Display milliseconds when datetime overflows 
patch by Adam Holmberg; reviewed by Paulo Motta for CASSANDRA-10625
 2016-02-19 14:55:15 -05:00
Carl Yeksigian aca2a1dcfd Merge branch 'cassandra-3.0' into trunk 2016-02-18 15:55:14 -05:00
Carl Yeksigian 6503335089 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-18 15:50:44 -05:00
Carl Yeksigian 4985fcc86f cqlsh cannot be called through symlink 
patch by Benjamin Zarzycki; reviewed by Carl Yeksigian for CASSANDRA-11037
 2016-02-18 15:48:54 -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
Yuki Morishita 7871c36e36 Merge branch 'cassandra-3.0' into trunk 2016-02-17 10:27:01 -06:00
Yuki Morishita 39e966d852 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-17 10:26:56 -06:00
Yuki Morishita 15b0bd6d03 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-02-17 10:26:48 -06:00
Yuki Morishita 757e314cef Use logback setting for 'cassandra -v' command 
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10767
 2016-02-17 10:26:08 -06: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
Aleksey Yeschenko 71ccb16bf9 Merge branch 'cassandra-3.0' into trunk 2016-02-08 12:28:32 +00:00
Aleksey Yeschenko 23f629628e Merge branch 'cassandra-2.2' into cassandra-3.0 2016-02-08 12:19:38 +00:00
Paulo Motta d295c7c698 (cqlsh) Support utf-8/cp65001 encoding on Windows 
patch by Paulo Motta; reviewed by Stefania Alborghetti for CASSANDRA-11030
 2016-02-08 12:16:23 +00: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
Tyler Hobbs 1a31958bfa Merge branch 'cassandra-3.0' into cassandra-3.3 
Conflicts:
	CHANGES.txt
 2016-01-27 14:36:37 -06:00
Eduard Tudenhoefner 414c1c5771 cqlsh: Fix INSERT and UPDATE LWT handling 
Patch by Eduard Tudenhoefner; reviewed by Tyler Hobbs for
CASSANDRA-11003
 2016-01-27 14:35:46 -06:00
Sylvain Lebresne 83ad9ce7d6 Merge branch 'cassandra-3.0' into cassandra-3.3 2016-01-22 16:08:21 +01:00
Sylvain Lebresne bee7917b4d Merge branch 'cassandra-2.2' into cassandra-3.0 2016-01-22 16:03:52 +01:00
Matthieu Nantern 3aaae7aa59 (cqlsh) encode input correctly when saving history 
patch by matthieu.nantern; reviewed by pauloricardomg for CASSANDRA-10948
 2016-01-22 16:03:20 +01:00
Benjamin Lerer cf3dcc2bb2 Merge branch cassandra-3.0 into cassandra-3.3 2016-01-13 14:53:03 +01:00
Benjamin Lerer 95012dab5b Merge branch cassandra-2.2 into cassandra-3.0 2016-01-13 14:49:41 +01:00
Paulo Motta c7f0032912 (cqlsh) Add request timeout option to cqlsh 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-10686
 2016-01-13 14:48:04 +01:00
Paulo Motta c0747d2856 (cqlsh) Add request timeout option to cqlsh 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-10686
 2016-01-13 14:31:28 +01:00
Tyler Hobbs f4ba752b32 Merge branch 'cassandra-3.0' into cassandra-3.3 
Conflicts:
	CHANGES.txt
 2016-01-12 11:53:23 -06:00
Tyler Hobbs 2569fbd142 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-01-12 11:52:24 -06:00
Julien Blondeau de946ae45a cqlsh: Apply --connect-timeout to control conn 
Patch by Julien Blondeau; reviewed by Tyler Hobbs for CASSANDRA-10959
 2016-01-12 11:51:20 -06: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
Robert Stupp 52430b93e5 Merge branch 'cassandra-3.0' into trunk 2015-12-29 15:34:17 +01:00
Robert Stupp 36608cefa3 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-29 15:34:06 +01:00
Bernhard K. Weisshuhn f9ac657456 jemalloc detection fails due to quoting issues in regex 
patch by Bernhard K. Weisshuhn; reviewed by Robert Stupp for CASSANDRA-10946
 2015-12-29 15:31:33 +01:00
Robert Stupp 4d1f8e4045 Merge branch 'cassandra-3.0' into trunk 2015-12-27 17:28:42 +01:00
Robert Stupp 13daf89daf Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-27 17:28:15 +01:00
Robert Stupp af509ec9a1 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-27 17:28:10 +01:00
Yasuharu Goto f1b9e9a65a cqlsh fails to decode utf-8 characters for text typed columns 
patch by Yasuharu Goto; reviewed by Paulo Motta for CASSANDRA-10875
 2015-12-27 17:26:22 +01:00
Sylvain Lebresne 9a27d3fabd Merge branch 'cassandra-3.0' into trunk 2015-12-22 15:12:46 +01:00
Sylvain Lebresne f967257e48 Fix cqlsh after CQL version bump 2015-12-22 15:12:37 +01:00
Aleksey Yeschenko 01b3508e0f Merge branch 'cassandra-3.0' into trunk 2015-12-18 23:30:39 +00:00
Aleksey Yeschenko 2800bf1082 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-18 23:30:16 +00:00
Adam Holmberg bcd68b546b (cqlsh) show correct column names for empty result sets 
patch by Adam Holmberg; reviewed by Ariel Weisberg for CASSANDRA-9813
 2015-12-18 23:26:53 +00: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
Robert Stupp 425dc5f7dc prevent the command "cassandra start" from starting a cluster 
patch by Robert Stupp; reviewed by Michael Shuler for CASSANDRA-8142
 2015-12-05 08:25:27 +01:00
Jeremiah D Jordan b5240204d7 Normalize all scripts 
patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-10679
 2015-12-02 10:48:27 -06:00
Benjamin Lerer 244ba19988 Merge branch 'cassandra-3.1' into trunk 2015-12-02 11:29:47 +01:00
Adam Holmberg bcdbb0eb94 Normalize cqlsh DESC output 
patch by Adam Holmberg; reviewed by Benjamin Lerer for CASSANDRA-10431
 2015-12-02 11:23:50 +01: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 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 9b3b3ca00f Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-11-25 11:57:24 -06:00
Tyler Hobbs a90c3b2b85 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-25 11:56:16 -06:00
Michael Edge 68ea4edb33 cqlsh: print column names before COPY operation 
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
 2015-11-25 11:54:11 -06:00
Benjamin Lerer 29b988d8c4 Merge branch cassandra-2.2 into cassandra-3.0 2015-11-24 15:10:17 +01:00
Benjamin Lerer 1142183f56 Merge branch cassandra-2.1 into cassandra-2.2 2015-11-24 15:00:34 +01:00
Michael Edge f319f0a236 Fix inconsistencies within CQLSH help 
patch by Michael Edge; reviewed by Benjamin Lerer for CASSANDRA-10719
 2015-11-24 14:51:35 +01:00
Sylvain Lebresne 84750421a9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-20 15:12:16 +01:00
Sylvain Lebresne b0fd5178e8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-20 15:11:51 +01:00
Stefania Alborghetti 05ccdc6411 Improve COPY command to work with Counter columns 
patch by jasonstack; reviewed by Stefania for CASSANDRA-9043
 2015-11-20 15:03:47 +01:00
Robert Stupp 747e5fd4ad Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-19 11:11:24 +01:00
Robert Stupp 95feab6631 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-19 11:09:11 +01:00
Michael Shuler 4f2337f6d0 sstableloader does not use MAX_HEAP_SIZE env parameter 
patch by Michael Shuler; reviewed by Robert Stupp for CASSANDRA-10188
 2015-11-19 11:08:14 +01: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
Joshua McKenzie 97dc8d5255 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 13:42:49 -05:00
Joshua McKenzie f8783b7bb1 Redirect stderr/stdout to console on Windows launch. Add -q to quiet if desired. 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10641
 2015-11-06 13:42:14 -05: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 2548365a6e Revert "(cqlsh) show partial trace if incomplete after max_trace_wait" 
This reverts commit 626ac94cd5.
 2015-11-06 17:52:53 +00:00
Aleksey Yeschenko cfbe2d35b0 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-06 15:26:14 +00:00
Aleksey Yeschenko edca4dcecc Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-06 15:25:53 +00:00
Stefania Alborghetti 81e520c54b (cqlsh) fix COPY using wrong variable name for time_format 
patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633
 2015-11-06 15:22:42 +00:00
Paulo Motta 9940892c3c Fix cqlsh type handling after driver metadata api change 
patch by Paulo Motta; reviewed by Aleksey Yeschenko
 2015-11-05 14:35:01 +00:00
Robert Stupp 242b9738f2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-04 23:29:44 +01:00
Robert Stupp 0ff13d2a68 get JEMAlloc debug output out of nodetool output 
patch by Robert Stupp; reviewed by Ariel Weisberg for CASSANDRA-10628
 2015-11-04 23:28:57 +01:00
Paulo Motta 1f1700a67c Follow-up to CASSANDRA-10513 2015-11-04 15:46:53 +00:00
Aleksey Yeschenko 1d340befaf Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:36:05 +00:00
Aleksey Yeschenko 9404fed01a Revert "Revert "Update cqlsh driver for new driver execution API"" 
This reverts commit 0fbf715916.
 2015-11-04 14:21:18 +00:00
Sylvain Lebresne f27cc7ef3c Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 14:52:53 +01:00
Sylvain Lebresne 0fbf715916 Revert "Update cqlsh driver for new driver execution API" 
This reverts commit acf67d559c.
 2015-10-30 14:51:26 +01:00
Sylvain Lebresne 10ef01d1ca Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-30 10:02:15 +01:00
Paulo Motta acf67d559c Update cqlsh driver for new driver execution API 
patch by aholmber; reviewed by pauloricardomg for CASSANDRA-10513
 2015-10-30 09:54:03 +01:00
Tyler Hobbs d856d3d7bb Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-27 09:12:22 -05:00
Tyler Hobbs 40cef770d0 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-27 09:11:57 -05:00
Stefania Alborghetti 78810f2550 cqlsh: Fix NULL option in COPY cmds after CASS-10415 
Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-10577
 2015-10-27 09:10:10 -05:00
blerer a639808688 Merge branch cassandra-2.2 into cassandra-3.0 2015-10-23 09:44:01 +02:00
blerer a5053fd944 Add a check to cqlsh to require Python-2.7 
patch by Benjamin Lerer; reviewed by Stefania Alborghetti for CASSANDRA-10561
 2015-10-23 09:39:31 +02:00
Joshua McKenzie f807b8c6ed Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-19 15:11:43 -04:00
Joshua McKenzie 728f94e798 Make Windows -a startup skip VerifyPorts check entirely 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
 2015-10-19 15:11:07 -04:00
Joshua McKenzie 5f5e9602df Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 14:44:24 -04:00
Joshua McKenzie 78753263e5 Add -a option to skip TIME_WAIT port check on Windows startup 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10524
 2015-10-14 14:43:32 -04:00
Aleksey Yeschenko 174cea0091 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 16:39:24 +01:00
Aleksey Yeschenko 50da872f20 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 16:38:19 +01:00
Aaron Ploetz 3c0a1a5c1a (cqlsh) allow custom time_format for COPY TO 
patch by Aaron Ploetz; reviewed by Carl Yeksigian for CASSANDRA-8970
 2015-10-14 16:35:50 +01:00
Aleksey Yeschenko 6d0c96c4d6 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-10-14 15:22:49 +01:00
Aleksey Yeschenko 751e4f9e0d Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-14 15:21:08 +01:00
Carl Yeksigian 626ac94cd5 (cqlsh) show partial trace if incomplete after max_trace_wait 
patch by Carl Yeksigian; reviewed by Paulo Motta for CASSANDRA-7645
 2015-10-14 15:16:31 +01:00
Tyler Hobbs 89596682e8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-10-13 11:21:31 -05:00
Stefania Alborghetti a85afbc7a8 Update cqlsh COPY for new driver conn interface 
Patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10507
 2015-10-13 11:18:55 -05:00
Philip Thompson 22099addaf Cleanup whitespace for cqlsh PEP8 compliance 
patch by philipthompson; reviewed by Stefania for CASSANDRA-10455
 2015-10-07 10:20:52 +02:00
Robert Stupp 66c185d1a6 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-29 13:23:46 +02:00
Robert Stupp 13b4bb41c7 cqlsh prompt includes name of keyspace after failed `use` statement 
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10369
 2015-09-29 13:22:21 +02:00
Sylvain Lebresne c38235d7cf Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-29 11:54:00 +02:00
Sylvain Lebresne 4595ec03f0 Configurable page size in cqlsh 
patch by enigmacurry; reviewed by philipthompson for CASSANDRA-9855
 2015-09-29 11:52:22 +02:00
Paulo Motta e25453ba55 Moved crc_check_chance out of compression options 
Patch by Paulo Motta; reviewed by Sam Tunnicliffe for CASSANDRA-9839
 2015-09-19 11:38:55 +01: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
Stefania Alborghetti b4544846de Update cqlsh COPY for new internal driver serialization interface 
Patch by Stefania Alborghetti; reviewed by Adam Holmberg for CASSANDRA-10318
 2015-09-15 13:26:47 -04: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 55fb5cdf1c Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-09 17:17:52 -05:00
Tyler Hobbs b2b756013a Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-09 17:16:29 -05:00
Adam Holmberg acc08aeca4 cqlsh: Fix error when starting cqlsh with --debug 
Patch by Adam Holmberg; reviewed by Philip Thompson for CASSANDRA-10282
 2015-09-09 17:14:52 -05:00
blerer 6dd2413f89 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-04 21:37:41 +02:00
blerer 464ca14aa8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-04 21:35:19 +02:00
Paulo Motta acdbdc28c4 Make cqlsh handle CREATE KEYSPACE timeouts properly 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9689
 2015-09-04 21:28:25 +02:00
Joshua McKenzie e9c0e1787e Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-03 12:42:04 -04:00
Joshua McKenzie e1fc0e0671 Fix failure to start with space in directory name on Windows 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
 2015-09-03 12:39:43 -04:00
Jonathan Ellis 98f414fc98 merge from 2.2 2015-08-24 19:51:59 -05:00
Jonathan Ellis b204803274 add CLEAR cqlsh command 
patch by Paul O'Fallon; reviewed by Stefania for CASSANDRA-10086
 2015-08-24 19:51:23 -05:00
Joshua McKenzie a3d9e6c479 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-24 12:44:34 -04:00
Joshua McKenzie 2d477a4cc2 Speed up launch scripts on Windows 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9615
 2015-08-24 12:44:00 -04:00
Joshua McKenzie cb8ff5d3a9 ninja: remove extra print output from nodetool.bat 2015-08-19 13:42:07 -04:00
Stefania Alborghetti 5726625a5c Improve transaction log under FS corruption 
To address concerns with recovery from file system
failures, we consolidate the new and old log
files into a single file, introduce checksums to the
file, and record on-disk sstable state to permit
validation of the log file on restart. This permits
us to be pessimistic in the case of any failure,
leaving all affected files on disk.

patch by stefania; reviewed by benedict for CASSANDRA-7066
 2015-08-17 10:20:01 +01:00
Joshua McKenzie b294058b67 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 15:23:27 -04:00
Joshua McKenzie 58bee04ccb Return %ERRORLEVEL% in nodetool.bat 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10078
 2015-08-14 15:22:50 -04:00
Joshua McKenzie 1288427669 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-08-14 11:50:40 -04:00
Joshua McKenzie 10be826e7a ninja remove unnecessary prints from Windows startup scripts 2015-08-14 11:49:32 -04:00
Tyler Hobbs 381cf568c9 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-08-14 10:46:08 -05:00
Tyler Hobbs da3a5a7fa2 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-08-14 10:45:09 -05:00
Paulo Motta 7a6a5097a3 cqlsh: specify encoding w/ command line option 
Patch by Paulo Motta; reviewed by Tyler Hobbs for CASSANDRA-10004
 2015-08-14 10:40:58 -05:00
Tyler Hobbs 10e4781a35 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-08-07 15:35:17 -05:00
Tyler Hobbs 8ffeebff63 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2015-08-07 15:34:16 -05:00
David Kua 34193ee766 cqlsh: Avoid overwriting config with old config 
Patch by David Kua; reviewed by Tyler Hobbs for CASSANDRA-9777
 2015-08-07 15:30:59 -05:00
Joshua McKenzie 4d1b3d2687 Merge branch 'cassandra-2.2' into trunk 2015-08-03 14:53:21 -04:00
Paulo Motta 4765cd6f17 Add sstableofflinerelevel.bat and sstablelevelreset.bat 
Patch by pmotta; reviewed by pthompson for CASSANDRA-9942
 2015-08-03 14:52:23 -04:00
Joshua McKenzie 3d3628b1d3 Merge branch 'cassandra-2.2' into trunk 2015-08-03 14:43:47 -04:00
Paulo Motta 31c1958e2c Fix incorrect return code on SSTableVerify.bat 
Patch by pmotta; reviewed by pthompson for CASSANDRA-9941
 2015-08-03 14:43:15 -04:00
Stefania Alborghetti b09e60f72b Introduce safer durable sstable membership management 
(and simplify cleanup of compaction leftovers)

Instead of using temporary files and system tables,
this patch introduces a simple transaction log for sstable
membership edits that can be committed/aborted atomically
and simply replayed on startup.

patch by stefania; reviewed by benedict for CASSANDRA-7066
 2015-07-24 14:41:51 +01:00
Joshua McKenzie 1f5c4f7ba5 Merge branch 'cassandra-2.2' into trunk 2015-07-23 13:24:53 -04:00
Joshua McKenzie 9ad133097b Add logdir and storagedir to nodetool.bat 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-9696
 2015-07-23 13:23:55 -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
Joshua McKenzie fbf52e65f1 Merge branch 'cassandra-2.2' into trunk 2015-07-13 17:54:14 -04:00
Andrew Tolbert 052222615a On Windows, wait 30 seconds on stop-server then terminate 
Patch by Andrew Tolbert; reviewed by jmckenzie for CASSANDRA-9791
 2015-07-13 17:53:42 -04:00
Stefania Alborghetti 19c00f7212 Backport CASSANDRA-9601 to 2.1 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer; backported by
Tyler Hobbs for CASSANDRA-9601
 2015-07-09 12:29:53 -05:00
Mike Adamson c5f03a9883 cqlsh: fix DESCRIBE KEYSPACES 
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-9693
 2015-07-01 17:12:11 -05:00
Aleksey Yeschenko 89fdaabad1 Merge branch 'cassandra-2.2' into trunk 2015-07-01 19:06:27 +03:00
Stefania Alborghetti 96e7e62642 (cqlsh) Allow setting the initial connection timeout 
patch by Stefania Alborghetti; reviewed by Benjamin Lerer for
CASSANDRA-9601
 2015-07-01 19:04:56 +03:00
Aleksey Yeschenko c6f016cc97 Merge branch 'cassandra-2.2' into trunk 2015-06-30 19:35:15 +03:00
blerer 924d798a3e (cqlsh) Fix default CQL version 
patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-9688
 2015-06-30 19:33:12 +03:00
Sylvain Lebresne a991b64811 Storage engine refactor, a.k.a CASSANDRA-8099 
Initial patch, see ticket for details
 2015-06-30 12:47:01 +02:00
Marcus Eriksson d6f9555ba6 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	bin/cqlsh
 2015-06-26 08:21:06 +02:00
Stefania Alborghetti 5d9729bc9b Added support for DESCRIBE INDEX and DESCRIBE <objectname> 
Patch by Stefania Alborghetti; reviewed by Benjamin Lerer for CASSANDRA-7814
 2015-06-26 08:18:15 +02:00
Jason Brown f4449bd455 Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeProbe.java
 2015-06-25 10:45:02 -07:00
Jason Brown 628394a6fa Allow JMX over SSL directly from nodetool 
patch by Marcus Olsson, reviewed by jasobrown for CASSANDRA-9090
 2015-06-25 10:36:42 -07: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
Josh McKenzie 2e92cf8996 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-12 18:18:45 -04:00
Philip Thompson c1702b0b3c Fix ipv6 parsing on Windows startup 
Patch by Philip Thompson; reviewed by jmckenzie for CASSANDRA-9567
 2015-06-12 18:17:13 -04:00
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Jonathan Ellis c11644bbfb Merge branch 'cassandra-2.1' into cassandra-2.2 2015-06-01 10:27:55 -05:00
Jonathan Ellis 40c3ad6a0c merge from 2.0 2015-06-01 10:26:34 -05:00
Stefania Alborghetti b7adb03b41 Pass JVM_OPTS to standalone tools scripts, CASSANDRA-5969 2015-06-01 09:59:02 -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
Tyler Hobbs 1689e0adc7 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-05-15 11:44:38 -05:00
Tyler Hobbs 9f8c45d6d6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-15 11:41:25 -05:00
Carl Yeksigian 0b92967d30 cqlsh: Add LOGIN command to switch users 
Patch by Sachin Janani and Carl Yeksigian; reviewed by Tyler Hobbs for
CASSANDRA-7212
 2015-05-15 11:36:06 -05:00
Tyler Hobbs 5b61545315 Merge branch 'cassandra-2.1' into trunk 2015-05-05 14:46:06 -05:00
Tyler Hobbs 22527730d3 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-05-05 14:45:40 -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
Tyler Hobbs 840d9a6632 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	bin/cqlsh
 2015-04-21 12:24:47 -05:00
Tyler Hobbs 49c1dbdad4 Fix whitespace, unused imports and variables in cqlsh 2015-04-21 12:20:37 -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
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 f9693d542e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2015-04-07 16:27:52 -05:00
Tyler Hobbs cb8cb5f99d cqlsh: quote column names in COPY FROM inserts 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-9080
 2015-04-07 16:26:42 -05:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
 2015-04-01 11:11:53 -04:00
T Jake Luciani 150f827364 Merge branch 'cassandra-2.1.4-build' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	NEWS.txt
 2015-04-01 10:56:05 -04:00
T Jake Luciani 38a04eab6a Merge branch 'cassandra-2.0.14-build' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
 2015-04-01 10:45:51 -04:00
T Jake Luciani 2d7909dc12 New tool added to verify all data in sstables. 
Patch by Jeff Jirsa; reviewed by Branimir Lambov for CASSANDRA-5791
 2015-03-31 09:53:33 -04:00
T Jake Luciani 2433068c15 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:40:38 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Tyler Hobbs dadc206c6e Merge branch 'cassandra-2.1' into trunk 2015-03-24 11:43:06 -05:00