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

188 Commits

Author SHA1 Message Date
Brandon Williams f8129b4356 cqlsh: support moving CL to the protocol level 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4823
 2012-10-19 14:11:53 -05:00
Brandon Williams 2d83cfc2bb cqlsh: use libedit when readline is not available, if possible 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3597
 2012-10-15 12:31:51 -05:00
Brandon Williams 4d2e5e73b1 cqlsh: use libedit when readline is not available, if possible 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3597
 2012-10-15 12:29:40 -05:00
Brandon Williams 596d54c27e cqlsh: fix copy to/from for cql3 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4674
 2012-10-15 12:26:20 -05:00
Brandon Williams ed6d24e592 cqlsh: enable tracing 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4584
 2012-10-09 12:46:55 -05:00
Brandon Williams c44af8c2c5 cqlsh: allow configuration of value display formats 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3756
 2012-10-09 10:06:46 -05:00
Brandon Williams 9d7fba9899 cqlsh: allow configuration of value display formats 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-3756
 2012-10-09 10:05:31 -05:00
Jonathan Ellis f0fcc4cd87 Revert "cqlsh: add thrift transport factory" 
This reverts commit 3f31642c39.
 2012-10-09 09:35:45 -05:00
Brandon Williams 2f979ed60f cqlsh: update recognized syntax 
Patch by paul cannon and Aleksey Yeschenko, reviewed by brandonwilliams
for CASSANDRA-4488
 2012-10-08 11:17:26 -05:00
Brandon Williams 3f31642c39 cqlsh: add thrift transport factory 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4610
 2012-10-04 10:08:35 -05:00
Brandon Williams 1c2922c223 cqlsh: add thrift transport factory imeplementation 
Patch by Aleksey Yeschenko, reviewed brandonwilliams
 2012-10-04 10:04:43 -05:00
Brandon Williams 2edeeeba2d Merge branch 'cassandra-1.1' into trunk 2012-09-26 10:08:32 -05:00
Brandon Williams 4c45288790 cqlsh: alphabetize help 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4034
 2012-09-26 09:59:55 -05:00
Brandon Williams 09d3e7f7f7 Missing commit from 4594 merge. 2012-09-18 13:47:56 -05:00
paul cannon ebd60fb74d cqlsh: update DESCRIBE support for collections 2012-09-18 09:30:25 +02:00
paul cannon 9ec77eb66e cqlsh: adapt to CASSANDRA-4018 system cf changes 2012-09-18 09:09:39 +02:00
Brandon Williams 12691ae3a6 Merge branch 'cassandra-1.1' into trunk 2012-09-17 21:42:25 -05:00
Brandon Williams e7f28f3032 cqlsh: catch IOError on history loading 
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4669
 2012-09-17 21:41:30 -05:00
Brandon Williams 1f3990f122 Merge branch 'cassandra-1.1' into trunk 2012-09-17 20:44:20 -05:00
Brandon Williams 4d600f3381 Revert "cqlsh: check for non-empty history file before loading" 
This reverts commit 6a8ba07313.
 2012-09-17 20:44:12 -05:00
Brandon Williams a500e28357 cqlsh: check for non-empty history file before loading 
Patch by Brian O'Neill, reviewed by brandonwilliams for CASSANDRA-4669
 2012-09-14 16:46:36 -05:00
Brandon Williams 6a8ba07313 cqlsh: check for non-empty history file before loading 
Patch by Brian O'Neill, reviewed by brandonwilliams for CASSANDRA-4669
 2012-09-14 16:42:54 -05:00
Brandon Williams a26eb3ef66 cqlsh: combine multiline statements into single line history 
Patch by Matthew Horsfall, reviewed by brandonwilliams for
CASSANDRA-4666
 2012-09-13 15:48:43 -05:00
Brandon Williams 5551d9c396 cqlsh: combine multiline statements into single line history 
Patch by Matthew Horsfall, reviewed by brandonwilliams for
CASSANDRA-4666
 2012-09-13 15:47:26 -05:00
Brandon Williams 69a243a53e Merge branch 'cassandra-1.1' into trunk 2012-09-13 14:11:40 -05:00
Brandon Williams 751e58d1e7 cqlsh: flush capture output after every command. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4073
 2012-09-13 14:05:11 -05:00
Brandon Williams a946e61d17 Merge branch 'cassandra-1.1' into trunk 2012-09-13 14:03:13 -05:00
Brandon Williams 5a63858d0d cqlsh: suggesting cql3 to cql2 users when they get an error and their 
statement appears to parse for cql 2, and vice versa.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4454
 2012-09-13 14:01:41 -05:00
Brandon Williams ae96aace6d Merge branch 'cassandra-1.1' into trunk 2012-09-13 13:56:14 -05:00
Brandon Williams 1e6cc9aebc cqlsh: sort columns so COPY TO -> FROM works. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4594
 2012-09-13 13:53:38 -05:00
Brandon Williams 5bb13b4262 cqlsh: use system.local instead of system.Versions 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4491
 2012-09-13 13:31:36 -05:00
