AVRO-2825: [csharp] Resolve: C# Logical Types throw exception on unkn…

lang/csharp/src/apache/main/Schema/LogicalSchema.cs

@@ -54,7 +54,7 @@ private LogicalSchema(Schema baseSchema, string logicalTypeName,  PropertyMap pr
         {
             BaseSchema = baseSchema ?? throw new ArgumentNullException(nameof(baseSchema));
             LogicalTypeName = logicalTypeName;
-            LogicalType = LogicalTypeFactory.Instance.GetFromLogicalSchema(this);
+            LogicalType = LogicalTypeFactory.Instance.GetFromLogicalSchema(this, true);
         }
 
         /// <summary>

lang/csharp/src/apache/main/Util/LogicalTypeFactory.cs

@@ -45,7 +45,7 @@ private LogicalTypeFactory()
                 { TimeMicrosecond.LogicalTypeName, new TimeMicrosecond() },
                 { TimestampMillisecond.LogicalTypeName, new TimestampMillisecond() },
                 { TimestampMicrosecond.LogicalTypeName, new TimestampMicrosecond() },
-                { Uuid.LogicalTypeName, new Uuid() }
+                { Uuid.LogicalTypeName, new Uuid() },
             };
         }
 
@@ -67,22 +67,22 @@ public void Register(LogicalType logicalType)
         /// <returns>A <see cref="LogicalType" />.</returns>
         public LogicalType GetFromLogicalSchema(LogicalSchema schema, bool ignoreInvalidOrUnknown = false)
         {
-            try
-            {
-                if (!_logicalTypes.TryGetValue(schema.LogicalTypeName, out LogicalType logicalType))
-                    throw new AvroTypeException("Logical type '" + schema.LogicalTypeName + "' is not supported.");
+            LogicalType logicalType = null;
 
+            if (_logicalTypes.TryGetValue(schema.LogicalTypeName, out logicalType))
+            {
                 logicalType.ValidateSchema(schema);
-
-                return logicalType;
             }
-            catch (AvroTypeException)
+            else if (ignoreInvalidOrUnknown)
+            {
+                logicalType = new UnknownLogicalType(schema);
+            }
+            else
             {
-                if (!ignoreInvalidOrUnknown)
-                    throw;
+                throw new AvroTypeException("Logical type '" + schema.LogicalTypeName + "' is not supported.");
             }
 
-            return null;
+            return logicalType;
         }
     }
 }

lang/csharp/src/apache/main/Util/UnknownLogicalType.cs

