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

698 Commits

Author SHA1 Message Date
Joshua McKenzie 685140267e Merge branch 'cassandra-2.1' into trunk 2014-09-10 09:12:52 -07:00
Joshua McKenzie dbcc4eae6c Get Windows command-line flags in-line with linux 
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7748
 2014-09-10 09:10:52 -07: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
Joshua McKenzie 6cb1f0779a Merge branch 'cassandra-2.1' into trunk 2014-09-08 15:32:36 -05:00
Joshua McKenzie c1c3375361 Implement -f functionality in stop-server.bat 
patch by Philip Thompson; reviewed by Josh McKenzie for CASSANDRA-7901
 2014-09-08 15:30:20 -05: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
Brandon Williams ed0532c64c Merge branch 'cassandra-2.1' into trunk 2014-09-02 12:48:45 -05:00
Brandon Williams e75fe5c4f5 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-02 12:48:30 -05:00
Brandon Williams 82136e3b7e remove shuffle again 2014-09-02 12:47:55 -05:00
Mikhail Stepura b31787435a Merge branch 'cassandra-2.1' into trunk 2014-08-27 15:44:23 -07:00
Mikhail Stepura d01250d63a (cqlsh): Show progress of COPY operations. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7789
 2014-08-27 15:43:42 -07:00
Mikhail Stepura bc9dc0f0a0 Merge branch 'cassandra-2.1' into trunk 2014-08-21 19:57:54 -07:00
Aaron Ploetz 854aab79b7 (cqlsh) Display the current logged-in user 
patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7785
 2014-08-21 19:57:20 -07:00
Tyler Hobbs df9cac094c Merge branch 'cassandra-2.1' into trunk 2014-08-21 14:00:50 -05:00
Tyler Hobbs d088f02993 Use python driver for UDTs in DESCRIBE output 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7659
 2014-08-21 13:59:26 -05:00
Tyler Hobbs 9a4f6bdf05 Merge branch 'cassandra-2.1' into trunk 2014-08-21 11:55:35 -05:00
Tyler Hobbs d586ea8980 cqlsh: Fix handling of CAS statement results 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7671
 2014-08-21 11:54:47 -05:00
Tyler Hobbs b42a15b896 Merge branch 'cassandra-2.1' into trunk 2014-08-20 17:52:04 -05:00
Tyler Hobbs 1aea6d5917 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-08-20 17:51:40 -05:00
Tyler Hobbs c4191ed1c9 cqlsh: preserve original result column names 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7806
 2014-08-20 17:46:41 -05:00
Mikhail Stepura c69f257f9e Merge branch 'cassandra-2.1' into trunk 2014-08-19 13:23:30 -07:00
Mikhail Stepura a323a1a6d5 (cqlsh) COPY TO/FROM improvements 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7405
 2014-08-19 13:22:24 -07:00
Tyler Hobbs 96addeedf6 Merge branch 'cassandra-2.1' into trunk 2014-08-19 14:55:30 -05:00
Tyler Hobbs 3a03d4bd55 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-19 14:55:04 -05:00
Tyler Hobbs 94262c4390 cqlsh: fix COPY FROM handling of null/empty PK values 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7792
 2014-08-19 14:53:57 -05:00
Aleksey Yeschenko e7d65346c2 Merge branch 'cassandra-2.1' into trunk 2014-08-18 22:01:35 +03:00
Aleksey Yeschenko bc165174b0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-08-18 21:59:31 +03:00
Aleksey Yeschenko 36382e5472 (cqlsh) enable CTRL-R history search with libedit 
patch by Aleksey Yeschenko; reviewed by Jeremiah Jordan for
CASSANDRA-7577
 2014-08-18 21:52:19 +03:00
Mikhail Stepura 115bbe435b CQLSH: wait up to 10 sec for a tracing session. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7222
 2014-08-15 14:53:13 -07:00
Mikhail Stepura 2d044e82a9 Merge branch 'cassandra-2.1' into trunk 2014-08-14 15:14:12 -07:00
Mikhail Stepura 7a1b6b40f7 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-08-14 15:14:02 -07:00
Mikhail Stepura edb5f08833 Merge branch 'cassandra-2.1' into trunk 2014-08-14 14:33:17 -07:00
Robert Stupp 91e63d0546 Fixed the error when tracing query with cqlsh 
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
 2014-08-14 14:31:48 -07:00
