Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 3f10092

Browse files
jbedardIgorMinar
jbedard
authored and
IgorMinar
committed
WIP: perf($parse): only execute watched expressions when the inputs change
1 parent 28cbd06 commit 3f10092

File tree

5 files changed

+192
-18
lines changed

5 files changed

+192
-18
lines changed

‎benchmarks/parsed-expressions-bp/main.html

+16
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<label for="operators">Binary/Unary operators</label>
3232
</li>
3333

34+
<li>
35+
<input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
36+
<label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
37+
</li>
38+
3439
<li>
3540
<input type="radio" ng-model="expressionType" value="filters" id="filters">
3641
<label for="filters">Filters</label>
@@ -134,6 +139,17 @@
134139
<span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
135140
</li>
136141

142+
<li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
143+
<span bm-pe-watch="rowIdx && row.odd"></span>
144+
<span bm-pe-watch="row.odd && row.even"></span>
145+
<span bm-pe-watch="row.odd && !row.even"></span>
146+
<span bm-pe-watch="row.odd || row.even"></span>
147+
<span bm-pe-watch="row.odd || row.even || row.index"></span>
148+
<span bm-pe-watch="row.index === 1 || row.index === 2"></span>
149+
<span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
150+
<span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
151+
</li>
152+
137153
<li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
138154
<span bm-pe-watch="rowIdx | noop"></span>
139155
<span bm-pe-watch="rowIdx | noop"></span>

‎src/ng/parse.js

+19-16
Original file line numberDiff line numberDiff line change
@@ -506,17 +506,16 @@ Parser.prototype = {
506506
return extend(function(self, locals){
507507
return left(self, locals) ? middle(self, locals) : right(self, locals);
508508
}, {
509-
constant: left.constant && middle.constant && right.constant,
510-
inputs: [left, middle, right]
509+
constant: left.constant && middle.constant && right.constant
511510
});
512511
},
513512

514-
binaryFn: function(left, fn, right) {
513+
binaryFn: function(left, fn, right, isBranching) {
515514
return extend(function(self, locals) {
516515
return fn(self, locals, left, right);
517516
}, {
518-
constant:left.constant && right.constant,
519-
inputs: [left, right]
517+
constant: left.constant && right.constant,
518+
inputs: !isBranching && [left, right]
520519
});
521520
},
522521

@@ -564,7 +563,7 @@ Parser.prototype = {
564563
}
565564
}
566565

567-
var inputs = !fn.externalInput && [inputFn].concat(argsFn || []);
566+
var inputs = [inputFn].concat(argsFn || []);
568567

569568
return extend(function $parseFilter(self, locals) {
570569
var input = inputFn(self, locals);
@@ -581,8 +580,8 @@ Parser.prototype = {
581580

582581
return fn(input);
583582
}, {
584-
constant: inputs && inputs.every(isConstant),
585-
inputs: inputs
583+
constant: !fn.externalInput && inputs.every(isConstant),
584+
inputs: !fn.externalInput && inputs
586585
});
587586
},
588587

@@ -630,7 +629,7 @@ Parser.prototype = {
630629
var left = this.logicalAND();
631630
var token;
632631
while ((token = this.expect('||'))) {
633-
left = this.binaryFn(left, token.fn, this.logicalAND());
632+
left = this.binaryFn(left, token.fn, this.logicalAND(), true);
634633
}
635634
return left;
636635
},
@@ -639,7 +638,7 @@ Parser.prototype = {
639638
var left = this.equality();
640639
var token;
641640
if ((token = this.expect('&&'))) {
642-
left = this.binaryFn(left, token.fn, this.logicalAND());
641+
left = this.binaryFn(left, token.fn, this.logicalAND(), true);
643642
}
644643
return left;
645644
},
@@ -1215,13 +1214,17 @@ function $ParseProvider() {
12151214
return isDefined(value) ? result : value;
12161215
};
12171216

