You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by bl...@apache.org on 2016/11/05 22:05:11 UTC

[1/2] avro git commit: AVRO-1907 ADDENDUM: Do not warn when logical type name is null.

Repository: avro
Updated Branches:
  refs/heads/branch-1.8 620b2807e -> edf6a7e6c


AVRO-1907 ADDENDUM: Do not warn when logical type name is null.


Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/695efafb
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/695efafb
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/695efafb

Branch: refs/heads/branch-1.8
Commit: 695efafb45f96c9d9ae0f905ef3c33fe75751612
Parents: 620b280
Author: Ryan Blue <bl...@apache.org>
Authored: Sat Nov 5 14:56:35 2016 -0700
Committer: Ryan Blue <bl...@apache.org>
Committed: Sat Nov 5 15:04:14 2016 -0700

----------------------------------------------------------------------
 lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/avro/blob/695efafb/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java b/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java
index 742b2fc..2f75594 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java
@@ -61,7 +61,9 @@ public class LogicalTypes {
 
     LogicalType logicalType;
     try {
-      if (TIMESTAMP_MILLIS.equals(typeName)) {
+      if (typeName == null) {
+        logicalType = null;
+      } else if (TIMESTAMP_MILLIS.equals(typeName)) {
         logicalType = TIMESTAMP_MILLIS_TYPE;
       } else if (DECIMAL.equals(typeName)) {
         logicalType = new Decimal(schema);


[2/2] avro git commit: AVRO-1951: Python: Fix ipc_test.py with a valid DNS name.

Posted by bl...@apache.org.
AVRO-1951: Python: Fix ipc_test.py with a valid DNS name.


Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/edf6a7e6
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/edf6a7e6
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/edf6a7e6

Branch: refs/heads/branch-1.8
Commit: edf6a7e6c38f1a5e941fbc79fd8c7d37d04344cf
Parents: 695efaf
Author: Ryan Blue <bl...@apache.org>
Authored: Sat Nov 5 15:01:52 2016 -0700
Committer: Ryan Blue <bl...@apache.org>
Committed: Sat Nov 5 15:04:25 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt              | 2 ++
 lang/py/test/test_ipc.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/avro/blob/edf6a7e6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8953f9b..18622c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -102,6 +102,8 @@ Avro 1.8.2 (5 November 2016)
 
     AVRO-1626: C#: Fix Avro.pref build error. (Naruto Takahashi via blue)
 
+    AVRO-1951: Python: Fix ipc_test.py with a valid DNS name. (blue)
+
 Avro 1.8.1 (14 May 2016)
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/avro/blob/edf6a7e6/lang/py/test/test_ipc.py
----------------------------------------------------------------------
diff --git a/lang/py/test/test_ipc.py b/lang/py/test/test_ipc.py
index 7fffe49..8d29c44 100644
--- a/lang/py/test/test_ipc.py
+++ b/lang/py/test/test_ipc.py
@@ -30,10 +30,10 @@ class TestIPC(unittest.TestCase):
     pass
 
   def test_server_with_path(self):
-    client_with_custom_path = ipc.HTTPTransceiver('dummyserver.net', 80, '/service/article')
+    client_with_custom_path = ipc.HTTPTransceiver('apache.org', 80, '/service/article')
     self.assertEqual('/service/article', client_with_custom_path.req_resource)
 
-    client_with_default_path = ipc.HTTPTransceiver('dummyserver.net', 80)
+    client_with_default_path = ipc.HTTPTransceiver('apache.org', 80)
     self.assertEqual('/', client_with_default_path.req_resource)
 
 if __name__ == '__main__':