cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 08 Feb 2016 12:28:55 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71ccb16b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71ccb16b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71ccb16b

Branch: refs/heads/trunk
Commit: 71ccb16bf9149a01cc353d39f088917b74ee353a
Parents: 696cd91 23f6296
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Feb 8 12:28:32 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Feb 8 12:28:32 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 41 ++++++++++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71ccb16b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 179da46,6302ce6..2d50c10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,7 +1,23 @@@
 -3.0.4
 +3.4
 + * Add LIKE support to CQL3 (CASSANDRA-11067)
 + * Generic Java UDF types (CASSANDRA-10819)
 + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +Merged from 3.0:
   * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
  Merged from 2.2.6
+  * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
  Merged from 2.1:
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71ccb16b/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index dcb90b6,a7292e6..02952c3
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -52,10 -52,9 +52,13 @@@ from uuid import UUI
  if sys.version_info[0] != 2 or sys.version_info[1] != 7:
      sys.exit("\nCQL Shell supports only Python 2.7\n")
  
 +# see CASSANDRA-10428
 +if platform.python_implementation().startswith('Jython'):
 +    sys.exit("\nCQL Shell does not run on Jython\n")
 +
+ UTF8 = 'utf-8'
+ CP65001 = 'cp65001'  # Win utf-8 variant
+ 
  description = "CQL Shell for Apache Cassandra"
  version = "5.0.1"
  
@@@ -727,8 -732,14 +736,10 @@@ class Shell(cmd.Cmd)
  
          self.current_keyspace = keyspace
  
 -        self.display_timestamp_format = display_timestamp_format
 -        self.display_nanotime_format = display_nanotime_format
 -        self.display_date_format = display_date_format
 -
          self.max_trace_wait = max_trace_wait
          self.session.max_trace_wait = max_trace_wait
+ 
+         self.tty = tty
          if encoding is None:
              encoding = locale.getpreferredencoding()
              if encoding is None:


Mime
View raw message