diff options
| author | Terry Wang <tytytyww@google.com> | 2023-01-19 18:17:18 -0800 |
|---|---|---|
| committer | Terry Wang <tytytyww@google.com> | 2023-01-21 01:22:22 +0000 |
| commit | 8989629acf9598016095cb356582f7fcd9eac184 (patch) | |
| tree | 1fcb5e3bfd76557520a74e5bbbc2c7bca62363df /proto | |
| parent | d97107f66fd4646afca8698357116e8ae2d1d4a2 (diff) | |
| parent | 6e15dd0d337c65739900d7b95f6408d7413c8196 (diff) | |
| download | icing-8989629acf9598016095cb356582f7fcd9eac184.tar.gz | |
Merge remote-tracking branch 'goog/androidx-platform-dev'
* goog/androidx-platform-dev:
Update icing from upstream
Sync from upstream.
Descriptions:
======================================================================
Apply aggregation score to join result and create JoinProcessorTest
======================================================================
Create AggregationScorerTest
======================================================================
Add an EqualsTermMatchInfo matcher to simplify tests that interact with this struct.
======================================================================
Refactor the QueryVisitor to return QueryResults.
======================================================================
Simplify ScoreExpression to ConstantScoreExpression if its evaluation does not depend on a document
======================================================================
Use rvalue and std::move for DocumentStore methods
======================================================================
Downgrade log messages for NOT_FOUND errors in Delete calls.
======================================================================
[NumericSearch][Storage][3.1/x] Add metadata file declaration (Crcs, Info) for IntegerIndexStorage
======================================================================
[NumericSearch][Storage][3.0/x] Declare class IntegerIndexStorage
======================================================================
Cleanup Import from //tools/build_defs/objc
======================================================================
Cleanup LSC: Remove `portable_proto_library()` targets
======================================================================
Bug: 256022027
Bug: 208654892
Bug: 261474063
Bug: 246628980
Bug: 249829533
Bug: 263373214
Change-Id: I948f63c3a282c745c4d4db1febf8a3283561ca73
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/icing/proto/search.proto | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/proto/icing/proto/search.proto b/proto/icing/proto/search.proto index b2435d0..c9e2b1d 100644 --- a/proto/icing/proto/search.proto +++ b/proto/icing/proto/search.proto @@ -505,13 +505,16 @@ message JoinSpecProto { // taken on it. If JOIN_AGGREGATE_SCORE is used in the base SearchSpecProto, // the COUNT value will rank entity documents based on the number of child // documents. - enum AggregationScore { - UNDEFINED = 0; - COUNT = 1; - MIN = 2; - AVG = 3; - MAX = 4; - SUM = 5; + message AggregationScoringStrategy { + enum Code { + NONE = 0; // No aggregation strategy for child documents and use parent + // document score. + COUNT = 1; + MIN = 2; + AVG = 3; + MAX = 4; + SUM = 5; + } } - optional AggregationScore aggregation_score_strategy = 5 [default = COUNT]; + optional AggregationScoringStrategy.Code aggregation_scoring_strategy = 5; } |