Mikhail Stepura e7566609e2 cqlsh should automatically disable tracing when selecting from system_traces 
patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641
 2014-08-14 14:13:57 -07:00
Joshua McKenzie 384f873ce0 Prompt on missing dependency in cqlsh on Windows 
Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749
 2014-08-12 02:28:51 +03:00
Joshua McKenzie 70d9f895da Prompt on missing dependency in cqlsh on Windows 
Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749
 2014-08-11 15:30:19 -05:00
Mikhail Stepura 2809b06918 Merge branch 'cassandra-2.1' into trunk 2014-08-04 14:35:18 -07:00
Mikhail Stepura 1c1a40e10b Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-04 14:35:06 -07:00
Adam Holmberg 1c3de27376 cqlsh DESC CLUSTER fails retrieving ring information 
patch by Adam Holmberg; reviewed by mstepura for CASSANDRA-7687
 2014-08-04 14:34:27 -07:00
Mikhail Stepura be6cf8a325 Merge branch 'cassandra-2.1' into trunk 2014-08-02 17:09:11 -07:00
Mikhail Stepura 6b34d46c63 (cqlsh) Removed unused code for build number parsing 
patch by Mikhail Stepura; reviewed by  Jonathan Ellis for CASSANDRA-7524
 2014-08-02 17:08:18 -07:00
Jonathan Ellis 777384131b Merge branch 'cassandra-2.1' into trunk 2014-07-31 15:49:54 -05:00
Jonathan Ellis e3d5b98e48 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-31 15:49:47 -05:00
Jonathan Ellis abe85903b3 add cassandra.in.bat 2014-07-31 15:49:38 -05:00
Brandon Williams cf46e4454b Merge branch 'cassandra-2.1' into trunk 2014-07-31 15:13:57 -05:00
Brandon Williams da1f2dbb5e Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-31 15:13:48 -05:00
Brandon Williams 8e4415b697 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	bin/cassandra-shuffle.bat
 2014-07-31 15:13:37 -05:00
Brandon Williams 563a04bf98 remove shuffle bat 2014-07-31 15:12:28 -05:00
Tyler Hobbs bdffd3c63d Merge branch 'cassandra-2.1' into trunk 2014-07-30 16:00:43 -05:00
Tyler Hobbs 8d6b732684 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-30 15:59:27 -05:00
Tyler Hobbs 2107e30bdd Improve cqlsh waiting for a trace to complete 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7626
 2014-07-30 15:57:06 -05:00
Brandon Williams 440d236038 Remove shuffle/taketoken. 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
 2014-07-30 11:51:55 -05:00
Tyler Hobbs 57cecd96a2 Merge branch 'cassandra-2.1' into trunk 2014-07-29 16:01:58 -05:00
Tyler Hobbs 307f916172 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-07-29 16:01:20 -05:00
Tyler Hobbs 6843b556f3 Handle paged results in cqlsh 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7625
 2014-07-29 15:58:24 -05:00
Jonathan Ellis d5deba95d5 Merge branch 'cassandra-2.1' into trunk 2014-07-29 14:48:52 -05:00
Jonathan Ellis 5c47d8ae10 fix broken merge 2014-07-29 14:48:44 -05:00
Brandon Williams b44bbb83aa Merge branch 'cassandra-1.2' into cassandra-2.0 2014-07-29 13:58:27 -05:00
Brandon Williams 249bbfc3b2 Handle KeyboardInterrupt properly in cqlsh 
Patch by Jordon Pittier, reviewed by brandonwilliams for CASSANDRA-5481
 2014-07-29 13:57:42 -05:00
Jonathan Ellis aa25f67eaf Merge branch 'cassandra-2.1' into trunk 2014-07-25 17:26:05 -05:00
Jonathan Ellis ef9473a039 merge from 2.1.0 2014-07-25 17:25:59 -05:00
Jonathan Ellis 6f15fe2609 update .ps1 line endings to CRLF 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7627
 2014-07-25 17:24:07 -05:00
Jonathan Ellis 3e489dad7d Clean up Windows batch scripts 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619
 2014-07-25 17:23:11 -05:00
Tyler Hobbs 6477fa95fe Merge branch 'cassandra-2.1' into trunk 2014-07-25 14:27:47 -05:00
Tyler Hobbs 3fc8bb1edf Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 14:27:12 -05:00
Tyler Hobbs 83b3f13061 Set -Dcassandra.storagedir for all tool shell scripts 
Patch by Tyler Hobbs; review by Joshua McKenzie for CASSANDRA-7587
 2014-07-25 14:26:18 -05:00
