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

Merge branch 'cassandra-3.0' into trunk

This commit is contained in:
Robert Stupp 2016-04-25 10:22:47 +02:00
parent f07a406e57 c9285d0e30
commit db7d07cfa4
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -76,6 +76,7 @@ Merged from 2.2:
* Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430) * Make deprecated repair methods backward-compatible with previous notification service (CASSANDRA-11430)
* IncomingStreamingConnection version check message wrong (CASSANDRA-11462) * IncomingStreamingConnection version check message wrong (CASSANDRA-11462)
Merged from 2.1: Merged from 2.1:
* cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values (CASSANDRA-11633)
* clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574) * clqsh: COPY FROM throws TypeError with Cython extensions enabled (CASSANDRA-11574)
* cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549) * cqlsh: COPY FROM ignores NULL values in conversion (CASSANDRA-11549)

17
pylib/cqlshlib/copyutil.py
View File

@ -1786,15 +1786,16 @@ class ImportConversion(object):
level = 0 level = 0
quote = False quote = False
for i, c in enumerate(val): for i, c in enumerate(val):
if c == '{' or c == '[' or c == '(': if c == '\'':
level += 1
elif c == '}' or c == ']' or c == ')':
level -= 1
elif c == '\'':
quote = not quote quote = not quote
elif c == sep and level == 1 and not quote: elif not quote:
ret.append(val[last:i]) if c == '{' or c == '[' or c == '(':
last = i + 1 level += 1
elif c == '}' or c == ']' or c == ')':
level -= 1
elif c == sep and level == 1:
ret.append(val[last:i])
last = i + 1
else: else:
if last < len(val) - 1: if last < len(val) - 1:
ret.append(val[last:-1]) ret.append(val[last:-1])