diff --git a/dev/protos/google/firestore/admin/v1/operation.proto b/dev/protos/google/firestore/admin/v1/operation.proto index 08194fe09..6494ab7cb 100644 --- a/dev/protos/google/firestore/admin/v1/operation.proto +++ b/dev/protos/google/firestore/admin/v1/operation.proto @@ -162,17 +162,6 @@ message ExportDocumentsResponse { string output_uri_prefix = 1; } -// Describes the progress of the operation. -// Unit of work is generic and must be interpreted based on where [Progress][google.firestore.admin.v1.Progress] -// is used. -message Progress { - // The amount of work estimated. - int64 estimated_work = 1; - - // The amount of work completed. - int64 completed_work = 2; -} - // Describes the state of the operation. enum OperationState { // Unspecified. @@ -201,3 +190,14 @@ enum OperationState { // google.longrunning.Operations.CancelOperation. CANCELLED = 7; } + +// Describes the progress of the operation. +// Unit of work is generic and must be interpreted based on where [Progress][google.firestore.admin.v1.Progress] +// is used. +message Progress { + // The amount of work estimated. + int64 estimated_work = 1; + + // The amount of work completed. + int64 completed_work = 2; +} diff --git a/dev/protos/google/firestore/v1/query.proto b/dev/protos/google/firestore/v1/query.proto index e2d7b836f..a8d5e7a2e 100644 --- a/dev/protos/google/firestore/v1/query.proto +++ b/dev/protos/google/firestore/v1/query.proto @@ -102,6 +102,14 @@ message StructuredQuery { // Contains. Requires that the field is an array. ARRAY_CONTAINS = 7; + + // In. Requires that `value` is a non-empty ArrayValue with at most 10 + // values. + IN = 8; + + // Contains any. Requires that the field is an array and + // `value` is a non-empty ArrayValue with at most 10 values. + ARRAY_CONTAINS_ANY = 9; } // The field to filter by. @@ -114,18 +122,6 @@ message StructuredQuery { Value value = 3; } - // A sort direction. - enum Direction { - // Unspecified. - DIRECTION_UNSPECIFIED = 0; - - // Ascending. - ASCENDING = 1; - - // Descending. - DESCENDING = 2; - } - // A filter with a single operand. message UnaryFilter { // A unary operator. @@ -150,6 +146,15 @@ message StructuredQuery { } } + // The projection of document's fields to return. + message Projection { + // The fields to return. + // + // If empty, all fields are returned. To only return the name + // of the document, use `['__name__']`. + repeated FieldReference fields = 2; + } + // An order on a field. message Order { // The field to order by. @@ -164,13 +169,16 @@ message StructuredQuery { string field_path = 2; } - // The projection of document's fields to return. - message Projection { - // The fields to return. - // - // If empty, all fields are returned. To only return the name - // of the document, use `['__name__']`. - repeated FieldReference fields = 2; + // A sort direction. + enum Direction { + // Unspecified. + DIRECTION_UNSPECIFIED = 0; + + // Ascending. + ASCENDING = 1; + + // Descending. + DESCENDING = 2; } // The projection to return. diff --git a/dev/protos/google/firestore/v1beta1/query.proto b/dev/protos/google/firestore/v1beta1/query.proto index fb9e4e558..a8068ae6c 100644 --- a/dev/protos/google/firestore/v1beta1/query.proto +++ b/dev/protos/google/firestore/v1beta1/query.proto @@ -102,6 +102,14 @@ message StructuredQuery { // Contains. Requires that the field is an array. ARRAY_CONTAINS = 7; + + // In. Requires that `value` is a non-empty ArrayValue with at most 10 + // values. + IN = 8; + + // Contains any. Requires that the field is an array and + // `value` is a non-empty ArrayValue with at most 10 values. + ARRAY_CONTAINS_ANY = 9; } // The field to filter by. @@ -147,6 +155,15 @@ message StructuredQuery { Direction direction = 2; } + // The projection of document's fields to return. + message Projection { + // The fields to return. + // + // If empty, all fields are returned. To only return the name + // of the document, use `['__name__']`. + repeated FieldReference fields = 2; + } + // A reference to a field, such as `max(messages.time) as max_time`. message FieldReference { string field_path = 2; @@ -164,15 +181,6 @@ message StructuredQuery { DESCENDING = 2; } - // The projection of document's fields to return. - message Projection { - // The fields to return. - // - // If empty, all fields are returned. To only return the name - // of the document, use `['__name__']`. - repeated FieldReference fields = 2; - } - // The projection to return. Projection select = 1; diff --git a/dev/protos/protos.json b/dev/protos/protos.json index e4b6cbcf5..8056132c9 100644 --- a/dev/protos/protos.json +++ b/dev/protos/protos.json @@ -1363,18 +1363,13 @@ "GREATER_THAN": 3, "GREATER_THAN_OR_EQUAL": 4, "EQUAL": 5, - "ARRAY_CONTAINS": 7 + "ARRAY_CONTAINS": 7, + "IN": 8, + "ARRAY_CONTAINS_ANY": 9 } } } }, - "Direction": { - "values": { - "DIRECTION_UNSPECIFIED": 0, - "ASCENDING": 1, - "DESCENDING": 2 - } - }, "UnaryFilter": { "oneofs": { "operandType": { @@ -1403,6 +1398,15 @@ } } }, + "Projection": { + "fields": { + "fields": { + "rule": "repeated", + "type": "FieldReference", + "id": 2 + } + } + }, "Order": { "fields": { "field": { @@ -1423,13 +1427,11 @@ } } }, - "Projection": { - "fields": { - "fields": { - "rule": "repeated", - "type": "FieldReference", - "id": 2 - } + "Direction": { + "values": { + "DIRECTION_UNSPECIFIED": 0, + "ASCENDING": 1, + "DESCENDING": 2 } } } @@ -2633,7 +2635,9 @@ "GREATER_THAN": 3, "GREATER_THAN_OR_EQUAL": 4, "EQUAL": 5, - "ARRAY_CONTAINS": 7 + "ARRAY_CONTAINS": 7, + "IN": 8, + "ARRAY_CONTAINS_ANY": 9 } } } @@ -2678,6 +2682,15 @@ } } }, + "Projection": { + "fields": { + "fields": { + "rule": "repeated", + "type": "FieldReference", + "id": 2 + } + } + }, "FieldReference": { "fields": { "fieldPath": { @@ -2692,15 +2705,6 @@ "ASCENDING": 1, "DESCENDING": 2 } - }, - "Projection": { - "fields": { - "fields": { - "rule": "repeated", - "type": "FieldReference", - "id": 2 - } - } } } }, diff --git a/dev/src/v1/doc/google/firestore/v1/doc_query.js b/dev/src/v1/doc/google/firestore/v1/doc_query.js index 647607a91..ce8114309 100644 --- a/dev/src/v1/doc/google/firestore/v1/doc_query.js +++ b/dev/src/v1/doc/google/firestore/v1/doc_query.js @@ -239,6 +239,18 @@ const StructuredQuery = { * Contains. Requires that the field is an array. */ ARRAY_CONTAINS: 7, + + /** + * In. Requires that `value` is a non-empty ArrayValue with at most 10 + * values. + */ + IN: 8, + + /** + * Contains any. Requires that the field is an array and + * `value` is a non-empty ArrayValue with at most 10 values. + */ + ARRAY_CONTAINS_ANY: 9, }, }, @@ -286,6 +298,25 @@ const StructuredQuery = { }, }, + /** + * The projection of document's fields to return. + * + * @property {Object[]} fields + * The fields to return. + * + * If empty, all fields are returned. To only return the name + * of the document, use `['__name__']`. + * + * This object should have the same structure as [FieldReference]{@link google.firestore.v1.FieldReference} + * + * @typedef Projection + * @memberof google.firestore.v1 + * @see [google.firestore.v1.StructuredQuery.Projection definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/firestore/v1/query.proto} + */ + Projection: { + // This is for documentation. Actual contents will be loaded by gRPC. + }, + /** * An order on a field. * @@ -320,25 +351,6 @@ const StructuredQuery = { // This is for documentation. Actual contents will be loaded by gRPC. }, - /** - * The projection of document's fields to return. - * - * @property {Object[]} fields - * The fields to return. - * - * If empty, all fields are returned. To only return the name - * of the document, use `['__name__']`. - * - * This object should have the same structure as [FieldReference]{@link google.firestore.v1.FieldReference} - * - * @typedef Projection - * @memberof google.firestore.v1 - * @see [google.firestore.v1.StructuredQuery.Projection definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/firestore/v1/query.proto} - */ - Projection: { - // This is for documentation. Actual contents will be loaded by gRPC. - }, - /** * A sort direction. * diff --git a/dev/src/v1beta1/doc/google/firestore/v1beta1/doc_query.js b/dev/src/v1beta1/doc/google/firestore/v1beta1/doc_query.js index 2f35124da..8f9fc62cc 100644 --- a/dev/src/v1beta1/doc/google/firestore/v1beta1/doc_query.js +++ b/dev/src/v1beta1/doc/google/firestore/v1beta1/doc_query.js @@ -239,6 +239,18 @@ const StructuredQuery = { * Contains. Requires that the field is an array. */ ARRAY_CONTAINS: 7, + + /** + * In. Requires that `value` is a non-empty ArrayValue with at most 10 + * values. + */ + IN: 8, + + /** + * Contains any. Requires that the field is an array and + * `value` is a non-empty ArrayValue with at most 10 values. + */ + ARRAY_CONTAINS_ANY: 9, }, }, @@ -307,19 +319,6 @@ const StructuredQuery = { // This is for documentation. Actual contents will be loaded by gRPC. }, - /** - * A reference to a field, such as `max(messages.time) as max_time`. - * - * @property {string} fieldPath - * - * @typedef FieldReference - * @memberof google.firestore.v1beta1 - * @see [google.firestore.v1beta1.StructuredQuery.FieldReference definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/firestore/v1beta1/query.proto} - */ - FieldReference: { - // This is for documentation. Actual contents will be loaded by gRPC. - }, - /** * The projection of document's fields to return. * @@ -339,6 +338,19 @@ const StructuredQuery = { // This is for documentation. Actual contents will be loaded by gRPC. }, + /** + * A reference to a field, such as `max(messages.time) as max_time`. + * + * @property {string} fieldPath + * + * @typedef FieldReference + * @memberof google.firestore.v1beta1 + * @see [google.firestore.v1beta1.StructuredQuery.FieldReference definition in proto format]{@link https://github.com/googleapis/googleapis/blob/master/google/firestore/v1beta1/query.proto} + */ + FieldReference: { + // This is for documentation. Actual contents will be loaded by gRPC. + }, + /** * A sort direction. * diff --git a/dev/synth.metadata b/dev/synth.metadata index 3fba26f8e..173b7574d 100644 --- a/dev/synth.metadata +++ b/dev/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-09-30T21:29:37.723292Z", + "updateTime": "2019-10-10T11:18:28.139081Z", "sources": [ { "generator": { "name": "artman", - "version": "0.37.1", - "dockerImage": "googleapis/artman@sha256:6068f67900a3f0bdece596b97bda8fc70406ca0e137a941f4c81d3217c994a80" + "version": "0.38.0", + "dockerImage": "googleapis/artman@sha256:0d2f8d429110aeb8d82df6550ef4ede59d40df9062d260a1580fce688b0512bf" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "588bdb668cd362c2c18a4bc87cf478c64c88dabb", - "internalRef": "272063168" + "sha": "10f91fa12f70e8e0209a45fc10807ed1f77c7e4e", + "internalRef": "273826591" } }, {