Tyler Hobbs 45983497fd Merge branch 'cassandra-2.1' into trunk 2014-07-25 13:06:45 -05:00
Tyler Hobbs 192f693b5c Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-25 13:05:46 -05:00
Tyler Hobbs 5001b382ed Fix cqlsh deserialization of blobs 
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7603
 2014-07-25 13:05:02 -05:00
Brandon Williams 6076f8ff32 Merge branch 'cassandra-2.1' into trunk 2014-07-23 13:14:37 -05:00
Brandon Williams f9fc846e9b Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-07-23 13:14:28 -05:00
Brandon Williams cfedc0075d cqlsh: fix message when zero rows are returned 
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7580
 2014-07-23 13:12:44 -05:00
Jonathan Ellis 82d819920a Merge branch 'cassandra-2.1' into trunk 2014-07-17 15:57:08 -05:00
Jonathan Ellis 14151a40b1 colorize PK + clustering differently 
patch by Mihai Seteu; reviewed by Robert Stupp for CASSANDRA-6910
 2014-07-17 15:57:01 -05:00
Tyler Hobbs 1a58ecc266 Merge branch 'cassandra-2.1' into trunk 2014-07-17 14:45:31 -05:00
Tyler Hobbs e64c301dd3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-17 14:45:07 -05:00
Tyler Hobbs e4b40c75c0 Fix cqlsh authentication with 2.1 python driver 
Patch by Mike Adamson; reviewed by Tyler Hobbs for CASSANDRA-7564
 2014-07-17 14:43:47 -05:00
Jonathan Ellis 41a91e9a10 Merge branch 'cassandra-2.1' into trunk 2014-07-17 12:05:05 -05:00
Jonathan Ellis 22f811e3b5 add support for arbitrary -D options to .ps1 script 
patch by Joshua McKenzie; reviewed by Philip Thompson for CASSANDRA-7435
 2014-07-17 12:05:00 -05:00
Tyler Hobbs 14826794c3 Merge branch 'cassandra-2.1' into trunk 2014-07-16 11:57:48 -05:00
Tyler Hobbs d2ae187c7d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-16 11:57:23 -05:00
Tyler Hobbs 88e05719b6 Update cqlsh python driver to 2.1 
Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
 2014-07-16 11:56:29 -05:00
Tyler Hobbs 6319dc804f Bump CQL version to 3.2.0 and update CQL docs 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
 2014-07-15 18:20:08 -05:00
Tyler Hobbs fbe9630d01 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-15 18:19:07 -05:00
Tyler Hobbs e60b4e6d1d Bump CQL version to 3.2.0 and update CQL docs 
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
 2014-07-15 18:18:15 -05:00
Jonathan Ellis 4619628669 Merge branch 'cassandra-2.1' into trunk 2014-07-14 07:48:24 -05:00
Jonathan Ellis 0396efc410 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-14 07:48:14 -05:00
Jonathan Ellis 9460503713 improve Windows launch scripts 
patch by Ala' Alkhaldi and Josh McKenzie for CASSANDRA-7503
 2014-07-14 07:48:03 -05:00
Mikhail Stepura c61a7e4704 Merge branch 'cassandra-2.1' into trunk 2014-07-12 14:21:08 +11:00
Ryan McGuire 37abae6c32 Configurable client timeout for cqlsh. 
patch by Ryan McGuire; reviewed by Mikhail Stepura for CASSANDRA-7516
 2014-07-12 14:20:49 +11:00
Jonathan Ellis cae3cb2a95 Merge branch 'cassandra-2.1' into trunk 2014-07-08 17:51:59 -05:00
Jonathan Ellis 895eaecc3d support direct run of .ps1 file w/out batch file 
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7517
 2014-07-08 17:51:12 -05:00
Jonathan Ellis 968810e50f Merge branch 'cassandra-2.1' into trunk 2014-07-07 00:13:57 -05:00
Jonathan Ellis 547cf1d10d merge from 2.0 2014-07-07 00:13:44 -05:00
Jonathan Ellis a14211fbd1 Workaround JVM NPE on JMX bind failure 
patch by Brandon Williams; reviewed by tjake for CASSANDRA-7254
 2014-07-07 00:12:57 -05:00
