You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/03/29 18:58:17 UTC
[01/15] cassandra git commit: COPY FROM fails when importing blob
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8b8a3f5b9 -> 5a45aa62d
refs/heads/cassandra-2.2 fc972b9f2 -> 6ff006554
refs/heads/cassandra-3.0 1de534276 -> c9e81ea7f
refs/heads/cassandra-3.5 daf7606a6 -> bed6aae00
refs/heads/trunk 761dfc2c8 -> 9fd6322dc
COPY FROM fails when importing blob
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a45aa62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a45aa62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a45aa62
Branch: refs/heads/cassandra-2.1
Commit: 5a45aa62dd57f59753396c5d5541dbf3a0a1b220
Parents: 8b8a3f5
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Mar 18 16:46:37 2016 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:56:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7794d4f..65d094f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * COPY FROM fails when importing blob (CASSANDRA-11375)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index ba2a47b..28e08b1 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1176,7 +1176,7 @@ class FeedingProcess(mp.Process):
if rows:
sent += self.send_chunk(ch, rows)
except Exception, exc:
- self.outmsg.send(ImportTaskError(exc.__class__.__name__, exc.message))
+ self.outmsg.send(ImportTaskError(exc.__class__.__name__, str(exc)))
if reader.exhausted:
break
@@ -1679,7 +1679,11 @@ class ImportConversion(object):
return converters.get(t.typename, convert_unknown)(unprotect(v), ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
+ try:
+ return bytearray.fromhex(v[2:])
+ except TypeError:
+ # Work-around for Python 2.6 bug
+ return bytearray.fromhex(unicode(v[2:]))
def convert_text(v, **_):
return v
@@ -1869,7 +1873,7 @@ class ImportConversion(object):
try:
return [conv(val) for conv, val in zip(converters, row)]
except Exception, e:
- raise ParseError(e.message)
+ raise ParseError(str(e))
def get_null_primary_key_message(self, idx):
message = "Cannot insert null value for primary key column '%s'." % (self.columns[idx],)
@@ -2183,7 +2187,7 @@ class ImportProcess(ChildProcess):
try:
return conv.convert_row(r)
except Exception, err:
- errors[err.message].append(r)
+ errors[str(err)].append(r)
return None
converted_rows = filter(None, [convert_row(r) for r in rows])
@@ -2248,7 +2252,7 @@ class ImportProcess(ChildProcess):
pk = get_row_partition_key_values(row)
rows_by_ring_pos[get_ring_pos(ring, pk_to_token_value(pk))].append(row)
except Exception, e:
- errors[e.message].append(row)
+ errors[str(e)].append(row)
if errors:
for msg, rows in errors.iteritems():
@@ -2286,7 +2290,7 @@ class ImportProcess(ChildProcess):
def report_error(self, err, chunk, rows=None, attempts=1, final=True):
if self.debug:
traceback.print_exc(err)
- self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
+ self.outmsg.send(ImportTaskError(err.__class__.__name__, str(err), rows, attempts, final))
if final:
self.update_chunk(rows, chunk)
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff00655
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff00655
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff00655
Branch: refs/heads/cassandra-2.2
Commit: 6ff006554f09b549414ce6af89ba0f7f2982ce62
Parents: fc972b9 5a45aa6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:04 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/15] cassandra git commit: COPY FROM fails when importing blob
Posted by al...@apache.org.
COPY FROM fails when importing blob
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a45aa62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a45aa62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a45aa62
Branch: refs/heads/cassandra-3.5
Commit: 5a45aa62dd57f59753396c5d5541dbf3a0a1b220
Parents: 8b8a3f5
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Mar 18 16:46:37 2016 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:56:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7794d4f..65d094f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * COPY FROM fails when importing blob (CASSANDRA-11375)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index ba2a47b..28e08b1 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1176,7 +1176,7 @@ class FeedingProcess(mp.Process):
if rows:
sent += self.send_chunk(ch, rows)
except Exception, exc:
- self.outmsg.send(ImportTaskError(exc.__class__.__name__, exc.message))
+ self.outmsg.send(ImportTaskError(exc.__class__.__name__, str(exc)))
if reader.exhausted:
break
@@ -1679,7 +1679,11 @@ class ImportConversion(object):
return converters.get(t.typename, convert_unknown)(unprotect(v), ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
+ try:
+ return bytearray.fromhex(v[2:])
+ except TypeError:
+ # Work-around for Python 2.6 bug
+ return bytearray.fromhex(unicode(v[2:]))
def convert_text(v, **_):
return v
@@ -1869,7 +1873,7 @@ class ImportConversion(object):
try:
return [conv(val) for conv, val in zip(converters, row)]
except Exception, e:
- raise ParseError(e.message)
+ raise ParseError(str(e))
def get_null_primary_key_message(self, idx):
message = "Cannot insert null value for primary key column '%s'." % (self.columns[idx],)
@@ -2183,7 +2187,7 @@ class ImportProcess(ChildProcess):
try:
return conv.convert_row(r)
except Exception, err:
- errors[err.message].append(r)
+ errors[str(err)].append(r)
return None
converted_rows = filter(None, [convert_row(r) for r in rows])
@@ -2248,7 +2252,7 @@ class ImportProcess(ChildProcess):
pk = get_row_partition_key_values(row)
rows_by_ring_pos[get_ring_pos(ring, pk_to_token_value(pk))].append(row)
except Exception, e:
- errors[e.message].append(row)
+ errors[str(e)].append(row)
if errors:
for msg, rows in errors.iteritems():
@@ -2286,7 +2290,7 @@ class ImportProcess(ChildProcess):
def report_error(self, err, chunk, rows=None, attempts=1, final=True):
if self.debug:
traceback.print_exc(err)
- self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
+ self.outmsg.send(ImportTaskError(err.__class__.__name__, str(err), rows, attempts, final))
if final:
self.update_chunk(rows, chunk)
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff00655
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff00655
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff00655
Branch: refs/heads/trunk
Commit: 6ff006554f09b549414ce6af89ba0f7f2982ce62
Parents: fc972b9 5a45aa6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:04 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff00655
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff00655
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff00655
Branch: refs/heads/cassandra-3.5
Commit: 6ff006554f09b549414ce6af89ba0f7f2982ce62
Parents: fc972b9 5a45aa6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:04 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
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/c9e81ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9e81ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9e81ea7
Branch: refs/heads/cassandra-3.5
Commit: c9e81ea7fc6a8a2acfbd4778ca846542d250c8c4
Parents: 1de5342 6ff0065
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:21 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:21 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
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/c9e81ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9e81ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9e81ea7
Branch: refs/heads/cassandra-3.0
Commit: c9e81ea7fc6a8a2acfbd4778ca846542d250c8c4
Parents: 1de5342 6ff0065
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:21 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:21 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bed6aae0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bed6aae0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bed6aae0
Branch: refs/heads/cassandra-3.5
Commit: bed6aae00e271846184d9ba7317d4e038701ca86
Parents: daf7606 c9e81ea
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:35 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:35 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@apache.org.
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/c9e81ea7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9e81ea7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9e81ea7
Branch: refs/heads/trunk
Commit: c9e81ea7fc6a8a2acfbd4778ca846542d250c8c4
Parents: 1de5342 6ff0065
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:21 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:21 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bed6aae0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bed6aae0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bed6aae0
Branch: refs/heads/trunk
Commit: bed6aae00e271846184d9ba7317d4e038701ca86
Parents: daf7606 c9e81ea
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:35 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:35 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9fd6322d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9fd6322d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9fd6322d
Branch: refs/heads/trunk
Commit: 9fd6322dc3539dd0327f886734211a17aa89b9ad
Parents: 761dfc2 bed6aae
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:48 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:48 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/15] cassandra git commit: COPY FROM fails when importing blob
Posted by al...@apache.org.
COPY FROM fails when importing blob
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a45aa62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a45aa62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a45aa62
Branch: refs/heads/cassandra-3.0
Commit: 5a45aa62dd57f59753396c5d5541dbf3a0a1b220
Parents: 8b8a3f5
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Mar 18 16:46:37 2016 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:56:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7794d4f..65d094f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * COPY FROM fails when importing blob (CASSANDRA-11375)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index ba2a47b..28e08b1 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1176,7 +1176,7 @@ class FeedingProcess(mp.Process):
if rows:
sent += self.send_chunk(ch, rows)
except Exception, exc:
- self.outmsg.send(ImportTaskError(exc.__class__.__name__, exc.message))
+ self.outmsg.send(ImportTaskError(exc.__class__.__name__, str(exc)))
if reader.exhausted:
break
@@ -1679,7 +1679,11 @@ class ImportConversion(object):
return converters.get(t.typename, convert_unknown)(unprotect(v), ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
+ try:
+ return bytearray.fromhex(v[2:])
+ except TypeError:
+ # Work-around for Python 2.6 bug
+ return bytearray.fromhex(unicode(v[2:]))
def convert_text(v, **_):
return v
@@ -1869,7 +1873,7 @@ class ImportConversion(object):
try:
return [conv(val) for conv, val in zip(converters, row)]
except Exception, e:
- raise ParseError(e.message)
+ raise ParseError(str(e))
def get_null_primary_key_message(self, idx):
message = "Cannot insert null value for primary key column '%s'." % (self.columns[idx],)
@@ -2183,7 +2187,7 @@ class ImportProcess(ChildProcess):
try:
return conv.convert_row(r)
except Exception, err:
- errors[err.message].append(r)
+ errors[str(err)].append(r)
return None
converted_rows = filter(None, [convert_row(r) for r in rows])
@@ -2248,7 +2252,7 @@ class ImportProcess(ChildProcess):
pk = get_row_partition_key_values(row)
rows_by_ring_pos[get_ring_pos(ring, pk_to_token_value(pk))].append(row)
except Exception, e:
- errors[e.message].append(row)
+ errors[str(e)].append(row)
if errors:
for msg, rows in errors.iteritems():
@@ -2286,7 +2290,7 @@ class ImportProcess(ChildProcess):
def report_error(self, err, chunk, rows=None, attempts=1, final=True):
if self.debug:
traceback.print_exc(err)
- self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
+ self.outmsg.send(ImportTaskError(err.__class__.__name__, str(err), rows, attempts, final))
if final:
self.update_chunk(rows, chunk)
[02/15] cassandra git commit: COPY FROM fails when importing blob
Posted by al...@apache.org.
COPY FROM fails when importing blob
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a45aa62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a45aa62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a45aa62
Branch: refs/heads/cassandra-2.2
Commit: 5a45aa62dd57f59753396c5d5541dbf3a0a1b220
Parents: 8b8a3f5
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Mar 18 16:46:37 2016 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:56:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7794d4f..65d094f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * COPY FROM fails when importing blob (CASSANDRA-11375)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index ba2a47b..28e08b1 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1176,7 +1176,7 @@ class FeedingProcess(mp.Process):
if rows:
sent += self.send_chunk(ch, rows)
except Exception, exc:
- self.outmsg.send(ImportTaskError(exc.__class__.__name__, exc.message))
+ self.outmsg.send(ImportTaskError(exc.__class__.__name__, str(exc)))
if reader.exhausted:
break
@@ -1679,7 +1679,11 @@ class ImportConversion(object):
return converters.get(t.typename, convert_unknown)(unprotect(v), ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
+ try:
+ return bytearray.fromhex(v[2:])
+ except TypeError:
+ # Work-around for Python 2.6 bug
+ return bytearray.fromhex(unicode(v[2:]))
def convert_text(v, **_):
return v
@@ -1869,7 +1873,7 @@ class ImportConversion(object):
try:
return [conv(val) for conv, val in zip(converters, row)]
except Exception, e:
- raise ParseError(e.message)
+ raise ParseError(str(e))
def get_null_primary_key_message(self, idx):
message = "Cannot insert null value for primary key column '%s'." % (self.columns[idx],)
@@ -2183,7 +2187,7 @@ class ImportProcess(ChildProcess):
try:
return conv.convert_row(r)
except Exception, err:
- errors[err.message].append(r)
+ errors[str(err)].append(r)
return None
converted_rows = filter(None, [convert_row(r) for r in rows])
@@ -2248,7 +2252,7 @@ class ImportProcess(ChildProcess):
pk = get_row_partition_key_values(row)
rows_by_ring_pos[get_ring_pos(ring, pk_to_token_value(pk))].append(row)
except Exception, e:
- errors[e.message].append(row)
+ errors[str(e)].append(row)
if errors:
for msg, rows in errors.iteritems():
@@ -2286,7 +2290,7 @@ class ImportProcess(ChildProcess):
def report_error(self, err, chunk, rows=None, attempts=1, final=True):
if self.debug:
traceback.print_exc(err)
- self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
+ self.outmsg.send(ImportTaskError(err.__class__.__name__, str(err), rows, attempts, final))
if final:
self.update_chunk(rows, chunk)
[03/15] cassandra git commit: COPY FROM fails when importing blob
Posted by al...@apache.org.
COPY FROM fails when importing blob
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a45aa62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a45aa62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a45aa62
Branch: refs/heads/trunk
Commit: 5a45aa62dd57f59753396c5d5541dbf3a0a1b220
Parents: 8b8a3f5
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Mar 18 16:46:37 2016 +0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:56:33 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 16 ++++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7794d4f..65d094f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * COPY FROM fails when importing blob (CASSANDRA-11375)
* Backport CASSANDRA-10679 (CASSANDRA-9598)
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a45aa62/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index ba2a47b..28e08b1 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1176,7 +1176,7 @@ class FeedingProcess(mp.Process):
if rows:
sent += self.send_chunk(ch, rows)
except Exception, exc:
- self.outmsg.send(ImportTaskError(exc.__class__.__name__, exc.message))
+ self.outmsg.send(ImportTaskError(exc.__class__.__name__, str(exc)))
if reader.exhausted:
break
@@ -1679,7 +1679,11 @@ class ImportConversion(object):
return converters.get(t.typename, convert_unknown)(unprotect(v), ct=t)
def convert_blob(v, **_):
- return bytearray.fromhex(v[2:])
+ try:
+ return bytearray.fromhex(v[2:])
+ except TypeError:
+ # Work-around for Python 2.6 bug
+ return bytearray.fromhex(unicode(v[2:]))
def convert_text(v, **_):
return v
@@ -1869,7 +1873,7 @@ class ImportConversion(object):
try:
return [conv(val) for conv, val in zip(converters, row)]
except Exception, e:
- raise ParseError(e.message)
+ raise ParseError(str(e))
def get_null_primary_key_message(self, idx):
message = "Cannot insert null value for primary key column '%s'." % (self.columns[idx],)
@@ -2183,7 +2187,7 @@ class ImportProcess(ChildProcess):
try:
return conv.convert_row(r)
except Exception, err:
- errors[err.message].append(r)
+ errors[str(err)].append(r)
return None
converted_rows = filter(None, [convert_row(r) for r in rows])
@@ -2248,7 +2252,7 @@ class ImportProcess(ChildProcess):
pk = get_row_partition_key_values(row)
rows_by_ring_pos[get_ring_pos(ring, pk_to_token_value(pk))].append(row)
except Exception, e:
- errors[e.message].append(row)
+ errors[str(e)].append(row)
if errors:
for msg, rows in errors.iteritems():
@@ -2286,7 +2290,7 @@ class ImportProcess(ChildProcess):
def report_error(self, err, chunk, rows=None, attempts=1, final=True):
if self.debug:
traceback.print_exc(err)
- self.outmsg.send(ImportTaskError(err.__class__.__name__, err.message, rows, attempts, final))
+ self.outmsg.send(ImportTaskError(err.__class__.__name__, str(err), rows, attempts, final))
if final:
self.update_chunk(rows, chunk)
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ff00655
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ff00655
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ff00655
Branch: refs/heads/cassandra-3.0
Commit: 6ff006554f09b549414ce6af89ba0f7f2982ce62
Parents: fc972b9 5a45aa6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Mar 29 17:57:04 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Mar 29 17:57:04 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------