Skip to content

Add Arithmetic expression in Pipeline #15580

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

Open
cherylEnkidu wants to merge 5 commits into
base: cheryl/realppl1
Choose a base branch
from
+526 −231
Open

Add Arithmetic expression in Pipeline #15580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e38a8b
merge base branch
cherylEnkidu Dec 3, 2025
f7d9a71
rename to be comsistent
cherylEnkidu Dec 3, 2025
c52d4e8
make the class align with Android version
cherylEnkidu Dec 8, 2025
7d799c4
move class
cherylEnkidu Dec 8, 2025
cac5825
revert cmake change
cherylEnkidu Dec 8, 2025
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
6 changes: 3 additions & 3 deletions Firestore/core/src/api/expressions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ google_firestore_v1_Value Field::to_proto() const {
return result;
}

std::unique_ptr<core::EvaluableExpr> Field::ToEvaluable() const {
std::unique_ptr<core::EvaluableExpression> Field::ToEvaluable() const {
return std::make_unique<core::CoreField>(std::make_unique<Field>(*this));
}

Expand All @@ -54,7 +54,7 @@ const google_firestore_v1_Value& Constant::value() const {
return *value_;
}

std::unique_ptr<core::EvaluableExpr> Constant::ToEvaluable() const {
std::unique_ptr<core::EvaluableExpression> Constant::ToEvaluable() const {
return std::make_unique<core::CoreConstant>(
std::make_unique<Constant>(*this));
}
Expand All @@ -72,7 +72,7 @@ google_firestore_v1_Value FunctionExpr::to_proto() const {
return result;
}

std::unique_ptr<core::EvaluableExpr> FunctionExpr::ToEvaluable() const {
std::unique_ptr<core::EvaluableExpression> FunctionExpr::ToEvaluable() const {
return core::FunctionToEvaluable(*this);
}

Expand Down
10 changes: 5 additions & 5 deletions Firestore/core/src/api/expressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
namespace firebase {
namespace firestore {
namespace core {
class EvaluableExpr;
class EvaluableExpression;
} // namespace core
namespace api {

Expand All @@ -38,7 +38,7 @@ class Expr {
Expr() = default;
virtual ~Expr() = default;
virtual google_firestore_v1_Value to_proto() const = 0;
virtual std::unique_ptr<core::EvaluableExpr> ToEvaluable() const = 0;
virtual std::unique_ptr<core::EvaluableExpression> ToEvaluable() const = 0;
};

class Selectable : public Expr {
Expand Down Expand Up @@ -66,7 +66,7 @@ class Field : public Selectable {
return field_path_;
}

std::unique_ptr<core::EvaluableExpr> ToEvaluable() const override;
std::unique_ptr<core::EvaluableExpression> ToEvaluable() const override;

private:
model::FieldPath field_path_;
Expand All @@ -82,7 +82,7 @@ class Constant : public Expr {

const google_firestore_v1_Value& value() const;

std::unique_ptr<core::EvaluableExpr> ToEvaluable() const override;
std::unique_ptr<core::EvaluableExpression> ToEvaluable() const override;

private:
nanopb::SharedMessage<google_firestore_v1_Value> value_;
Expand All @@ -96,7 +96,7 @@ class FunctionExpr : public Expr {

google_firestore_v1_Value to_proto() const override;

std::unique_ptr<core::EvaluableExpr> ToEvaluable() const override;
std::unique_ptr<core::EvaluableExpression> ToEvaluable() const override;

const std::string& name() const {
return name_;
Expand Down
4 changes: 2 additions & 2 deletions Firestore/core/src/pipeline/aggregates_evaluation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace firebase {
namespace firestore {
namespace core {

class CoreMaximum : public EvaluableExpr {
class CoreMaximum : public EvaluableExpression {
public:
explicit CoreMaximum(const api::FunctionExpr& expr)
: expr_(std::make_unique<api::FunctionExpr>(expr)) {
Expand All @@ -37,7 +37,7 @@ class CoreMaximum : public EvaluableExpr {
std::unique_ptr<api::FunctionExpr> expr_;
};

class CoreMinimum : public EvaluableExpr {
class CoreMinimum : public EvaluableExpression {
public:
explicit CoreMinimum(const api::FunctionExpr& expr)
: expr_(std::make_unique<api::FunctionExpr>(expr)) {
Expand Down
Loading
Loading