@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avro.Util
+{
+    /// <summary>
+    /// Class UnknownLogicalType.
+    /// Implements the <see cref="Avro.Util.LogicalType" />
+    /// </summary>
+    /// <seealso cref="Avro.Util.LogicalType" />
+    public class UnknownLogicalType : LogicalType
+    {
+        /// <summary>
+        /// Gets the schema.
+        /// </summary>
+        /// <value>The schema.</value>
+        public LogicalSchema Schema { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UnknownLogicalType"/> class.
+        /// </summary>
+        /// <param name="schema">The schema.</param>
+        public UnknownLogicalType(LogicalSchema schema) : base(schema.LogicalTypeName)
+        {
+            this.Schema = schema;
+        }
+
+        /// <summary>
+        /// Converts a logical value to an instance of its base type.
+        /// </summary>
+        /// <param name="logicalValue">The logical value to convert.</param>
+        /// <param name="schema">The schema that represents the target of the conversion.</param>
+        /// <returns>An object representing the encoded value of the base type.</returns>
+        public override object ConvertToBaseValue(object logicalValue, LogicalSchema schema)
+        {
+            switch (schema.Name)
+            {
+                case @"string":
+                    return (System.String)logicalValue;
+                case @"boolean":
+                    return (System.Boolean)logicalValue;
+                case @"int":
+                    return (System.Int32)logicalValue;
+                case @"long":
+                    return (System.Int64)logicalValue;
+                case @"float":
+                    return (System.Single)logicalValue;
+                case @"double":
+                    return (System.Double)logicalValue;
+                case @"bytes":
+                    return (System.Byte[])logicalValue;
+                default:
+                    return logicalValue;
+            }
+        }
+
+        /// <summary>
+        /// Converts a base value to an instance of the logical type.
+        /// </summary>
+        /// <param name="baseValue">The base value to convert.</param>
+        /// <param name="schema">The schema that represents the target of the conversion.</param>
+        /// <returns>An object representing the encoded value of the logical type.</returns>
+        public override object ConvertToLogicalValue(object baseValue, LogicalSchema schema)
+        {
+            switch (schema.Name)
+            {
+                case @"string":
+                    return (System.String)baseValue;
+                case @"boolean":
+                    return (System.Boolean)baseValue;
+                case @"int":
+                    return (System.Int32)baseValue;
+                case @"long":
+                    return (System.Int64)baseValue;
+                case @"float":
+                    return (System.Single)baseValue;
+                case @"double":
+                    return (System.Double)baseValue;
+                case @"bytes":
+                    return (System.Byte[])baseValue;
+                default:
+                    return baseValue;
+            }
+        }
+
+        /// <summary>
+        /// Retrieve the .NET type that is represented by the logical type implementation.
+        /// </summary>
+        /// <param name="nullible">A flag indicating whether it should be nullible.</param>
+        /// <returns>Type.</returns>
+        public override Type GetCSharpType(bool nullible)
+        {
+            // handle all Primitive Types
+            switch (this.Schema.BaseSchema.Name)
+            {
+                case @"string":
+                    return typeof(System.String);
+                case @"boolean":
+                    return nullible ? typeof(System.Boolean?) : typeof(System.Boolean);
+                case @"int":
+                    return nullible ? typeof(System.Int32?) : typeof(System.Int32);
+                case @"long":
+                    return nullible ? typeof(System.Int64?) : typeof(System.Int64);
+                case @"float":
+                    return nullible ? typeof(System.Single?) : typeof(System.Single);
+                case @"double":
+                    return nullible ? typeof(System.Double?) : typeof(System.Double);
+                case @"bytes":
+                    return nullible ? typeof(System.Byte?[]) : typeof(System.Byte[]);
+                default:
+                    return typeof(System.Object);
+            }
+        }
+
+        /// <summary>
+        /// Determines if a given object is an instance of the logical type.
+        /// </summary>
+        /// <param name="logicalValue">The logical value to test.</param>
+        /// <returns><c>true</c> if [is instance of logical type] [the specified logical value]; otherwise, <c>false</c>.</returns>
+        public override bool IsInstanceOfLogicalType(object logicalValue)
+        {
+            // handle all Primitive Types
+            switch (this.Schema.BaseSchema.Name)
+            {
+                case @"string":
+                    return logicalValue is System.String;
+                case @"boolean":
+                    return logicalValue is System.Boolean;
+                case @"int":
+                    return logicalValue is System.Int32;
+                case @"long":
+                    return logicalValue is System.Int64;
+                case @"float":
+                    return logicalValue is System.Single;
+                case @"double":
+                    return logicalValue is System.Double;
+                case @"bytes":
+                    return logicalValue is System.Byte[];
+                default:
+                    return true;
+            }
+        }
+
+    }
+}

lang/csharp/src/apache/test/AvroGen/AvroGenSchemaTests.cs

@@ -606,9 +606,9 @@ public void GenerateSchema(string schema, IEnumerable<string> typeNamesToCheck,
             AvroGenHelper.TestSchema(schema, typeNamesToCheck, new Dictionary<string, string> { { namespaceMappingFrom, namespaceMappingTo } }, generatedFilesToCheck);
         }
 
-        [TestCase(_logicalTypesWithCustomConversion, typeof(AvroTypeException))]
-        [TestCase(_customConversionWithLogicalTypes, typeof(SchemaParseException))]
-        public void NotSupportedSchema(string schema, Type expectedException)
+        [TestCase(_logicalTypesWithCustomConversion, typeof(AvroTypeException), 0)]
+        [TestCase(_customConversionWithLogicalTypes, typeof(SchemaParseException), 1)]
+        public void NotSupportedSchema(string schema, Type expectedException, int expectedResult)
         {
             // Create temp folder
             string outputDir = AvroGenHelper.CreateEmptyTemporaryFolder(out string uniqueId);
@@ -619,7 +619,8 @@ public void NotSupportedSchema(string schema, Type expectedException)
                 string schemaFileName = Path.Combine(outputDir, $"{uniqueId}.avsc");
                 System.IO.File.WriteAllText(schemaFileName, schema);
 
-                Assert.That(AvroGenTool.GenSchema(schemaFileName, outputDir, new Dictionary<string, string>(), false), Is.EqualTo(1));
+                Assert.That(AvroGenTool.GenSchema(schemaFileName, outputDir, new Dictionary<string, string>(), false), Is.EqualTo(expectedResult));
+
             }
             finally
             {

lang/csharp/src/apache/test/File/FileTests.cs

@@ -35,6 +35,34 @@ public class FileTests
         const string specificSchema  = "{\"type\":\"record\",\"name\":\"Foo\",\"namespace\":\"Avro.Test.File\",\"fields\":"
                                      + "[{\"name\":\"name\",\"type\":[\"null\",\"string\"]},{\"name\":\"age\",\"type\":\"int\"}]}";
 
+        /// <summary>
+        /// This test case added to confirm standalone serialization / deserialization behavior of new type UnknownLogicalType
+        /// </summary>
+        const string unknowLogicalTypeSchema = @"
+{
+	""type"" : ""record"",
+	""name"" : ""Foo"",
+	""namespace"" : ""Avro.Test.File"",
+	""fields"": [
+		{
+			""name"" :""name"",
+			""type"":  [
+                ""null"",
+                {
+                  ""logicalType"": ""varchar"",
+                  ""maxLength"": 65,
+                  ""type"": ""string""
+                }
+              ]
+		}, 
+		{
+			""name"" : ""age"",
+			""type"" : ""int""
+		}
+	]
+}
+";
+
         private static IEnumerable<TestCaseData> TestSpecificDataSource()
         {
             foreach (Codec.Type codecType in Enum.GetValues(typeof(Codec.Type)))
@@ -100,6 +128,11 @@ private static IEnumerable<TestCaseData> TestSpecificDataSource()
                         new object[] { "Bob", 9 },
                         new object[] { null, 48 }
                     }, codecType).SetName("{m}(Case3,{2})");
+
+                yield return new TestCaseData(unknowLogicalTypeSchema, new object[]
+                    {
+                        new object[] { "John", 23 }
+                    }, codecType).SetName("{m}(Case4,{2})");
             }
         }
 

