cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 19 Nov 2015 00:31:49 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.0
Commit: 74070ee4aba7d8d735cbe2ce5453801a0563b043
Parents: 12fd5d2 d2f243e
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Nov 18 18:31:31 2015 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Nov 18 18:31:31 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                  |   1 +
 bin/cqlsh.py                 | 153 +++------
 pylib/cqlshlib/copy.py       | 647 ++++++++++++++++++++++++++++++++++++++
 pylib/cqlshlib/displaying.py |  10 +
 pylib/cqlshlib/formatting.py |  32 +-
 5 files changed, 725 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/74070ee4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4510462,4e19b23..2a9fbe7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,8 -3,19 +9,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
 - * * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
 - * Don't remove level info when running upgradesstables (CASSANDRA-10692)
++ * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
   * Create compression chunk for sending file only (CASSANDRA-10680)
 - * Make buffered read size configurable (CASSANDRA-10249)
   * Forbid compact clustering column type changes in ALTER TABLE (CASSANDRA-8879)
   * Reject incremental repair with subrange repair (CASSANDRA-10422)
   * Add a nodetool command to refresh size_estimates (CASSANDRA-9579)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/74070ee4/bin/cqlsh.py
----------------------------------------------------------------------
diff --cc bin/cqlsh.py
index 33533c5,94c7af3..793afe5
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -2394,11 -2259,11 +2328,11 @@@ class ImportProcess(mp.Process)
          table_meta = new_cluster.metadata.keyspaces[self.ks].tables[self.cf]
  
          pk_cols = [col.name for col in table_meta.primary_key]
 -        cqltypes = [table_meta.columns[name].typestring for name in self.columns]
 +        cqltypes = [table_meta.columns[name].cql_type for name in self.columns]
          pk_indexes = [self.columns.index(col.name) for col in table_meta.primary_key]
          query = 'INSERT INTO %s.%s (%s) VALUES (%%s)' % (
-             protect_name(table_meta.keyspace_name),
-             protect_name(table_meta.name),
+             protect_name(self.ks),
+             protect_name(self.cf),
              ', '.join(protect_names(self.columns)))
  
          # we need to handle some types specially


Mime
View raw message