Skip to content

AVRO-3491 Avoid a cast after is check #1645

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

Merged
martin-g merged 15 commits into from
Apr 19, 2022
Merged

AVRO-3491 Avoid a cast after is check #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b8601c0
AVRO-3360 Updated XML documentation
Feb 3, 2022
d01699a
Revert "AVRO-3360 Updated XML documentation"
Feb 3, 2022
83093e1
Merge branch 'apache:master' into master
KyleSchoonover Feb 4, 2022
c992da4
Merge branch 'apache:master' into master
KyleSchoonover Feb 10, 2022
fa5f7c2
Merge branch 'apache:master' into master
KyleSchoonover Feb 14, 2022
6989e61
Merge branch 'apache:master' into master
KyleSchoonover Feb 16, 2022
d06604a
Merge branch 'apache:master' into master
KyleSchoonover Feb 24, 2022
2b39bb0
Merge branch 'apache:master' into master
KyleSchoonover Feb 28, 2022
f8a7611
Merge branch 'apache:master' into master
KyleSchoonover Mar 9, 2022
a5fa2ef
Merge branch 'apache:master' into master
KyleSchoonover Mar 18, 2022
0216b4d
Merge branch 'apache:master' into master
KyleSchoonover Mar 21, 2022
d97a23c
Merge branch 'apache:master' into master
KyleSchoonover Apr 8, 2022
e1db956
Merge branch 'apache:master' into master
KyleSchoonover Apr 13, 2022
e586782
Merge branch 'apache:master' into master
KyleSchoonover Apr 14, 2022
d935be2
AVRO-3491 Avoid a cast after is check
KyleSchoonover Apr 14, 2022
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
14 changes: 7 additions & 7 deletions lang/csharp/src/apache/main/Generic/GenericDatumReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,16 @@ public GenericEnumAccess(EnumSchema schema)

public object CreateEnum(object reuse, int ordinal)
{
if (reuse is GenericEnum)
if (reuse is GenericEnum ge)
{
var ge = (GenericEnum) reuse;
if (ge.Schema.Equals(this.schema))
if (ge.Schema.Equals(schema))
{
ge.Value = this.schema[ordinal];
ge.Value = schema[ordinal];
return ge;
}
}
return new GenericEnum(this.schema, this.schema[ordinal]);

return new GenericEnum(schema, schema[ordinal]);
}
}

Expand Down Expand Up @@ -204,12 +204,12 @@ class GenericMapAccess : MapAccess
{
public object Create(object reuse)
{
if (reuse is IDictionary<string, object>)
if (reuse is IDictionary<string, object> result)
{
var result = (IDictionary<string, object>)reuse;
result.Clear();
return result;
}

return new Dictionary<string, object>();
}

Expand Down
11 changes: 5 additions & 6 deletions lang/csharp/src/apache/main/Generic/PreresolvingDatumReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,14 @@ private ReadItem ResolveUnion(UnionSchema writerSchema, Schema readerSchema)

for (int i = 0; i < writerSchema.Count; i++)
{
var writerBranch = writerSchema[i];
Schema writerBranch = writerSchema[i];

if (readerSchema is UnionSchema)
if (readerSchema is UnionSchema unionReader)
{
var unionReader = (UnionSchema) readerSchema;
var readerBranch = unionReader.MatchingBranch(writerBranch);
int readerBranch = unionReader.MatchingBranch(writerBranch);
if (readerBranch == -1)
{
lookup[i] = (r, d) => { throw new AvroException( "No matching schema for " + writerBranch + " in " + unionReader ); };
lookup[i] = (r, d) => { throw new AvroException("No matching schema for " + writerBranch + " in " + unionReader); };
}
else
{
Expand All @@ -338,7 +337,7 @@ private ReadItem ResolveUnion(UnionSchema writerSchema, Schema readerSchema)
{
if (!readerSchema.CanRead(writerBranch))
{
lookup[i] = (r, d) => { throw new AvroException( "Schema mismatch Reader: " + ReaderSchema + ", writer: " + WriterSchema ); };
lookup[i] = (r, d) => { throw new AvroException("Schema mismatch Reader: " + ReaderSchema + ", writer: " + WriterSchema); };
}
else
{
Expand Down