Pavel Yaskevich c4692a1713 merge from 1.1 2012-09-11 01:13:05 +03:00
Brandon Williams 7cbc0be23d cqlsh: allow disabling colors. 
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-4634
 2012-09-10 14:41:43 -05:00
Sylvain Lebresne 500a529e7d Make CQL3 the default CQL implementation 
patch by slebresne; reviewed by jbellis for CASSANDRA-4640
 2012-09-10 18:50:21 +02:00
Brandon Williams bd27527211 cqlsh: update encoding for collections 
Patch by paul cannon reviewed by brandonwilliams for CASSANDRA-4500
 2012-08-31 07:42:31 -05:00
Brandon Williams 7ddb5c7a47 cqlsh: handle fully qualified class names 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4546
 2012-08-16 17:26:24 -05:00
Brandon Williams fc8e4b5656 FIx cqlsh COPY FROM without explicit column names. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4470
 2012-07-29 11:50:10 -05:00
Brandon Williams 80c3b2dc20 FIx cqlsh COPY FROM without explicit column names. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4470
 2012-07-29 11:48:44 -05:00
Brandon Williams 2d71a8eea5 Fix online help in cqlsh for COPY commands. 
Patch by paul cannon, reviewed by brandon williams for CASSANDRA-4469
 2012-07-28 14:01:57 -05:00
Brandon Williams 10372c20df cqlsh: fix problem describing pre-cql3 CFs that are case-sensitive 
Patch by paul cannon reviewed by brandonwilliams for CASSANDRA-4385
 2012-07-26 12:38:10 -05:00
Brandon Williams 9a63394765 cqlsh: add a COPY TO command 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4434
 2012-07-24 13:57:19 -05:00
Brandon Williams 3e4858271d cqlsh: describe command outputs valid CQL. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4380
 2012-07-11 09:38:22 -05:00
Brandon Williams 0ba2631ee2 cqlsh: add COPY command to load data from CSV flat files 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4012
 2012-06-18 13:24:32 -05:00
Brandon Williams 0cc168a966 Fix cqlsh ASSUME broken by CASSANDRA-4198. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4352
 2012-06-18 13:09:50 -05:00
Brandon Williams 55d4dd6547 Add an option to cqlsh to authenticate to a keyspace by default. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4108
 2012-06-01 12:56:49 -05:00
Brandon Williams 38748b43d8 cqlsh: update recognized syntax for cql3 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4198
 2012-05-18 10:22:23 -05:00
Brandon Williams 51767c198d Merge from 1.0 2012-05-15 17:24:26 -05:00
Brandon Williams be9fa05d06 Enable piping to cqlsh with locale.getpreferredencoding() 
Patch by paul cannon, reviewd by brandonwilliams for CASSANDRA-4113
 2012-05-15 17:19:04 -05:00
Brandon Williams 44e7a08903 Cqlsh: fix 'describe columnfamily' from CASSADRA-4164 
Patch by paul cannon, reviewed by brandonwilliams
 2012-05-04 12:42:28 -05:00
Brandon Williams f1ee34f08f cqlsh: in cql3 mode, use cql3 quoting when outputting cql. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4173
 2012-05-01 09:48:27 -05:00
Brandon Williams b81f5723ef Cqlsh supports DESCRIBE on cql3-style composite CFs. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4164
 2012-04-27 16:05:42 -05:00
Jonathan Ellis dc975e8ac3 fix recognizing uppercase SELECT keyword 
patch by Jonas Dohse and pcannon for CASSANDRA-4161
 2012-04-19 14:00:32 -05:00
paul cannon 8df0cea779 allow cql version selection 2012-04-06 11:03:52 -05:00
Brandon Williams 2ca983d9c0 Merge from 1.0 2012-04-05 15:09:44 -05:00
Jonathan Ellis c9f88103d0 guess correct version of Python for Arch Linux 
patch by Andrew Ash and Paul Cannon for CASSANDRA-4090
 2012-04-03 11:12:13 -05:00
Brandon Williams e4e87661d5 Restore defaultdict import 2012-03-30 14:31:56 -05:00
Brandon Williams e3c4c095f0 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-03-27 14:30:51 -05:00
Brandon Williams 270d0165da cqlsh: check for cql driver colname type support, overhaul column coloring 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4003
 2012-03-27 14:29:10 -05:00
Brandon Williams 9fc1d5c23a cqlsh: fix col. width in presence of wide unicode glyphs 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4033
 2012-03-27 13:51:02 -05:00
Sylvain Lebresne d64b9fff57 cqlsh: tab-complete key alias for ALTER CF ALTER 
patch by thepaul; reviewed by slebresne for CASSANDRA-3873
 2012-02-24 11:20:14 +01:00
Sylvain Lebresne c691e09f14 Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 11:39:44 +01:00
paul cannon 44ac7a04e0 cqlsh: look for cqlshlib relative to realpath 
patch by thepaul; reviewed by slebresne for CASSANDRA-3767

i.e., the realpath of the cqlsh executable, instead of the path as
called, which could be a symlink. If cqlsh is called via symlink, we are
more likely to find cqlshlib relative to the real location than relative
to the symlink.
 2012-02-22 11:38:46 +01:00
