Merge branch 'feature/mongo_2.6.5' into feature/mongo_2.6.5_documentSource

Conflicts:
	lib/pipeline/expressions/index.js

lib/pipeline/accumulators/index.js

@@ -1,11 +1,11 @@
 "use strict";
 module.exports = {
 	Accumulator: require("./Accumulator"),
-	AddToSet: require("./AddToSetAccumulator"),
-	Avg: require("./AvgAccumulator"),
-	First: require("./FirstAccumulator"),
-	Last: require("./LastAccumulator"),
-	MinMax: require("./MinMaxAccumulator"),
-	Push: require("./PushAccumulator"),
-	Sum: require("./SumAccumulator")
+	AddToSetAccumulator: require("./AddToSetAccumulator"),
+	AvgAccumulator: require("./AvgAccumulator"),
+	FirstAccumulator: require("./FirstAccumulator"),
+	LastAccumulator: require("./LastAccumulator"),
+	MinMaxAccumulator: require("./MinMaxAccumulator"),
+	PushAccumulator: require("./PushAccumulator"),
+	SumAccumulator: require("./SumAccumulator"),
 };

lib/pipeline/documentSources/GroupDocumentSource.js

@@ -45,14 +45,14 @@ var GroupDocumentSource = module.exports = function GroupDocumentSource(expCtx)
 
 // TODO: Do we need this?
 klass.groupOps = {
-	"$addToSet": Accumulators.AddToSet,
-	"$avg": Accumulators.Avg,
-	"$first": Accumulators.First,
-	"$last": Accumulators.Last,
-	"$max": Accumulators.MinMax.createMax, // $min and $max have special constructors because they share base features
-	"$min": Accumulators.MinMax.createMin,
-	"$push": Accumulators.Push,
-	"$sum": Accumulators.Sum
+	"$addToSet": Accumulators.AddToSetAccumulator.create,
+	"$avg": Accumulators.AvgAccumulator.create,
+	"$first": Accumulators.FirstAccumulator.create,
+	"$last": Accumulators.LastAccumulator.create,
+	"$max": Accumulators.MinMaxAccumulator.createMax, // $min and $max have special constructors because they share base features
+	"$min": Accumulators.MinMaxAccumulator.createMin,
+	"$push": Accumulators.PushAccumulator.create,
+	"$sum": Accumulators.SumAccumulator.create,
 };
 
 klass.groupName = "$group";

lib/pipeline/expressions/index.js

@@ -1,37 +1,51 @@
 "use strict";
 module.exports = {
-	AddExpression: require("./AddExpression.js"),
-	AndExpression: require("./AndExpression.js"),
-	CoerceToBoolExpression: require("./CoerceToBoolExpression.js"),
-	CompareExpression: require("./CompareExpression.js"),
-	ConcatExpression: require("./ConcatExpression.js"),
-	CondExpression: require("./CondExpression.js"),
-	ConstantExpression: require("./ConstantExpression.js"),
-	DayOfMonthExpression: require("./DayOfMonthExpression.js"),
-	DayOfWeekExpression: require("./DayOfWeekExpression.js"),
-	DayOfYearExpression: require("./DayOfYearExpression.js"),
-	DivideExpression: require("./DivideExpression.js"),
-	Expression: require("./Expression.js"),
-	FieldPathExpression: require("./FieldPathExpression.js"),
-	HourExpression: require("./HourExpression.js"),
-	IfNullExpression: require("./IfNullExpression.js"),
-	MinuteExpression: require("./MinuteExpression.js"),
-	ModExpression: require("./ModExpression.js"),
-	MonthExpression: require("./MonthExpression.js"),
-	MultiplyExpression: require("./MultiplyExpression.js"),
-	NaryBaseExpressionT: require("./NaryBaseExpressionT.js"),
-	NotExpression: require("./NotExpression.js"),
-	ObjectExpression: require("./ObjectExpression.js"),
-	OrExpression: require("./OrExpression.js"),
-	SecondExpression: require("./SecondExpression.js"),
-	SetIntersectionExpression: require("./SetIntersectionExpression.js"),
-	SizeExpression: require("./SizeExpression.js"),
-	StrcasecmpExpression: require("./StrcasecmpExpression.js"),
-	SubstrExpression: require("./SubstrExpression.js"),
-	SubtractExpression: require("./SubtractExpression.js"),
-	ToLowerExpression: require("./ToLowerExpression.js"),
-	ToUpperExpression: require("./ToUpperExpression.js"),
-	VariadicExpressionT: require("./VariadicExpressionT.js"),
-	WeekExpression: require("./WeekExpression.js"),
-	YearExpression: require("./YearExpression.js")
+	AddExpression: require("./AddExpression"),
+	AllElementsTrueExpression: require("./AllElementsTrueExpression"),
+	AndExpression: require("./AndExpression"),
+	AnyElementTrueExpression: require("./AnyElementTrueExpression"),
+	CoerceToBoolExpression: require("./CoerceToBoolExpression"),
+	CompareExpression: require("./CompareExpression"),
+	ConcatExpression: require("./ConcatExpression"),
+	CondExpression: require("./CondExpression"),
+	ConstantExpression: require("./ConstantExpression"),
+	DayOfMonthExpression: require("./DayOfMonthExpression"),
+	DayOfWeekExpression: require("./DayOfWeekExpression"),
+	DayOfYearExpression: require("./DayOfYearExpression"),
+	DivideExpression: require("./DivideExpression"),
+	Expression: require("./Expression"),
+	FieldPathExpression: require("./FieldPathExpression"),
+	FixedArityExpressionT: require("./FixedArityExpressionT"),
+	HourExpression: require("./HourExpression"),
+	IfNullExpression: require("./IfNullExpression"),
+	LetExpression: require("./LetExpression"),
+	MapExpression: require("./MapExpression"),
+	MillisecondExpression: require("./MillisecondExpression"),
+	MinuteExpression: require("./MinuteExpression"),
+	ModExpression: require("./ModExpression"),
+	MonthExpression: require("./MonthExpression"),
+	MultiplyExpression: require("./MultiplyExpression"),
+	NaryBaseExpressionT: require("./NaryBaseExpressionT"),
+	NaryExpression: require("./NaryExpression"),
+	NotExpression: require("./NotExpression"),
+	ObjectExpression: require("./ObjectExpression"),
+	OrExpression: require("./OrExpression"),
+	SecondExpression: require("./SecondExpression"),
+	SetDifferenceExpression: require("./SetDifferenceExpression"),
+	SetEqualsExpression: require("./SetEqualsExpression"),
+	SetIntersectionExpression: require("./SetIntersectionExpression"),
+	SetIsSubsetExpression: require("./SetIsSubsetExpression"),
+	SetUnionExpression: require("./SetUnionExpression"),
+	SizeExpression: require("./SizeExpression"),
+	StrcasecmpExpression: require("./StrcasecmpExpression"),
+	SubstrExpression: require("./SubstrExpression"),
+	SubtractExpression: require("./SubtractExpression"),
+	ToLowerExpression: require("./ToLowerExpression"),
+	ToUpperExpression: require("./ToUpperExpression"),
+	Variables: require("./Variables"),
+	VariablesIdGenerator: require("./VariablesIdGenerator"),
+	VariablesParseState: require("./VariablesParseState"),
+	VariadicExpressionT: require("./VariadicExpressionT"),
+	WeekExpression: require("./WeekExpression"),
+	YearExpression: require("./YearExpression"),
 };