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/81fd9c6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81fd9c6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81fd9c6c

Branch: refs/heads/trunk
Commit: 81fd9c6c2beadf69df670ce611fc1ca706aae7ec
Parents: 91180ed 47b50b4
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Authored: Thu Sep 22 09:01:52 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Committed: Thu Sep 22 09:01:52 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81fd9c6c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 98e4f78,d9db977..d6fcab8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -82,55 -28,12 +82,56 @@@ Merged from 3.0
   * Disk failure policy should not be invoked on out of space (CASSANDRA-12385)
   * Calculate last compacted key on startup (CASSANDRA-6216)
   * Add schema to snapshot manifest, add USING TIMESTAMP clause to ALTER TABLE 
statements (CASSANDRA-7190)
 + * If CF has no clustering columns, any row cache is full partition cache 
(CASSANDRA-12499)
 +Merged from 2.2:
++ * Fix authentication problem when invoking clqsh copy from a SOURCE command 
(CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
 +
 +
 +3.8, 3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling 
validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 + * RTE from new CDC column breaks in flight queries (CASSANDRA-12236)
 + * Fix hdr logging for single operation workloads (CASSANDRA-12145)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms 
(CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in 
SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is 
exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter 
(CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool 
(CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool 
(CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes 
field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit 
reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas 
(CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" 
session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
 + * Fix paging for 2.x to 3.x upgrades (CASSANDRA-11195)
   * Fix clean interval not sent to commit log for empty memtable flush 
(CASSANDRA-12436)
   * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331)
 - * Backport CASSANDRA-12002 (CASSANDRA-12177)
   * Make sure compaction stats are updated when compaction is interrupted 
(CASSANDRA-12100)
 - * Fix potential bad messaging service message for paged range reads
 -   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Change commitlog and sstables to track dirty and clean intervals 
(CASSANDRA-11828)
   * NullPointerException during compaction on table with static columns 
(CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in 
GraphiteReporter (CASSANDRA-11823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81fd9c6c/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index ee23b29,f722236..7f8609c
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1966,16 -1994,21 +1966,22 @@@ class Shell(cmd.Cmd)
          except IOError, e:
              self.printerr('Could not open %r: %s' % (fname, e))
              return
-         subshell = Shell(self.hostname, self.port,
-                          color=self.color, encoding=self.encoding, stdin=f,
-                          tty=False, use_conn=self.conn, 
cqlver=self.cql_version,
-                          keyspace=self.current_keyspace,
+         username = self.auth_provider.username if self.auth_provider else None
+         password = self.auth_provider.password if self.auth_provider else None
+         subshell = Shell(self.hostname, self.port, color=self.color,
+                          username=username, password=password,
+                          encoding=self.encoding, stdin=f, tty=False, 
use_conn=self.conn,
+                          cqlver=self.cql_version, 
keyspace=self.current_keyspace,
+                          tracing_enabled=self.tracing_enabled,
+                          display_nanotime_format=self.display_nanotime_format,
                           
display_timestamp_format=self.display_timestamp_format,
                           display_date_format=self.display_date_format,
-                          display_nanotime_format=self.display_nanotime_format,
                           display_float_precision=self.display_float_precision,
 +                         
display_double_precision=self.display_double_precision,
-                          max_trace_wait=self.max_trace_wait)
+                          display_timezone=self.display_timezone,
+                          max_trace_wait=self.max_trace_wait, ssl=self.ssl,
+                          request_timeout=self.session.default_timeout,
+                          connect_timeout=self.conn.connect_timeout)
          subshell.cmdloop()
          f.close()
  

Reply via email to