Sylvain Lebresne 40bb5509b9 Extra change for #3933 for 1.1 2012-02-22 11:32:17 +01:00
Sylvain Lebresne d9124ed68c Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-22 11:30:50 +01:00
paul cannon 1ad1c12829 cqlsh: ignore missing CfDef opts 
patch by thepaul; reviewed by slebresne for CASSANDRA-3933

We don't want to try to track every possible CF
option supported by different versions of Cassandra, so if we try
to reference one and it's not in the object at all, that's fine,
don't try to display it.
 2012-02-22 11:29:52 +01:00
Brandon Williams 9417eb6299 cqlsh: handle deserialization errors. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3874
 2012-02-16 09:23:42 -06:00
Brandon Williams cd36f97571 cqlsh: handle deserialization errors. 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3874
 2012-02-16 09:21:55 -06:00
Brandon Williams 0f3ff051ef Merge branch 'cassandra-1.0' into cassandra-1.1 2012-02-06 14:58:59 -06:00
paul cannon b527d9ffe1 Fix cqlsh data display on python <2.7 
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-3846
 2012-02-06 13:32:03 -06:00
paul cannon d4f2051578 cqlsh: update syntax for tab completions 
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3757
 2012-01-30 15:43:53 -06:00
paul cannon 8a5436a2b6 add cqlsh to Debian package 2012-01-29 19:09:34 -06:00
paul cannon 1387d92fcd cqlsh version 2.0.0 -> 2.1.0 2012-01-29 19:01:25 -06:00
paul cannon b6344887c2 cqlsh: use python-cql and thrift bindings from lib 
..if possible.
 2012-01-29 19:01:25 -06:00
paul cannon d5979b3017 Add read from/write to support for cqlsh. 
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3479
 2012-01-25 21:46:48 -06:00
Jonathan Ellis c641acca70 merge from 1.0 2012-01-20 13:23:31 -06:00
paul cannon 5850178cb9 cqlsh: format output properly, make prettier 
most importantly: formats output from queries according to column
storage type, so that e.g. blob data is shown in hex. also formats
timestamp values in a human-readable and cql-readable way, and
shows backslash escapes for text/ascii types when characters can't
be printed. when color is enabled, highlight backslash escapes in
red, so they can easily be distinguished from text that happens to
contain backslashes.

color different types of column data differently: textual data stays
yellow, blob data is red, and other data (types which are shown and
input significantly differently from the byte representation, like
numbers, timestamps, etc) are green.

for static resultsets, add a separator line between header and data
(most helpful for people who don't have colors on). left-justify column
headers instead of right-justifying. for dynamic resultsets, don't
append a final bar separator after the last value.

allow calling into a value renderer/formatter which can make decisions
about output representation and color based on the column type

patch by pcannon; reviewed by jbellis for CASSANDRA-3726
 2012-01-20 13:22:38 -06:00
Jonathan Ellis 91c45d445c merge from 1.0 2012-01-19 17:04:29 -06:00
paul cannon fc6103966c add DESC alias for DESCRIBE 
patch by pcannon; reviewed by jbellis for CASSANDRA-3587
 2012-01-19 17:03:02 -06:00
paul cannon 95942f0221 cqlsh: add DESC COLUMNFAMILIES to show cf names 
as opposed to DESCRIBE KEYSPACE, which shows all columnfamilies but
includes all their column definitions and options, which is usually a
lot of output.

patch by pcannon; reviewed by jbellis for CASSANDRA-3586
 2012-01-19 17:02:36 -06:00
paul cannon f458cc1ad9 add ALTER COLUMNFAMILY WITH 
allows modification of columnfamily properties after creation

patch by pcannon; reviewed by jbellis for CASSANDRA-3523
 2012-01-16 13:28:40 -06:00
Brandon Williams 2bb862c320 Add help for INSERT to cqlsh. 
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3718.
 2012-01-10 13:59:50 -06:00
Eric Evans 8f777d4226 cqlsh: fix broken help output methods 
Patch by paul cannon; reviewed by eevans for CASSANDRA-3588

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1211958 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-08 16:29:53 +00:00
Jonathan Ellis 233de993ce s/bash/sh/ 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1209348 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 03:10:22 +00:00
Jonathan Ellis 77ad368ed5 update cqlsh to find a python >= 2.5, if possible 
patch by Paul Cannon; reviewed by jbellis for CASSANDRA-3457

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1209343 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 03:01:05 +00:00
Brandon Williams b23a805925 Fix ASSUME when using SELECT keyspace.cfname syntax in cqlsh. 
Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3500

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1207616 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-28 21:19:15 +00:00
Jonathan Ellis 6e088d48f3 don't use cqlsh color on Windows 
patch by Paul Cannon; reviewed by jbellis for for CASSANDRA-3131

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1201080 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 22:32:17 +00:00
Jonathan Ellis b1b1772f35 svn propset svn:executable on bin/cqlsh 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1200539 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 20:37:14 +00:00
Jonathan Ellis 1bb2947dd5 add next-gen cqlsh 
patch by Paul Cannon; reviewed by jbellis for CASSANDRA-3188

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1198994 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 23:05:54 +00:00