Merge pull request #7 from mficzel/patch-2

Marvin Kuhn · web-flow · commit ccc368762ae2 · 2019-09-24T17:06:43.000+02:00
Bugfix: Optimize cache annotations
diff --git a/Resources/Private/Fusion/NodeTypes/ABTestingContainer.fusion b/Resources/Private/Fusion/NodeTypes/ABTestingContainer.fusion
@@ -18,24 +18,20 @@ prototype(Wysiwyg.ABTesting:ABTestingContainer) < prototype(Neos.Neos:ContentCom
     @cache {
         mode = 'dynamic'
         entryIdentifier {
-            0 = ${node}
-            1 = ${feature}
-            2 = ${testCase}
+            node = ${node}
         }
 
-        entryDiscriminator = Neos.Fusion:Collection {
-            0 = ${feature}
-            1 = ${testCase}
-        }
+        entryDiscriminator = ${Wysiwyg.ABTesting.Decisions.getDecisionForFeature(feature, request.arguments.forceABVersion)}
 
         entryTags {
             1 = ${Neos.Caching.nodeTag(node)}
         }
 
         context {
             1 = 'node'
-            2 = 'testCase'
-            3 = 'feature'
+            2 = 'documentNode'
+            3 = 'site'
+            4 = 'feature'
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,24 +18,20 @@ prototype(Wysiwyg.ABTesting:ABTestingContainer) < prototype(Neos.Neos:ContentCom`
`18`	`18`	`@cache {`
`19`	`19`	`mode = 'dynamic'`
`20`	`20`	`entryIdentifier {`
`21`		`- 0 = ${node}`
`22`		`- 1 = ${feature}`
`23`		`- 2 = ${testCase}`
	`21`	`+ node = ${node}`
`24`	`22`	`}`
`25`	`23`
`26`		`- entryDiscriminator = Neos.Fusion:Collection {`
`27`		`- 0 = ${feature}`
`28`		`- 1 = ${testCase}`
`29`		`- }`
	`24`	`+ entryDiscriminator = ${Wysiwyg.ABTesting.Decisions.getDecisionForFeature(feature, request.arguments.forceABVersion)}`
`30`	`25`
`31`	`26`	`entryTags {`
`32`	`27`	`1 = ${Neos.Caching.nodeTag(node)}`
`33`	`28`	`}`
`34`	`29`
`35`	`30`	`context {`
`36`	`31`	`1 = 'node'`
`37`		`- 2 = 'testCase'`
`38`		`- 3 = 'feature'`
	`32`	`+ 2 = 'documentNode'`
	`33`	`+ 3 = 'site'`
	`34`	`+ 4 = 'feature'`
`39`	`35`	`}`
`40`	`36`	`}`
`41`	`37`	`}`