Jonathan Ellis 8e7ed61754 merge from 2.1.0 2014-06-27 11:09:06 -05:00
Jonathan Ellis b8ee9da1e8 (Windows) handle spaces in path names 
patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451
 2014-06-27 11:07:47 -05:00
Tyler Hobbs c656ffe4d3 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-06-25 09:54:20 -05:00
Mikhail Stepura 66e1e46109 Fix CompositeType columns in DESCRIBE TABLE output 
Patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7399
 2014-06-25 09:52:08 -05:00
Benedict Elliott Smith cdf08084d4 Merge branch 'cassandra-2.1' into trunk 2014-06-23 16:57:01 +01:00
Sylvain Lebresne 1e6493083f Fix cqlsh DESC with CompositeType 
explanation

patch by mstepura; reviewed by thobbs for CASSANDRA-7399
 2014-06-23 17:50:08 +02:00
Mikhail Stepura 640c9d4a38 Merge branch 'cassandra-2.1' into trunk 2014-06-19 15:16:52 +11:00
Mikhail Stepura c4e09469dc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-19 15:16:41 +11:00
Mikhail Stepura dd87228072 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2014-06-19 15:16:28 +11:00
Mihai Suteu b25ddd8a7f cqlsh: ignore .cassandra permission errors 
patch by Mihai Suteu; reviewed by Mikhail Stepura for CASSANDRA-7266
 2014-06-19 15:14:54 +11:00
Jonathan Ellis 340ce90e92 Merge branch 'cassandra-2.1' into trunk 2014-06-18 14:01:11 -05:00
Jonathan Ellis d6322a7ec2 fix heap size on Windows 32bit VM 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353
 2014-06-18 14:01:04 -05:00
Jonathan Ellis bafde3d66c Merge branch 'cassandra-2.1' into trunk 2014-06-12 15:05:58 -05:00
Jonathan Ellis b9153f4ae5 Modify system tcp keepalive settings in Windows install scripts 
patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348
 2014-06-12 15:05:04 -05:00
Tyler Hobbs c844081090 Merge branch 'cassandra-2.1' into trunk 2014-06-05 15:40:10 -05:00
Tyler Hobbs 60be74230e Use $CASSANDRA_HOME for default paths instead of /var 
Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
 2014-06-05 15:38:41 -05:00
Mikhail Stepura f28bc63ec7 Merge branch 'cassandra-2.1' into trunk 2014-06-03 13:36:27 -07:00
Mikhail Stepura 13198c7bcb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-06-03 13:36:17 -07:00
Mikhail Stepura a39f4ea729 Ninja: typo in cqlsh 2014-06-03 13:35:55 -07:00
Mikhail Stepura e91bf8f3ea Merge branch 'cassandra-2.1' into trunk 2014-05-30 11:00:14 -07:00
Mikhail Stepura 8436ee6166 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-30 11:00:05 -07:00
Mikhail Stepura e2c74d5655 cqlsh: Count only empty lines for a "Blank lines" warning. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
 2014-05-30 10:52:20 -07:00
Brandon Williams cfc37519e3 Merge branch 'cassandra-2.1' into trunk 2014-05-29 10:26:06 -05:00
Brandon Williams e4090f10e5 Move less common tools into a new cassandra-tools package. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7160
 2014-05-29 10:24:27 -05:00
Mikhail Stepura b25cac40e9 Merge branch 'cassandra-2.1' into trunk 2014-05-28 15:14:58 -07:00
Mikhail Stepura 3391b99a0b cqlsh: Handle collections embedded into UDTs correctly. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
 2014-05-28 15:14:25 -07:00
Patrick McFadin 6faf80c9d2 cqlsh: always emphasize the partition key in DESC output 
patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
 2014-05-25 18:14:39 +03:00
Tyler Hobbs deee02c538 Merge branch 'cassandra-2.1' into trunk 2014-05-23 16:32:12 -05:00
Tyler Hobbs e0502ea298 Bump cqlsh default CQL version to 3.1.7 
Follow up for CASSANDRA-6875
 2014-05-23 16:31:20 -05:00
Mikhail Stepura c6eaffc2a1 Merge branch 'cassandra-2.1' into trunk 2014-05-21 13:28:48 -07:00
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
 2014-05-21 13:27:55 -07:00
Jonathan Ellis b5671f08b5 Merge branch 'cassandra-2.1' into trunk 2014-05-14 09:10:01 -07:00
Jonathan Ellis 1927d5ec72 Add PowerShell Windows launch scripts 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7001
 2014-05-14 09:09:51 -07:00
