Skip to content

Conversation

@anhldbk
Copy link
Contributor

@anhldbk anhldbk commented Mar 29, 2020

My PR addresses the following issue Avro-2785

Copy link
Contributor

@Fokko Fokko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you resolve the conflicts @anhldbk ?

@anhldbk
Copy link
Contributor Author

anhldbk commented May 3, 2020

@Fokko What should I do? I agree with Roger's comment

@Fokko
Copy link
Contributor

Fokko commented May 3, 2020

I can't merge the PR, there is a merge conflict in lang/py/avro/io.py. You should pull the latest master into your branch, and resolve the conflicts.

@anhldbk anhldbk requested a review from Fokko May 3, 2020 09:38
@anhldbk
Copy link
Contributor Author

anhldbk commented May 3, 2020

@Fokko PTAL :)

@Fokko
Copy link
Contributor

Fokko commented May 3, 2020

@anhldbk I see a lot of unrelated changes in lang/py/avro/io.py, could you check? We like to minimize the changes, to avoid unrelated changes in version control.

@anhldbk
Copy link
Contributor Author

anhldbk commented May 4, 2020

@Fokko I've got troubles with my Python formatter. Gonna resolve it and tell you later

@anhldbk
Copy link
Contributor Author

anhldbk commented May 4, 2020

@Fokko actualluy my latest commit fixed the unrelated changes due to incompatibility in Python formatters. Please check

 λ git diff AVRO-2785 upstream/master -- lang/py/avro/io.py
diff --git a/lang/py/avro/io.py b/lang/py/avro/io.py
index e165db3a..b910ba56 100644
--- a/lang/py/avro/io.py
+++ b/lang/py/avro/io.py
@@ -846,7 +846,7 @@ class DatumReader(object):

     def read_union(self, writers_schema, readers_schema, decoder):
         """
-        A union is encoded by first writing an int value indicating
+        A union is encoded by first writing a long value indicating
         the zero-based position within the union of the schema of its value.
         The value is then encoded per the indicated schema within the union.
         """
@@ -1096,7 +1096,7 @@ class DatumWriter(object):

     def write_union(self, writers_schema, datum, encoder):
         """
-        A union is encoded by first writing an int value indicating
+        A union is encoded by first writing a long value indicating
         the zero-based position within the union of the schema of its value.
         The value is then encoded per the indicated schema within the union.
         """

@kojiromike
Copy link
Contributor

Looks good to me. Thanks for contributing!

@Fokko Fokko merged commit 7ab212b into apache:master May 9, 2020
@Fokko
Copy link
Contributor

Fokko commented May 9, 2020

Thanks @anhldbk

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants