natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Stefania Alborghetti 2017-04-07 09:02:59 +08:00
parent 6991556e43 377f6117ce
commit a8a3d4e282
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -25,7 +25,8 @@ Merged from 2.2:
* Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
* Fix queries updating multiple time the same list (CASSANDRA-13130)
* Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)
Merged from 2.1:
* Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
3.0.12
* Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)

2
pylib/cqlshlib/copyutil.py
View File

@ -1973,7 +1973,7 @@ class ImportConversion(object):
return tuple(convert_mandatory(t, v) for t, v in zip(ct.subtypes, split(val)))
def convert_list(val, ct=cql_type):
return list(convert_mandatory(ct.subtypes[0], v) for v in split(val))
return tuple(convert_mandatory(ct.subtypes[0], v) for v in split(val))
def convert_set(val, ct=cql_type):
return frozenset(convert_mandatory(ct.subtypes[0], v) for v in split(val))