Mikhail Stepura 211d81c24d Merge branch 'cassandra-2.1' into trunk 2014-05-08 15:34:33 -07:00
Mikhail Stepura 56136946a7 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-05-08 15:22:17 -07:00
Mikhail Stepura d48c797f77 cqlsh: Accept and execute CQL statement(s) from command-line parameter 
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7172
 2014-05-08 15:13:08 -07:00
Mikhail Stepura 310d6e4efb Merge branch 'cassandra-2.1' into trunk 2014-05-08 13:33:00 -07:00
Mikhail Stepura a0d096b036 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-08 13:32:40 -07:00
Mikhail Stepura 51f9e9804d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	bin/cqlsh
 2014-05-08 13:31:03 -07:00
Mikhail Stepura 8abe9f6f52 cqlsh should return a non-zero error code if a query fails 
patch by Branden Visser and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-6344
 2014-05-08 13:27:41 -07:00
Brandon Williams c7fb27abc4 Merge branch 'cassandra-2.1' into trunk 2014-05-05 14:23:51 -05:00
Brandon Williams 07dfb58adc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-05 14:23:44 -05:00
Brandon Williams f52457036d Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-05 14:23:35 -05:00
Brandon Williams 64394b2526 remove stray bat file 2014-05-05 14:23:27 -05:00
Mikhail Stepura f3945bce7a Merge branch 'cassandra-2.1' into trunk 2014-05-03 23:31:03 -07:00
Mikhail Stepura a5266bc077 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	bin/cqlsh
 2014-05-03 23:30:22 -07:00
Mikhail Stepura e9bdb6a95c Issue a warning after 3 empty lines in statement 
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-7142
 2014-05-03 23:26:40 -07:00
Dave Brosius c073fab77d bump cqlsh's DEFAULT_CQLVER to 3.1.6 2014-04-24 08:56:25 -04:00
Dave Brosius acdbbb9340 Merge branch 'cassandra-2.1' into trunk 2014-04-23 23:06:49 -04:00
Dave Brosius 8cf97db307 bump cqlsh's DEFAULT_CQLVER to 3.1.6 2014-04-23 23:06:16 -04:00
Mikhail Stepura 13d3a47461 cqlsh: Updated CQL3 parser to support functions and BLOB literals 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7018
 2014-04-18 18:01:41 -07:00
Mikhail Stepura 189d51f048 Merge branch 'cassandra-2.1' into trunk 2014-03-27 11:57:00 -07:00
Mikhail Stepura 20bc92463a Ninja: don't close the connection you don't own (after SOURCE command) 2014-03-27 11:56:32 -07:00
Vijay fbc112d4b5 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2014-03-22 19:27:17 -07:00
Mikhail Stepura 2e48e0c43a Merge branch 'cassandra-2.1' into trunk 2014-03-21 11:45:42 -07:00
Mikhail Stepura 35b7da4d0d Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	bin/cqlsh
 2014-03-21 11:45:19 -07:00
J.B. Langston 37b9410675 Make cqlsh prompt for a password if the user doesn't enter one. 
patch by J.B. Langston; reviewed by Mikhail Stepura for CASSANDRA-6902
 2014-03-21 11:42:06 -07:00
Mikhail Stepura 3acba5bbad Merge branch 'cassandra-2.1' into trunk 2014-03-18 21:15:56 -07:00
Mikhail Stepura a490d7efa7 Ninja-commit to suppress blist-related warnings in cqlsh 2014-03-18 21:15:24 -07:00
Dave Brosius b78cf8bee4 fix path variable 2014-03-15 00:35:27 -04:00
Mikhail Stepura f49df8c9b0 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-13 14:07:15 -07:00
Mikhail Stepura 3dcc8c25e5 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-13 14:07:04 -07:00
Shiti Saxena 972d3da2e8 Delimiter not working for special characters in COPY command from CQLSH 
patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773
 2014-03-13 14:06:51 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver 
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
 2014-03-12 15:02:14 -07:00
Mikhail Stepura e2a719ad0d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-04 11:51:38 -08:00
Mikhail Stepura b07f4b8c77 Handle static columns in cqlsh. 
Patch by Mikhail Stepura for CASSANDRA-6703; reviewed by Aleksey Yeschenko
 2014-03-04 11:47:58 -08:00
