[
https://issues.apache.org/jira/browse/BEAM-5621?focusedWorklogId=167370&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-167370
]
ASF GitHub Bot logged work on BEAM-5621:
----------------------------------------
Author: ASF GitHub Bot
Created on: 19/Nov/18 12:58
Start Date: 19/Nov/18 12:58
Worklog Time Spent: 10m
Work Description: robertwb closed pull request #7022: [BEAM-5621] Fix
unorderable types in Python 3
URL: https://github.com/apache/beam/pull/7022
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/python/apache_beam/testing/util.py
b/sdks/python/apache_beam/testing/util.py
index 7b9b7091424..c11af6a70fc 100644
--- a/sdks/python/apache_beam/testing/util.py
+++ b/sdks/python/apache_beam/testing/util.py
@@ -108,19 +108,35 @@ def matcher(elements):
return matcher
-# Note that equal_to always sorts the expected and actual since what we
-# compare are PCollections for which there is no guaranteed order.
-# However the sorting does not go beyond top level therefore [1,2] and [2,1]
-# are considered equal and [[1,2]] and [[2,1]] are not.
+# Note that equal_to checks if expected and actual are permutations of each
+# other. However, only permutations of the top level are checked. Therefore
+# [1,2] and [2,1] are considered equal and [[1,2]] and [[2,1]] are not.
def equal_to(expected):
- expected = list(expected)
def _equal(actual):
- sorted_expected = sorted(expected)
- sorted_actual = sorted(actual)
- if sorted_expected != sorted_actual:
- raise BeamAssertException(
- 'Failed assert: %r == %r' % (sorted_expected, sorted_actual))
+ expected_list = list(expected)
+
+ # Try to compare actual and expected by sorting. This fails with a
+ # TypeError in Python 3 if different types are present in the same
+ # collection.
+ try:
+ sorted_expected = sorted(expected)
+ sorted_actual = sorted(actual)
+ if sorted_expected != sorted_actual:
+ raise BeamAssertException(
+ 'Failed assert: %r == %r' % (sorted_expected, sorted_actual))
+ # Fall back to slower method which works for different types on Python 3.
+ except TypeError:
+ for element in actual:
+ try:
+ expected_list.remove(element)
+ except ValueError:
+ raise BeamAssertException(
+ 'Failed assert: %r == %r' % (expected, actual))
+ if expected_list:
+ raise BeamAssertException(
+ 'Failed assert: %r == %r' % (expected, actual))
+
return _equal
diff --git a/sdks/python/apache_beam/transforms/util.py
b/sdks/python/apache_beam/transforms/util.py
index a6963604384..38839f57842 100644
--- a/sdks/python/apache_beam/transforms/util.py
+++ b/sdks/python/apache_beam/transforms/util.py
@@ -223,7 +223,7 @@ def __init__(self,
if target_batch_duration_secs and target_batch_duration_secs <= 0:
raise ValueError("target_batch_duration_secs (%s) must be positive" % (
target_batch_duration_secs))
- if max(0, target_batch_overhead, target_batch_duration_secs) == 0:
+ if not (target_batch_overhead or target_batch_duration_secs):
raise ValueError("At least one of target_batch_overhead or "
"target_batch_duration_secs must be positive.")
self._min_batch_size = min_batch_size
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 167370)
Time Spent: 6h 20m (was: 6h 10m)
> Several tests fail on Python 3 with TypeError: unorderable types: str() <
> int()
> -------------------------------------------------------------------------------
>
> Key: BEAM-5621
> URL: https://issues.apache.org/jira/browse/BEAM-5621
> Project: Beam
> Issue Type: Sub-task
> Components: sdk-py-core
> Reporter: Valentyn Tymofieiev
> Assignee: Robbe
> Priority: Major
> Fix For: Not applicable
>
> Time Spent: 6h 20m
> Remaining Estimate: 0h
>
> ======================================================================
> ERROR: test_remove_duplicates
> (apache_beam.transforms.ptransform_test.PTransformTest)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File
> "/usr/local/google/home/valentyn/projects/beam/clean_head/beam/sdks/python/apache_beam/runners/common.py",
> line 677, in process
> self.do_fn_invoker.invoke_process(windowed_value)
> File
> "/usr/local/google/home/valentyn/projects/beam/clean_head/beam/sdks/python/apache_beam/runners/common.py",
> line 414, in invoke_process
> windowed_value, self.process_method(windowed_value.value))
> File
> "/usr/local/google/home/valentyn/projects/beam/clean_head/beam/sdks/python/apache_beam/transforms/core.py",
> line 1068, in <lambda>
> wrapper = lambda x: [fn(x)]
> File
> "/usr/local/google/home/valentyn/projects/beam/clean_head/beam/sdks/python/apache_beam/testing/util.py",
> line 115, in _equal
> sorted_expected = sorted(expected)
> TypeError: unorderable types: str() < int()
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
