Skip to content

Commit

Permalink
feat: publish proto definitions for SUM/AVG in Datastore (#1157)
Browse files Browse the repository at this point in the history 
* feat: publish proto definitions for SUM/AVG in Datastore

PiperOrigin-RevId: 552847139

Source-Link: googleapis/googleapis@6148e5b

Source-Link: googleapis/googleapis-gen@96be51b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTZiZTUxYjk5NTA0N2JmZGVmNDgyNTE3ODUzOWUyMzg1ODMxMDFhOSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] and gcf-owl-bot[bot] committed Aug 17, 2023
1 parent c8cc09a commit 954320a
Show file tree
Hide file tree
Showing 8 changed files with 3,147 additions and 761 deletions.
3,454 changes: 2,829 additions & 625 deletions proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
View file

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
View file
Expand Up @@ -156,8 +156,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
* Requires:
*
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN` or `NOT_IN` is in the same query.
* * That `value` is a non-empty `ArrayValue`, subject to disjunction
* limits.
* * No `NOT_IN` is in the same query.
* </pre>
*
* <code>IN = 6;</code>
Expand Down Expand Up @@ -187,7 +188,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
* Requires:
*
* * That `value` is an entity key.
* * No other `HAS_ANCESTOR` is in the same query.
* * All evaluated disjunctions must have the same `HAS_ANCESTOR` filter.
* </pre>
*
* <code>HAS_ANCESTOR = 11;</code>
Expand All @@ -202,7 +203,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
* Requires:
*
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * No other `OR`, `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * That `field` comes first in the `order_by`.
* </pre>
*
Expand Down Expand Up @@ -296,8 +297,9 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
*
* Requires:
*
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN` or `NOT_IN` is in the same query.
* * That `value` is a non-empty `ArrayValue`, subject to disjunction
* limits.
* * No `NOT_IN` is in the same query.
* </pre>
*
* <code>IN = 6;</code>
Expand Down Expand Up @@ -327,7 +329,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
* Requires:
*
* * That `value` is an entity key.
* * No other `HAS_ANCESTOR` is in the same query.
* * All evaluated disjunctions must have the same `HAS_ANCESTOR` filter.
* </pre>
*
* <code>HAS_ANCESTOR = 11;</code>
Expand All @@ -342,7 +344,7 @@ public enum Operator implements com.google.protobuf.ProtocolMessageEnum {
* Requires:
*
* * That `value` is a non-empty `ArrayValue` with at most 10 values.
* * No other `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * No other `OR`, `IN`, `NOT_IN`, `NOT_EQUAL` is in the same query.
* * That `field` comes first in the `order_by`.
* </pre>
*
Expand Down
155 changes: 95 additions & 60 deletions proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
View file
Expand Up @@ -47,6 +47,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_google_datastore_v1_KindExpression_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
Expand Down Expand Up @@ -120,70 +128,77 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "inct_on\030\006 \003(\0132&.google.datastore.v1.Prop"
+ "ertyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\ne"
+ "nd_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit"
+ "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\331\002\n\020"
+ "\030\014 \001(\0132\033.google.protobuf.Int32Value\"\347\004\n\020"
+ "AggregationQuery\0222\n\014nested_query\030\001 \001(\0132\032"
+ ".google.datastore.v1.QueryH\000\022M\n\014aggregat"
+ "ions\030\003 \003(\01321.google.datastore.v1.Aggrega"
+ "tionQuery.AggregationB\004\342A\001\001\032\263\001\n\013Aggregat"
+ "tionQuery.AggregationB\004\342A\001\001\032\301\003\n\013Aggregat"
+ "ion\022H\n\005count\030\001 \001(\01327.google.datastore.v1"
+ ".AggregationQuery.Aggregation.CountH\000\022\023\n"
+ "\005alias\030\007 \001(\tB\004\342A\001\001\0329\n\005Count\0220\n\005up_to\030\001 \001"
+ "(\0132\033.google.protobuf.Int64ValueB\004\342A\001\001B\n\n"
+ "\010operatorB\014\n\nquery_type\"\036\n\016KindExpressio"
+ "n\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022\014\n\004"
+ "name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030\001 \001"
+ ".AggregationQuery.Aggregation.CountH\000\022D\n"
+ "\003sum\030\002 \001(\01325.google.datastore.v1.Aggrega"
+ "tionQuery.Aggregation.SumH\000\022D\n\003avg\030\003 \001(\013"
+ "25.google.datastore.v1.AggregationQuery."
+ "Aggregation.AvgH\000\022\023\n\005alias\030\007 \001(\tB\004\342A\001\001\0329"
+ "\n\005Count\0220\n\005up_to\030\001 \001(\0132\033.google.protobuf"
+ ".Int64ValueB\004\342A\001\001\032?\n\003Sum\0228\n\010property\030\001 \001"
+ "(\0132&.google.datastore.v1.PropertyReferen"
+ "ce\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001(\0132&"
+ ".google.datastore.v1.PropertyReference\022?"
+ "\n\tdirection\030\002 \001(\0162,.google.datastore.v1."
+ "PropertyOrder.Direction\"E\n\tDirection\022\031\n\025"
+ "DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016"
+ "\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composite_f"
+ "ilter\030\001 \001(\0132$.google.datastore.v1.Compos"
+ "iteFilterH\000\022>\n\017property_filter\030\002 \001(\0132#.g"
+ "oogle.datastore.v1.PropertyFilterH\000B\r\n\013f"
+ "ilter_type\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001"
+ "(\0162-.google.datastore.v1.CompositeFilter"
+ ".Operator\022,\n\007filters\030\002 \003(\0132\033.google.data"
+ "store.v1.Filter\"5\n\010Operator\022\030\n\024OPERATOR_"
+ "UNSPECIFIED\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016Prope"
+ "rtyFilter\0228\n\010property\030\001 \001(\0132&.google.dat"
+ "astore.v1.PropertyReference\0228\n\002op\030\002 \001(\0162"
+ ",.google.datastore.v1.PropertyFilter.Ope"
+ "rator\022)\n\005value\030\003 \001(\0132\032.google.datastore."
+ "v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSPEC"
+ "IFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_E"
+ "QUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREATER_THAN"
+ "_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQ"
+ "UAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010"
+ "GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_"
+ "literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320"
+ ".google.datastore.v1.GqlQuery.NamedBindi"
+ "ngsEntry\022C\n\023positional_bindings\030\004 \003(\0132&."
+ "google.datastore.v1.GqlQueryParameter\032\\\n"
+ "\022NamedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005valu"
+ "e\030\002 \001(\0132&.google.datastore.v1.GqlQueryPa"
+ "rameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005valu"
+ "e\030\002 \001(\0132\032.google.datastore.v1.ValueH\000\022\020\n"
+ "\006cursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020Qu"
+ "eryResultBatch\022\027\n\017skipped_results\030\006 \001(\005\022"
+ "\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_result"
+ "_type\030\001 \001(\0162,.google.datastore.v1.Entity"
+ "Result.ResultType\0229\n\016entity_results\030\002 \003("
+ "\0132!.google.datastore.v1.EntityResult\022\022\n\n"
+ "end_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625"
+ ".google.datastore.v1.QueryResultBatch.Mo"
+ "reResultsType\022\030\n\020snapshot_version\030\007 \001(\003\022"
+ "-\n\tread_time\030\010 \001(\0132\032.google.protobuf.Tim"
+ "estamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESUL"
+ "TS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022"
+ "\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RE"
+ "SULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020"
+ "\003B\274\001\n\027com.google.datastore.v1B\nQueryProt"
+ "oP\001Z<google.golang.org/genproto/googleap"
+ "is/datastore/v1;datastore\252\002\031Google.Cloud"
+ ".Datastore.V1\312\002\031Google\\Cloud\\Datastore\\V"
+ "1\352\002\034Google::Cloud::Datastore::V1b\006proto3"
+ "ce\032?\n\003Avg\0228\n\010property\030\001 \001(\0132&.google.dat"
+ "astore.v1.PropertyReferenceB\n\n\010operatorB"
+ "\014\n\nquery_type\"\036\n\016KindExpression\022\014\n\004name\030"
+ "\001 \001(\t\"!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t"
+ "\"F\n\nProjection\0228\n\010property\030\001 \001(\0132&.googl"
+ "e.datastore.v1.PropertyReference\"\321\001\n\rPro"
+ "pertyOrder\0228\n\010property\030\001 \001(\0132&.google.da"
+ "tastore.v1.PropertyReference\022?\n\tdirectio"
+ "n\030\002 \001(\0162,.google.datastore.v1.PropertyOr"
+ "der.Direction\"E\n\tDirection\022\031\n\025DIRECTION_"
+ "UNSPECIFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDI"
+ "NG\020\002\"\231\001\n\006Filter\022@\n\020composite_filter\030\001 \001("
+ "\0132$.google.datastore.v1.CompositeFilterH"
+ "\000\022>\n\017property_filter\030\002 \001(\0132#.google.data"
+ "store.v1.PropertyFilterH\000B\r\n\013filter_type"
+ "\"\261\001\n\017CompositeFilter\0229\n\002op\030\001 \001(\0162-.googl"
+ "e.datastore.v1.CompositeFilter.Operator\022"
+ ",\n\007filters\030\002 \003(\0132\033.google.datastore.v1.F"
+ "ilter\"5\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIE"
+ "D\020\000\022\007\n\003AND\020\001\022\006\n\002OR\020\002\"\352\002\n\016PropertyFilter\022"
+ "8\n\010property\030\001 \001(\0132&.google.datastore.v1."
+ "PropertyReference\0228\n\002op\030\002 \001(\0162,.google.d"
+ "atastore.v1.PropertyFilter.Operator\022)\n\005v"
+ "alue\030\003 \001(\0132\032.google.datastore.v1.Value\"\270"
+ "\001\n\010Operator\022\030\n\024OPERATOR_UNSPECIFIED\020\000\022\r\n"
+ "\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014"
+ "GREATER_THAN\020\003\022\031\n\025GREATER_THAN_OR_EQUAL\020"
+ "\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL\020\t\022\020\n\014H"
+ "AS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQuery\022\024"
+ "\n\014query_string\030\001 \001(\t\022\026\n\016allow_literals\030\002"
+ " \001(\010\022H\n\016named_bindings\030\005 \003(\01320.google.da"
+ "tastore.v1.GqlQuery.NamedBindingsEntry\022C"
+ "\n\023positional_bindings\030\004 \003(\0132&.google.dat"
+ "astore.v1.GqlQueryParameter\032\\\n\022NamedBind"
+ "ingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&."
+ "google.datastore.v1.GqlQueryParameter:\0028"
+ "\001\"d\n\021GqlQueryParameter\022+\n\005value\030\002 \001(\0132\032."
+ "google.datastore.v1.ValueH\000\022\020\n\006cursor\030\003 "
+ "\001(\014H\000B\020\n\016parameter_type\"\215\004\n\020QueryResultB"
+ "atch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016skipped"
+ "_cursor\030\003 \001(\014\022H\n\022entity_result_type\030\001 \001("
+ "\0162,.google.datastore.v1.EntityResult.Res"
+ "ultType\0229\n\016entity_results\030\002 \003(\0132!.google"
+ ".datastore.v1.EntityResult\022\022\n\nend_cursor"
+ "\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.google.da"
+ "tastore.v1.QueryResultBatch.MoreResultsT"
+ "ype\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tread_ti"
+ "me\030\010 \001(\0132\032.google.protobuf.Timestamp\"\230\001\n"
+ "\017MoreResultsType\022!\n\035MORE_RESULTS_TYPE_UN"
+ "SPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MORE_RE"
+ "SULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS_AFTE"
+ "R_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n\027com."
+ "google.datastore.v1B\nQueryProtoP\001Z<googl"
+ "e.golang.org/genproto/googleapis/datasto"
+ "re/v1;datastore\252\002\031Google.Cloud.Datastore"
+ ".V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002\034Google"
+ "::Cloud::Datastore::V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
Expand Down Expand Up @@ -231,7 +246,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor,
new java.lang.String[] {
"Count", "Alias", "Operator",
"Count", "Sum", "Avg", "Alias", "Operator",
});
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Count_descriptor =
internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor
Expand All @@ -243,6 +258,26 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new java.lang.String[] {
"UpTo",
});
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor =
internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor
.getNestedTypes()
.get(1);
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_fieldAccessorTable =
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Sum_descriptor,
new java.lang.String[] {
"Property",
});
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor =
internal_static_google_datastore_v1_AggregationQuery_Aggregation_descriptor
.getNestedTypes()
.get(2);
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_fieldAccessorTable =
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_datastore_v1_AggregationQuery_Aggregation_Avg_descriptor,
new java.lang.String[] {
"Property",
});
internal_static_google_datastore_v1_KindExpression_descriptor =
getDescriptor().getMessageTypes().get(3);
internal_static_google_datastore_v1_KindExpression_fieldAccessorTable =
Expand Down

0 comments on commit 954320a

Please sign in to comment.