Mikhail Stepura ce2bbcbf02 Return an empty meta object instead of None. 
Patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6741
 2014-02-19 14:43:14 -08:00
Aleksey Yeschenko 41433073f6 Merge branch 'cassandra-2.0' into trunk 2014-02-15 04:07:12 +03:00
Aleksey Yeschenko bbc56eb60d cqlsh: fix BATCH CAS result printing (for once #6561 is committed) 2014-02-15 04:03:10 +03:00
Mikhail Stepura e5199eeac1 User types support for cqlsh. 
Patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-6305
 2014-02-14 10:55:32 -08:00
Marcus Eriksson e5ff1075c3 Update to jamm-0.2.6 2014-01-31 15:46:35 +01:00
Jonathan Ellis 0a89f3826d update nodetool.bat for #6381 2014-01-12 09:01:37 -06:00
Jonathan Ellis 892d8e699c refactor nodetool, encapsulating each command into a subclass 
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
 2014-01-10 12:12:34 -06:00
Brandon Williams 379212d5de Fix logback config in scripts and packaging. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
 2014-01-10 09:31:12 -06:00
Aleksey Yeschenko 5fa6055107 Allow specifying custom secondary index options in CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6480
 2014-01-07 18:03:37 +03:00
Brandon Williams ca7335e651 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-12 12:04:56 -06:00
Brandon Williams 79f7d6baff Set javaagent for tools. 
Patch by Sam Tunnecliffe, reviewed by brandonwilliams for CASSANDRA-6404
 2013-12-12 12:04:01 -06:00
Aleksey Yeschenko b68719524e cqlsh: hanlde symlinks properly 
patch by Yinyin L; reviewed by Aleksey Yeschenko for CASSANDRA-6425
 2013-12-01 20:17:56 +03:00
Brandon Williams 2cc4670acd Merge branch 'cassandra-1.2' into cassandra-2.0 2013-11-11 11:54:04 -06:00
Brandon Williams 512ea5a768 Add echo off to cqlsh.bat 
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6324
 2013-11-11 11:52:58 -06:00
Brandon Williams 830711c724 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-30 15:05:36 -05:00
Brandon Williams b461c3bfad Nodetool gets default JMX port from cassandra-env.sh 
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6273
 2013-10-30 15:05:02 -05:00
Aleksey Yeschenko 18260c5f2c cqlsh: fix LIST USERS output 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6242
 2013-10-26 15:31:47 +03:00
Dave Brosius 3dc4e65637 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-25 00:19:11 -04:00
Dave Brosius 08a22729af assume python is on path for windows for cqlsh.bat 
patch by mstepura reviewed by dbrosius for cassandra-6145
 2013-10-25 00:14:30 -04:00
Sylvain Lebresne 22e67be8fe Fix license 2013-10-24 09:15:58 +02:00
Aleksey Yeschenko 941cd456ae cqlsh: add SHOW SESSION <tracing-session> command 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6228
 2013-10-23 22:35:14 +08:00
Dave Brosius e30810ebb4 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-22 21:25:34 -04:00
Dave Brosius de526610b3 add windows bat files for shell commands 
patch by sdelmas reviewed by dbrosius for CASSANDRA-6145
 2013-10-22 21:12:35 -04:00
Aleksey Yeschenko 12413ad1f8 Backport CASSANDRA-6196 to 1.2 
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
 2013-10-22 14:22:13 +08:00
Aleksey Yeschenko 20f1b816b3 cqlsh: ignore empty 'value alias' in DESCRIBE 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6139
 2013-10-21 23:14:37 +08:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jason Brown c9528f9c9c apply local_one changes to 2.0 2013-10-16 15:44:33 -07:00
Eric Evans 36ed511a68 Search Solaris-alternate path for Java binary 
Patch by eevans for CASSANDRA-4638
 2013-09-30 09:56:54 -05:00
Aleksey Yeschenko 997c49a3a7 cqlsh: return the result of CAS writes 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5796
 2013-09-18 22:48:41 +03:00
Eric Evans 56008de459 refactor init script to use start-stop-daemon 
Patch by eevans; reviewed by brandon.williams for CASSANDRA-3991
 2013-08-23 09:55:48 -05:00
Dave Brosius ed79c14399 Merge branch 'cassandra-2.0.0' into cassandra-2.0 2013-08-22 21:18:53 -04:00
Dave Brosius af9c7074ff Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-22 21:16:53 -04:00
Dave Brosius ddb501df40 fix nodetool getendpoints when the key has a space in it 
patch by gdeangelis reviewed by dbrosius for CASSANDRA-4551
 2013-08-22 21:13:24 -04:00
Sylvain Lebresne 05929c05cd Merge branch 'cassandra-2.0.0' into cassandra-2.0 2013-08-22 10:18:36 +02:00
Sylvain Lebresne 624a7a02f8 Merge branch 'cassandra-1.2' into cassandra-2.0.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionTask.java
 2013-08-22 10:17:54 +02:00
Sylvain Lebresne 39066b7226 Add SSTableSplitter tool to split sstables offline 
patch by slebresne; reviewed by krummas for CASSANDRA-4766
 2013-08-22 10:08:10 +02:00
Aleksey Yeschenko b362aebd30 Add ability for CQL3 to list partition keys 
patch by Aleksey Yeschenko and Dan Jatnieks;
reviewed by Sylvain Lebresne for CASSANDRA-4536
 2013-08-21 19:09:58 +03:00
Aleksey Yeschenko 41409770d4 cqlsh: add support for multiline comments 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5798
 2013-08-16 21:46:42 +03:00
Aleksey Yeschenko 09a4dc0552 cqlsh: add DESCRIBE FULL SCHEMA variant 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5880
 2013-08-12 17:06:14 +02:00
Aleksey Yeschenko 703bd684ca Fix (some) 2i on composite components omissions 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5851
 2013-08-12 12:55:56 +02:00
Jason Brown e01c238fa1 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2013-07-31 11:24:41 -07:00
Jason Brown ba274adb7a nodetool history logging 
patch by jasobrown; reviewed by Dave Brosius for CASSANDRA-5823
 2013-07-31 11:14:36 -07:00
Aleksey Yeschenko 308afb20be Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
 2013-07-27 04:45:02 +03:00
Aleksey Yeschenko 187f73f897 cqlsh: correct the rest of libedit detection on windows 2013-07-27 04:43:40 +03:00
Aleksey Yeschenko af4e1275ed cqlsh: fix crashing on Windows due to libedit detection 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5812
 2013-07-27 04:36:49 +03:00
Aleksey Yeschenko 1810af404c cqlsh: add collections support to COPY 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5698
 2013-07-25 21:44:40 +03:00
Aleksey Yeschenko c4c04e780e Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
 2013-07-18 23:43:58 +03:00
Aleksey Yeschenko 01b881cb22 cqlsh: handle disabled compression in DESCRIBE output 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5766
 2013-07-18 23:42:14 +03:00
Aleksey Yeschenko 3828cc5195 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
 2013-07-15 18:38:16 +03:00
Aleksey Yeschenko f79a2d3a6f cqlsh: handle CUSTOM 2i in DESCRIBE output 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5760
 2013-07-15 18:35:33 +03:00
Jonathan Ellis b2eec795c9 Merge branch 'cassandra-1.2' into trunk 2013-07-13 16:15:12 -05:00
Jonathan Ellis fa327aa699 add cassandra-shuffle.bat 2013-07-13 16:15:01 -05:00
Eric Evans a307c17499 Merge branch '1.2' into trunk 
Conflicts:
	bin/cassandra
	bin/cassandra-cli
	bin/json2sstable
	bin/nodetool
	bin/sstable2json
	bin/sstablekeys
	bin/sstableloader
 2013-07-08 15:25:00 -05:00
Eric Evans 909b2ed1a9 scripts fail when paths contain whitespace 
Patch by Amichai Rothman; Reviewed by eevans for CASSANDRA-5338
 2013-07-08 14:20:40 -05:00
Aleksey Yeschenko 9c0ca5d603 Merge branch 'cassandra-1.2' into trunk 2013-07-03 00:13:03 +03:00
Aleksey Yeschenko 56c9d2ff26 cqlsh: make C* version handling more flexible 2013-07-03 00:12:34 +03:00
Aleksey Yeschenko e4050e609c cqlsh: Don't show 'null' in place of empty values 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5675
 2013-06-27 01:03:07 +03:00
Aleksey Yeschenko f89784339c Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
	pylib/cqlshlib/test/test_cqlsh_output.py
	pylib/cqlshlib/test/test_keyspace_init2.cql
 2013-06-27 01:01:18 +03:00
Aleksey Yeschenko 340a66891c cqlsh: Don't show 'null' in place of empty values 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5675
 2013-06-27 00:36:46 +03:00
Jonathan Ellis b9de5de235 merge from 1.2 2013-06-20 13:56:04 -05:00
Brandon Williams 3814af8087 Add standalone sstableupgrade utility. 
Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-5524
 2013-06-20 13:15:54 -05:00
Aleksey Yeschenko 2397bc8c33 Updated CREATE CUSTOM INDEX syntax 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5639
 2013-06-18 17:20:59 +03:00
Aleksey Yeschenko 629abfb52d cqlsh: Add row count to SELECT output 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5636
 2013-06-15 01:53:40 +03:00
Brandon Williams 0f09cc5a1b Merge branch 'cassandra-1.2' into trunk 2013-06-13 19:22:54 -05:00
Brandon Williams f51c962ed0 Make shuffle +x 2013-06-13 19:22:47 -05:00
Aleksey Yeschenko ccc87fb30f Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
 2013-06-04 01:00:14 +03:00
Aleksey Yeschenko 46273c4dd4 cqlsh: fix COPY FROM with ReversedType 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5610
 2013-06-04 00:58:31 +03:00
Aleksey Yeschenko 4f7e2b8018 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
	pylib/cqlshlib/test/test_cqlsh_completion.py
	pylib/cqlshlib/test/test_cqlsh_output.py
 2013-05-29 21:12:08 +03:00
Aleksey Yeschenko 26c65e640c cqlsh: add vertical output option (see EXPAND) 
patch by Michał Michalski; reviewed by Aleksey Yeschenko for
 CASSANDRA-5597
 2013-05-29 21:01:58 +03:00
Aleksey Yeschenko 83b62421ea Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
 2013-05-25 04:09:51 +03:00
Aleksey Yeschenko 67e57a974f cqlsh: add custom prompt support 
patch by Cyril Scetbon; reviewed by Aleksey Yeschenko for CASSANDRA-5539
 2013-05-25 04:08:16 +03:00
Aleksey Yeschenko f3d2a52b99 cqlsh: ninja-fix DROP INDEX autocompletion for CQL3 tables (2.0) 2013-05-22 02:53:18 +03:00
Aleksey Yeschenko b53d3c453b Merge branch 'cassandra-1.2' into trunk 2013-05-22 02:35:34 +03:00
Aleksey Yeschenko 687ac710cc cqlsh: ninja-fix DROP INDEX autocompletion for CQL3 tables 2013-05-22 02:34:44 +03:00
Aleksey Yeschenko 7f6ac19efb cqlsh: drop CQL2/CQL3-beta support 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5585
 2013-05-22 00:47:44 +03:00
Aleksey Yeschenko c70740fbc4 Merge branch 'cassandra-1.2' into trunk 2013-05-15 16:07:46 +03:00
Aleksey Yeschenko 384c27c356 cqlsh: fix DESCRIBE after case insensitive USE 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5567
 2013-05-15 16:06:31 +03:00
Brandon Williams 42dc743d61 Merge branch 'cassandra-1.2' into trunk 2013-05-14 14:09:22 -05:00
Brandon Williams 14139455a5 sstablescrub respects MAX_HEAP_SIZE 
Patch by Mina Naguib, reviewed by brandonwilliams for CASSANDRA-5562
 2013-05-14 14:08:12 -05:00
Aleksey Yeschenko 3ca160ea72 Merge branch 'cassandra-1.2' into trunk 2013-05-07 16:45:51 +03:00
Aleksey Yeschenko 29ad6bdca6 cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning 2013-05-07 16:44:22 +03:00
Aleksey Yeschenko 08df0b8604 Add alias support to SELECT statement 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5075
 2013-05-06 23:11:52 +03:00
Aleksey Yeschenko b505b90a88 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	NEWS.txt
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
 2013-05-03 19:38:41 +03:00
Aleksey Yeschenko 64c0d1e7d5 Add custom secondary index support to CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5484
 2013-05-03 17:59:33 +03:00
Aleksey Yeschenko 5917281000 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
 2013-05-01 20:03:26 +03:00
Aleksey Yeschenko 24f6387bcd cqlsh: add CLUSTERING ORDER BY support to DESCRIBE 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5528
 2013-05-01 19:42:55 +03:00
Aleksey Yeschenko dfca30cb31 Merge branch 'cassandra-1.2' into trunk 2013-04-04 22:00:16 +03:00