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

Jump to bottom

Fix AsStep optimization bug #886

Merged
merged 4 commits into from
Mar 21, 2023
Merged

Fix AsStep optimization bug #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59164eb
Add Step-to-Traversal serialization.
danielcweber Mar 21, 2023
e06ac45
Fix a bug in AsStep optimization that would swallow consecutive AsSteps.
danielcweber Mar 21, 2023
557e9d6
Fix snapshots for #886.
danielcweber Mar 21, 2023
4c4ba26
Fix snapshots for #886.
danielcweber Mar 21, 2023
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
9 changes: 8 additions & 1 deletion src/ExRam.Gremlinq.Core/Serialization/Serializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ static void AddInnerInstruction(Instruction instruction, Bytecode byteCode)
{
AddStep(expandedStep, byteCode, env, recurse);
}
else if (recurse.TryTransform(step, env, out Traversal traversal))
{
foreach (var innerExpandedStep in traversal.Steps)
{
AddStep(innerExpandedStep, byteCode, env, recurse);
}
}
else if (recurse.TryTransform(step, env, out Instruction[]? expandedInstructions))
{
foreach (var expandedInstruction in expandedInstructions)
Expand Down Expand Up @@ -179,7 +186,7 @@ static void AddInnerInstruction(Instruction instruction, Bytecode byteCode)
if (span[j] is SelectStepLabelStep selectStep && ReferenceEquals(asStep.StepLabel, selectStep.StepLabels[0]))
continue;

if (span[j] is AsStep asStep2 && asStep2.StepLabel.Equals(asStep2.StepLabel))
if (span[j] is AsStep asStep2 && asStep2.StepLabel.Equals(asStep.StepLabel))
continue;

break;
Expand Down
1 change: 1 addition & 0 deletions ...ugging/DefaultDebugGremlinQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
g.V().hasLabel('Person').as('label1').as('label2').project('id','label','properties').by(id).by(label).by(__.properties().group().by(label).by(__.project('id','label','value','properties').by(id).by(label).by(value).by(__.valueMap()).fold()))
13 changes: 13 additions & 0 deletions test/ExRam.Gremlinq.Core.Tests/QueryExecutionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,19 @@ await _g
.Verify();
}

[Fact]
public virtual async Task As_As_with_different_labels()
{
var label1 = "label1";
var label2 = "label2";

await _g
.V<Person>()
.As(label1)
.As(label2)
.Verify();
}

[Fact]
public virtual async Task As_followed_by_Select()
{
Expand Down
149 changes: 149 additions & 0 deletions ...sts/Serialization/BytecodeQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
[
{
"Id": "00000000-0000-0000-0000-000000000000",
"Bytecode": {
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "V",
"Arguments": []
},
{
"OperatorName": "hasLabel",
"Arguments": [
"Person"
]
},
{
"OperatorName": "as",
"Arguments": [
"label1"
]
},
{
"OperatorName": "as",
"Arguments": [
"label2"
]
},
{
"OperatorName": "project",
"Arguments": [
"id",
"label",
"properties"
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "id"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "properties",
"Arguments": []
},
{
"OperatorName": "group",
"Arguments": []
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "project",
"Arguments": [
"id",
"label",
"value",
"properties"
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "id"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "value"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "valueMap",
"Arguments": []
}
]
}
]
},
{
"OperatorName": "fold",
"Arguments": []
}
]
}
]
}
]
}
]
}
]
}
}
]
6 changes: 6 additions & 0 deletions ...alization/Graphson2GremlinQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"Id": "00000000-0000-0000-0000-000000000000",
"GraphSON": "{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"Person\"],[\"as\",\"label1\"],[\"as\",\"label2\"],[\"project\",\"id\",\"label\",\"properties\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"id\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"properties\"],[\"group\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"project\",\"id\",\"label\",\"value\",\"properties\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"id\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"value\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"valueMap\"]]}}],[\"fold\"]]}}]]}}]]}}"
}
]
6 changes: 6 additions & 0 deletions ...alization/Graphson3GremlinQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"Id": "00000000-0000-0000-0000-000000000000",
"GraphSON": "{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"V\"],[\"hasLabel\",\"Person\"],[\"as\",\"label1\"],[\"as\",\"label2\"],[\"project\",\"id\",\"label\",\"properties\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"id\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"properties\"],[\"group\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"project\",\"id\",\"label\",\"value\",\"properties\"],[\"by\",{\"@type\":\"g:T\",\"@value\":\"id\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"label\"}],[\"by\",{\"@type\":\"g:T\",\"@value\":\"value\"}],[\"by\",{\"@type\":\"g:Bytecode\",\"@value\":{\"step\":[[\"valueMap\"]]}}],[\"fold\"]]}}]]}}]]}}"
}
]
149 changes: 149 additions & 0 deletions ...hEmptyProjectionValueProtectionSerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
[
{
"Id": "00000000-0000-0000-0000-000000000000",
"Bytecode": {
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "V",
"Arguments": []
},
{
"OperatorName": "hasLabel",
"Arguments": [
"Person"
]
},
{
"OperatorName": "as",
"Arguments": [
"label1"
]
},
{
"OperatorName": "as",
"Arguments": [
"label2"
]
},
{
"OperatorName": "project",
"Arguments": [
"id",
"label",
"properties"
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "id"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "properties",
"Arguments": []
},
{
"OperatorName": "group",
"Arguments": []
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "project",
"Arguments": [
"id",
"label",
"value",
"properties"
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "id"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "label"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"EnumName": "T",
"EnumValue": "value"
}
]
},
{
"OperatorName": "by",
"Arguments": [
{
"SourceInstructions": [],
"StepInstructions": [
{
"OperatorName": "valueMap",
"Arguments": []
}
]
}
]
},
{
"OperatorName": "fold",
"Arguments": []
}
]
}
]
}
]
}
]
}
]
}
}
]
15 changes: 15 additions & 0 deletions ...erialization/GroovyGremlinQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"Script": "g.V().hasLabel(_a).as(_b).as(_c).project(_d,_e,_f).by(id).by(label).by(__.properties().group().by(label).by(__.project(_d,_e,_g,_f).by(id).by(label).by(value).by(__.valueMap()).fold()))",
"Id": "00000000-0000-0000-0000-000000000000",
"Bindings": {
"_a": "Person",
"_b": "label1",
"_c": "label2",
"_d": "id",
"_e": "label",
"_f": "properties",
"_g": "value"
}
}
]
1 change: 1 addition & 0 deletions ...Tests/CosmosDbDebugGremlinQuerySerializationTest.As_As_with_different_labels.verified.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
g.V().hasLabel('Person').as('label1').as('label2')
Loading