You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/01/12 19:30:32 UTC
[cassandra] branch cassandra-3.0 updated (77e2205 -> a542b86)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 77e2205 Merge branch cassandra-2.2 into cassandra-3.0
new c1008cc CASSANDRA-16372 COPY FROM does not report failed rows as imported
new a542b86 Allow empty string in collections with COPY FROM in cqlsh
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/02: Allow empty string in collections with COPY FROM
in cqlsh
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a542b865047ad8cc3d9f64ab3c3a018ac069331e
Author: Aleksandr Sorokoumov <al...@gmail.com>
AuthorDate: Sat Jan 9 16:53:51 2021 +0100
Allow empty string in collections with COPY FROM in cqlsh
Patch by Aleksandr Soromoukov, reviewed by brandonwilliams for
CASSANDRA-16372
---
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 75c478c..5cb4f1d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.24:
+ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
* Fix skipping on pre-3.0 created compact storage sstables due to missing primary key liveness (CASSANDRA-16226)
* Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
* Extend the exclusion of replica filtering protection to other indices instead of just SASI (CASSANDRA-16311)
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 3f7c091..987a125 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -45,7 +45,7 @@ from util import profile_on, profile_off
from cassandra import OperationTimedOut
from cassandra.cluster import Cluster, DefaultConnection
-from cassandra.cqltypes import ReversedType, UserType
+from cassandra.cqltypes import ReversedType, UserType, VarcharType
from cassandra.metadata import protect_name, protect_names, protect_value
from cassandra.policies import RetryPolicy, WhiteListRoundRobinPolicy, DCAwareRoundRobinPolicy, FallthroughRetryPolicy
from cassandra.query import BatchStatement, BatchType, SimpleStatement, tuple_factory
@@ -1841,7 +1841,9 @@ class ImportConversion(object):
def convert_mandatory(t, v):
v = unprotect(v)
- if v == self.nullval:
+ # we can't distinguish between empty strings and null values in csv. Null values are not supported in
+ # collections, so it must be an empty string.
+ if v == self.nullval and not issubclass(t, VarcharType):
raise ParseError('Empty values are not allowed')
return converters.get(t.typename, convert_unknown)(v, ct=t)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/02: CASSANDRA-16372 COPY FROM does not report failed
rows as imported
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c1008cc1ea7fd797c0e9fe374dd36771d866728d
Author: Aleksandr Sorokoumov <al...@gmail.com>
AuthorDate: Sat Jan 9 15:43:37 2021 +0100
CASSANDRA-16372 COPY FROM does not report failed rows as imported
---
pylib/cqlshlib/copyutil.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index e85558c..3f7c091 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -1238,7 +1238,7 @@ class ImportTask(CopyTask):
attempts -= 1
self.printmsg("\n%d rows imported from %d files in %s (%d skipped)." %
- (self.receive_meter.get_total_records(),
+ (self.receive_meter.get_total_records() - self.error_handler.num_rows_failed,
self.feeding_result.num_sources if self.feeding_result else 0,
self.describe_interval(time.time() - self.time_start),
self.feeding_result.skip_rows if self.feeding_result else 0))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org