1218-
if (parsedExpression.$$watchDelegate) {
1219-
//Only transfer the inputsWatchDelegate for interceptors not marked as having externalInput
1220-
if (!(parsedExpression.$$watchDelegate === inputsWatchDelegate && interceptorFn.externalInput)) {
1221-
fn.inputs = parsedExpression.inputs;
1222-
fn.$$watchDelegate = parsedExpression.$$watchDelegate;
1223-
}
1217+
// Propagate $$watchDelegates other then inputsWatchDelegate
1218+
if (parsedExpression.$$watchDelegate &&
1219+
parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
1220+
fn.$$watchDelegate = parsedExpression.$$watchDelegate;
1221+
} else if (!interceptorFn.externalInput) {
1222+
// If there is an interceptor, but no watchDelegate then treat the interceptor like
1223+
// we treat filters - it is assumed to be a pure function unless flagged with externalInput
1224+
fn.$$watchDelegate = inputsWatchDelegate;
1225+
fn.inputs = [parsedExpression];
12241226
}
1227+
12251228
return fn;
12261229
}
12271230
}];

‎src/ng/rootScope.js

+2
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,8 @@ function $RootScopeProvider(){
515515
* de-registration function is executed, the internal watch operation is terminated.
516516
*/
517517
$watchCollection: function(obj, listener) {
518+
$watchCollectionInterceptor.externalInput = true;
519+
518520
var self = this;
519521
// the current value, updated on each dirty-check run
520522
var newValue;

‎test/ng/directive/ngRepeatSpec.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -867,12 +867,15 @@ describe('ngRepeat', function() {
867867
// This creates one item, but it has no parent so we can't get to it
868868
$rootScope.items = [1, 2];
869869
$rootScope.$apply();
870+
expect(logs).toContain(1);
871+
expect(logs).toContain(2);
872+
logs.length = 0;
870873

871874
// This cleans up to prevent memory leak
872875
$rootScope.items = [];
873876
$rootScope.$apply();
874877
expect(angular.mock.dump(element)).toBe('<!-- ngRepeat: i in items -->');
875-
expect(logs).toEqual([1, 2, 1, 2]);
878+
expect(logs.length).toBe(0);
876879
}));
877880

878881

@@ -894,12 +897,15 @@ describe('ngRepeat', function() {
894897
// This creates one item, but it has no parent so we can't get to it
895898
$rootScope.items = [1, 2];
896899
$rootScope.$apply();
900+
expect(logs).toContain(1);
901+
expect(logs).toContain(2);
902+
logs.length = 0;
897903

898904
// This cleans up to prevent memory leak
899905
$rootScope.items = [];
900906
$rootScope.$apply();
901907
expect(sortedHtml(element)).toBe('<span>-</span><!-- ngRepeat: i in items --><span>-</span>');
902-
expect(logs).toEqual([1, 2, 1, 2]);
908+
expect(logs.length).toBe(0);
903909
}));
904910

905911

‎test/ng/parseSpec.js

+147
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,153 @@ describe('parser', function() {
13241324
});
13251325
});
13261326

