Skip to content

AVRO-4331: [csharp] Fix unreachable code in generated Get()/Put() #3937

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

Open
GBNikola wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −4
Open

AVRO-4331: [csharp] Fix unreachable code in generated Get()/Put() #3937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lang/csharp/src/apache/main/CodeGen/CodeGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,15 +874,15 @@ protected virtual CodeTypeDeclaration processRecord(Schema schema)
// end switch block for Get()
getFieldStmt.AppendLine("\t\t\tdefault: throw new global::Avro.AvroRuntimeException(\"Bad index \" + fieldPos + \" in Get()\");")
.Append("\t\t\t}");
var cseGet = new CodeSnippetExpression(getFieldStmt.ToString());
cmmGet.Statements.Add(cseGet);
var cssGet = new CodeSnippetStatement(getFieldStmt.ToString());
cmmGet.Statements.Add(cssGet);
ctd.Members.Add(cmmGet);

// end switch block for Put()
putFieldStmt.AppendLine("\t\t\tdefault: throw new global::Avro.AvroRuntimeException(\"Bad index \" + fieldPos + \" in Put()\");")
.Append("\t\t\t}");
var csePut = new CodeSnippetExpression(putFieldStmt.ToString());
cmmPut.Statements.Add(csePut);
var cssPut = new CodeSnippetStatement(putFieldStmt.ToString());
cmmPut.Statements.Add(cssPut);
ctd.Members.Add(cmmPut);

string nspace = recordSchema.Namespace;
Expand Down
26 changes: 26 additions & 0 deletions lang/csharp/src/apache/test/CodGen/CodeGenTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,32 @@ public void GetTypesShouldReturnTypes()
Assert.That(Regex.Matches(planetEnumCode, "public enum PlanetEnum").Count, Is.EqualTo(1));
}

[Test]
public void RecordGetAndPutSwitchesShouldNotEmitUnreachableStatement()
{
AddSchema(@"
{
""name"": ""Sample"",
""namespace"": ""Avro.Test.CodeGen.UnreachableCodeRegression"",
""type"": ""record"",
""fields"": [
{ ""name"": ""value"", ""type"": ""string"" }
]
}
");
GenerateCode();
var types = GetTypes();
bool hasSampleCode = types.TryGetValue("Sample", out string sampleCode);
Assert.That(hasSampleCode);

// The exhaustive switch in Get()/Put() must not be followed by a stray ";" -
// that empty statement is unreachable (every case returns or throws) and
// trips IDE-only unreachable-code analysis (e.g. ReSharper) even though Roslyn
// does not flag it.
Assert.That(Regex.IsMatch(sampleCode, @"\}\s*;\s*\}\s*public virtual void Put"), Is.False);
Assert.That(Regex.IsMatch(sampleCode, @"in Put\(\)""\);\s*\}\s*;"), Is.False);
}

[Test]
public void EnumWithKeywordSymbolsShouldHavePrefixedSymbols()
{
Expand Down