Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AVRO-4075: [csharp] Fix JsonDecoder string type failing to decode ISO string date #3209

Merged
merged 2 commits into from
Oct 16, 2024
Merged

AVRO-4075: [csharp] Fix JsonDecoder string type failing to decode ISO string date #3209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4574955
AVRO-4075: Fix JsonDecoder string type failing to decode ISO string date
NathanielAB Oct 8, 2024
de2b50f
AVRO-4075: Make AvroJsonTextReader sealed
NathanielAB Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions lang/csharp/src/apache/main/IO/JsonDecoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* 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
Expand Down Expand Up @@ -45,6 +45,14 @@ private class ReorderBuffer
public JsonReader OrigParser { get; set; }
}

private sealed class AvroJsonTextReader : JsonTextReader
{
public AvroJsonTextReader(TextReader reader) : base(reader)
martin-g marked this conversation as resolved.
Show resolved Hide resolved
{
this.DateParseHandling = DateParseHandling.None;
}
}

private JsonDecoder(Symbol root, Stream stream) : base(root)
{
Configure(stream);
Expand Down Expand Up @@ -85,7 +93,7 @@ public void Configure(Stream stream)
Parser.Reset();
reorderBuffers.Clear();
currentReorderBuffer = null;
reader = new JsonTextReader(new StreamReader(stream));
reader = new AvroJsonTextReader(new StreamReader(stream));
reader.Read();
}

Expand All @@ -100,7 +108,7 @@ public void Configure(string str)
Parser.Reset();
reorderBuffers.Clear();
currentReorderBuffer = null;
reader = new JsonTextReader(new StringReader(str));
reader = new AvroJsonTextReader(new StringReader(str));
reader.Read();
}

Expand Down Expand Up @@ -651,7 +659,7 @@ public override Symbol DoAction(Symbol input, Symbol top)
if (currentReorderBuffer != null && currentReorderBuffer.SavedFields.Count > 0)
{
throw TypeError("Unknown fields: " + currentReorderBuffer.SavedFields.Keys
.Aggregate((x, y) => x + ", " + y ));
.Aggregate((x, y) => x + ", " + y));
}

currentReorderBuffer = reorderBuffers.Pop();
Expand Down Expand Up @@ -735,6 +743,7 @@ private class JsonElementReader : JsonReader
public JsonElementReader(IList<JsonElement> elements)
{
this.elements = elements;
this.DateParseHandling = DateParseHandling.None;
pos = 0;
}

Expand Down
20 changes: 17 additions & 3 deletions lang/csharp/src/apache/test/IO/JsonCodecTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,20 @@ public void TestJsonDecoderNumeric(string type, object value)
}
}

[TestCase("{ \"s\": \"1900-01-01T00:00:00Z\" }", "1900-01-01T00:00:00Z")]
[TestCase("{ \"s\": \"1900-01-01T00:00:00.0000000Z\" }", "1900-01-01T00:00:00.0000000Z")]
[TestCase("{ \"s\": \"1900-01-01T00:00:00\" }", "1900-01-01T00:00:00")]
public void TestJsonDecoderStringDates(string json, string expected)
{
string def = "{\"type\":\"record\",\"name\":\"X\",\"fields\": [{\"type\": \"string\",\"name\":\"s\"}]}";
Schema schema = Schema.Parse(def);
DatumReader<GenericRecord> reader = new GenericDatumReader<GenericRecord>(schema, schema);

var response = reader.Read(null, new JsonDecoder(schema, json));

Assert.AreEqual(expected, response["s"]);
}

// Ensure that even if the order of fields in JSON is different from the order in schema, it works.
[Test]
public void TestJsonDecoderReorderFields()
Expand Down Expand Up @@ -386,7 +400,7 @@ public partial class Root : global::Avro.Specific.ISpecificRecord
"o.Test\",\"fields\":[{\"name\":\"id\",\"type\":\"long\"}]}}},{\"name\":\"mymap\",\"default\":null," +
"\"type\":[\"null\",{\"type\":\"map\",\"values\":\"int\"}]}]}");
private IList<Avro.Test.Item> _myarray;
private IDictionary<string,System.Int32> _mymap;
private IDictionary<string, System.Int32> _mymap;

public virtual global::Avro.Schema Schema
{
Expand All @@ -399,7 +413,7 @@ public IList<Avro.Test.Item> myarray
set { this._myarray = value; }
}

public IDictionary<string,System.Int32> mymap
public IDictionary<string, System.Int32> mymap
{
get { return this._mymap; }
set { this._mymap = value; }
Expand All @@ -423,7 +437,7 @@ public virtual void Put(int fieldPos, object fieldValue)
this.myarray = (IList<Avro.Test.Item>)fieldValue;
break;
case 1:
this.mymap = (IDictionary<string,System.Int32>)fieldValue;
this.mymap = (IDictionary<string, System.Int32>)fieldValue;
break;
default: throw new global::Avro.AvroRuntimeException("Bad index " + fieldPos + " in Put()");
}
Expand Down