1327+
describe('watched $parse expressions', function() {
1328+
it('should respect short-circuiting AND if it could have side effects', function() {
1329+
var bCalled = 0;
1330+
scope.b = function() { bCalled++; }
1331+
1332+
scope.$watch("a && b()");
1333+
scope.$digest();
1334+
scope.$digest();
1335+
expect(bCalled).toBe(0);
1336+
1337+
scope.a = true;
1338+
scope.$digest();
1339+
expect(bCalled).toBe(1);
1340+
scope.$digest();
1341+
expect(bCalled).toBe(2);
1342+
});
1343+
it('should respect short-circuiting OR if it could have side effects', function() {
1344+
var bCalled = false;
1345+
scope.b = function() { bCalled = true; }
1346+
1347+
scope.$watch("a || b()");
1348+
scope.$digest();
1349+
expect(bCalled).toBe(true);
1350+
1351+
bCalled = false;
1352+
scope.a = true;
1353+
scope.$digest();
1354+
expect(bCalled).toBe(false);
1355+
});
1356+
it('should respect the branching ternary operator if it could have side effects', function() {
1357+
var bCalled = false;
1358+
scope.b = function() { bCalled = true; }
1359+
1360+
scope.$watch("a ? b() : 1");
1361+
scope.$digest();
1362+
expect(bCalled).toBe(false);
1363+
1364+
scope.a = true;
1365+
scope.$digest();
1366+
expect(bCalled).toBe(true);
1367+
});
1368+
it('should not invoke filters unless the input/arguments change', function() {
1369+
var filterCalled = false;
1370+
$filterProvider.register('foo', valueFn(function(input) {
1371+
filterCalled = true;
1372+
return input;
1373+
}));
1374+
1375+
scope.$watch("a | foo:b:1");
1376+
scope.a = 0;
1377+
scope.$digest();
1378+
expect(filterCalled).toBe(true);
1379+
1380+
filterCalled = false;
1381+
scope.$digest();
1382+
expect(filterCalled).toBe(false);
1383+
1384+
scope.a++;
1385+
scope.$digest();
1386+
expect(filterCalled).toBe(true);
1387+
});
1388+
it('should invoke filters if they are marked as having externalInput', function() {
1389+
var filterCalled = false;
1390+
$filterProvider.register('foo', valueFn(extend(function(input) {
1391+
filterCalled = true;
1392+
return input;
1393+
}, {externalInput: true})));
1394+
1395+
scope.$watch("a | foo:b:1");
1396+
scope.a = 0;
1397+
scope.$digest();
1398+
expect(filterCalled).toBe(true);
1399+
1400+
filterCalled = false;
1401+
scope.$digest();
1402+
expect(filterCalled).toBe(true);
1403+
});
1404+
it('should not invoke interceptorFns unless the input changes', inject(function($parse) {
1405+
var called = false;
1406+
function interceptor(v) {
1407+
called = true;
1408+
return v;
1409+
}
1410+
scope.$watch($parse("a", interceptor));
1411+
scope.a = scope.b = 0;
1412+
scope.$digest();
1413+
expect(called).toBe(true);
1414+
1415+
called = false;
1416+
scope.$digest();
1417+
expect(called).toBe(false);
1418+
1419+
scope.a++;
1420+
scope.$digest();
1421+
expect(called).toBe(true);
1422+
}));
1423+
it('should invoke interceptorFns if the yare marked as having externalInput', inject(function($parse) {
1424+
var called = false;
1425+
function interceptor() {
1426+
called = true;
1427+
}
1428+
interceptor.externalInput = true;
1429+
1430+
scope.$watch($parse("a", interceptor));
1431+
scope.a = 0;
1432+
scope.$digest();
1433+
expect(called).toBe(true);
1434+
1435+
called = false;
1436+
scope.$digest();
1437+
expect(called).toBe(true);
1438+
1439+
scope.a++;
1440+
called = false;
1441+
scope.$digest();
1442+
expect(called).toBe(true);
1443+
}));
1444+
it('should treat constants inputted to filters as constants', inject(function($parse) {
1445+
var filterCalls = 0;
1446+
$filterProvider.register('foo', valueFn(function(input) {
1447+
filterCalls++;
1448+
return input;
1449+
}));
1450+
1451+
var parsed = $parse('{x: 1} | foo:1');
1452+
1453+
expect( parsed.constant ).toBe(true);
1454+
1455+
var watcherCalls = 0;
1456+
scope.$watch(parsed, function(input) {
1457+
expect(input).toEqual({x:1});
1458+
watcherCalls++;
1459+
});
1460+
1461+
scope.$digest();
1462+
expect(filterCalls).toBe(1);
1463+
expect(watcherCalls).toBe(1);
1464+
1465+
scope.$digest();
1466+
expect(filterCalls).toBe(1);
1467+
expect(watcherCalls).toBe(1);
1468+
}));
1469+
it('should not treat constants passed to filters with externalInput as constants', inject(function($parse) {
1470+
1471+
}));
1472+
});
1473+
13271474
describe('locals', function() {
13281475
it('should expose local variables', inject(function($parse) {
13291476
expect($parse('a')({a: 0}, {a: 1})).toEqual(1);

0 commit comments

Comments
 (0)