Updated Branches: refs/heads/cassandra-1.1 5a63858d0 -> 751e58d1e refs/heads/trunk a946e61d1 -> 75c4cfa5c
cqlsh: support inet data type Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4627 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75c4cfa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75c4cfa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75c4cfa5 Branch: refs/heads/trunk Commit: 75c4cfa5c5437e3f57143a1e4a013d6411de78bc Parents: 69a243a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Sep 13 14:15:33 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Sep 13 14:15:33 2012 -0500 ---------------------------------------------------------------------- lib/cql-internal-only-1.1.0.zip | Bin 78637 -> 0 bytes lib/cql-internal-only-1.2.0.zip | Bin 0 -> 83243 bytes pylib/cqlshlib/displaying.py | 1 + pylib/cqlshlib/formatting.py | 4 ++++ 4 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75c4cfa5/lib/cql-internal-only-1.1.0.zip ---------------------------------------------------------------------- diff --git a/lib/cql-internal-only-1.1.0.zip b/lib/cql-internal-only-1.1.0.zip deleted file mode 100644 index 52b1e61..0000000 Binary files a/lib/cql-internal-only-1.1.0.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/75c4cfa5/lib/cql-internal-only-1.2.0.zip ---------------------------------------------------------------------- diff --git a/lib/cql-internal-only-1.2.0.zip b/lib/cql-internal-only-1.2.0.zip new file mode 100644 index 0000000..a1c193e Binary files /dev/null and b/lib/cql-internal-only-1.2.0.zip differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/75c4cfa5/pylib/cqlshlib/displaying.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/displaying.py b/pylib/cqlshlib/displaying.py index adeaefd..634d37b 100644 --- a/pylib/cqlshlib/displaying.py +++ b/pylib/cqlshlib/displaying.py @@ -94,6 +94,7 @@ DEFAULT_VALUE_COLORS = dict( int=GREEN, float=GREEN, decimal=GREEN, + inet=GREEN, boolean=GREEN, uuid=GREEN, collection=BLUE, http://git-wip-us.apache.org/repos/asf/cassandra/blob/75c4cfa5/pylib/cqlshlib/formatting.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index a5a0fd2..c12a422 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -105,6 +105,10 @@ def format_value_decimal(val, colormap, **_): def format_value_uuid(val, colormap, **_): return format_python_formatted_type(val, colormap, 'uuid') +@formatter_for('inet') +def formatter_value_inet(val, colormap, **_): + return format_python_formatted_type(val, colormap, 'inet') + @formatter_for('boolean') def format_value_boolean(val, colormap, **_): return format_python_formatted_type(val, colormap, 'boolean')