lang/csharp/src/apache/test/Schema/SchemaTests.cs

@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using NUnit.Framework;
 using System.Linq;
+using Avro.Util;
 
 namespace Avro.Test
 {
@@ -548,12 +549,76 @@
             testToString(sc);
         }
 
+        // Make sure unknown type is carried thru to LogicalTypeName
         [TestCase("{\"type\": \"int\", \"logicalType\": \"unknown\"}", "unknown")]
         public void TestUnknownLogical(string s, string unknownType)
         {
-            var err = Assert.Throws<AvroTypeException>(() => Schema.Parse(s));
+            var schema = Schema.Parse(s);
+            Assert.IsNotNull(schema);   // make sure Variable is not null
+            Assert.IsInstanceOf(typeof(LogicalSchema), schema);
 
-            Assert.AreEqual("Logical type '" + unknownType + "' is not supported.", err.Message);
+            var logicalSchema = schema as LogicalSchema;
+            Assert.IsNotNull(logicalSchema);   // make sure Variable is not null
+            Assert.IsInstanceOf(typeof(UnknownLogicalType), logicalSchema.LogicalType);
+
+            Assert.AreEqual(logicalSchema.LogicalTypeName, unknownType);
+        }
+
+        /*
+            {
+              "fields": [
+                {
+                  "default": 0,
+                  "name": "firstField",
+                  "type": "int"
+                },
+                {
+                  "default": null,
+                  "name": "secondField",
+                  "type": [
+                    "null",
+                    {
+                      "logicalType": "varchar",
+                      "maxLength": 65,
+                      "type": "string"
+                    }
+                  ]
+                }
+              ],
+              "name": "sample_schema",
+              "type": "record"
+            }
+         */
+
+        // Before Change will throw Avro.AvroTypeException: 'Logical type 'varchar' is not supported.'
+        // Per AVRO Spec (v1.8.0 - v1.11.1) ... Logical Types Section
+        //  Language implementations must ignore unknown logical types when reading, and should use the underlying Avro type.
+        [TestCase("{\"fields\": [{\"default\": 0,\"name\": \"firstField\",\"type\": \"int\"},{\"default\": null,\"name\": \"secondField\",\"type\": [\"null\",{\"logicalType\": \"varchar\",\"maxLength\": 65,\"type\": \"string\"}]}],\"name\": \"sample_schema\",\"type\": \"record\"}")]
+        public void TestUnknownLogicalType(string schemaText)
+        {
+            var schema = Avro.Schema.Parse(schemaText);
+            Assert.IsNotNull(schema);
+
+            var secondField = ((RecordSchema)schema).Fields.FirstOrDefault(f => f.Name == @"secondField");
+            Assert.IsNotNull(secondField);
+
+            var secondFieldSchema = (secondField).Schema;
+            Assert.IsNotNull(secondFieldSchema);
+
+            var secondFieldUnionSchema = (UnionSchema)secondFieldSchema;
+            Assert.IsNotNull(secondFieldUnionSchema);
+
+            var props = secondFieldUnionSchema.Schemas.Where(s => s.Props != null).ToList();
+            Assert.IsNotNull(props);
+            Assert.IsTrue(props.Count == 1);
+
+            var prop = props[0];
+            // Confirm that the unknown logical type is ignored and the underlying AVRO type is used
+            Assert.IsTrue(prop.Name == @"string");
+            var logicalSchema = prop as LogicalSchema;
+            Assert.IsInstanceOf(typeof(UnknownLogicalType), logicalSchema.LogicalType);
+
+            Assert.AreEqual(logicalSchema.LogicalTypeName, @"varchar");
         }
 
         [TestCase("{\"type\": \"map\", \"values\": \"long\"}", "long")]