← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/db/pipeline/accumulator_sum.cpp

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/db/pipeline/accumulator_sum.cpp
21
21
 
22
22
namespace mongo {
23
23
 
24
 
    intrusive_ptr<const Value> AccumulatorSum::evaluate(
25
 
        const intrusive_ptr<Document> &pDocument) const {
 
24
    Value AccumulatorSum::evaluate(const Document& pDocument) const {
26
25
        verify(vpOperand.size() == 1);
27
 
        intrusive_ptr<const Value> prhs(vpOperand[0]->evaluate(pDocument));
28
 
 
29
 
        BSONType rhsType = prhs->getType();
 
26
        Value rhs = vpOperand[0]->evaluate(pDocument);
30
27
 
31
28
        // do nothing with non numeric types
32
 
        if (!(rhsType == NumberInt || rhsType == NumberLong || rhsType == NumberDouble))
33
 
            return Value::getZero();
 
29
        if (!rhs.numeric())
 
30
            return Value();
34
31
 
35
32
        // upgrade to the widest type required to hold the result
36
 
        totalType = Value::getWidestNumeric(totalType, rhsType);
 
33
        totalType = Value::getWidestNumeric(totalType, rhs.getType());
37
34
 
38
35
        if (totalType == NumberInt || totalType == NumberLong) {
39
 
            long long v = prhs->coerceToLong();
 
36
            long long v = rhs.coerceToLong();
40
37
            longTotal += v;
41
38
            doubleTotal += v;
42
39
        }
43
40
        else if (totalType == NumberDouble) {
44
 
            double v = prhs->coerceToDouble();
 
41
            double v = rhs.coerceToDouble();
45
42
            doubleTotal += v;
46
43
        }
47
44
        else {
51
48
 
52
49
        count++;
53
50
 
54
 
        return Value::getZero();
 
51
        return Value();
55
52
    }
56
53
 
57
54
    intrusive_ptr<Accumulator> AccumulatorSum::create(
60
57
        return pSummer;
61
58
    }
62
59
 
63
 
    intrusive_ptr<const Value> AccumulatorSum::getValue() const {
 
60
    Value AccumulatorSum::getValue() const {
64
61
        if (totalType == NumberLong) {
65
62
            return Value::createLong(longTotal);
66
63
        }