From aa73c1762ef29c9d3a76f8950480d070e50b24be Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Thu, 2 Oct 2014 15:46:50 -0700 Subject: [PATCH] Reverting datastore_v1_pb2 to original form. --- gcloud/datastore/datastore_v1_pb2.py | 270 +++++++++++++++------------ 1 file changed, 149 insertions(+), 121 deletions(-) diff --git a/gcloud/datastore/datastore_v1_pb2.py b/gcloud/datastore/datastore_v1_pb2.py index de7be0fdda59..6c789c922c4e 100644 --- a/gcloud/datastore/datastore_v1_pb2.py +++ b/gcloud/datastore/datastore_v1_pb2.py @@ -7,11 +7,16 @@ from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) + + + DESCRIPTOR = _descriptor.FileDescriptor( name='datastore_v1.proto', package='api.services.datastore', serialized_pb='\n\x12\x64\x61tastore_v1.proto\x12\x16\x61pi.services.datastore\"4\n\x0bPartitionId\x12\x12\n\ndataset_id\x18\x03 \x01(\t\x12\x11\n\tnamespace\x18\x04 \x01(\t\"\xb6\x01\n\x03Key\x12\x39\n\x0cpartition_id\x18\x01 \x01(\x0b\x32#.api.services.datastore.PartitionId\x12=\n\x0cpath_element\x18\x02 \x03(\x0b\x32\'.api.services.datastore.Key.PathElement\x1a\x35\n\x0bPathElement\x12\x0c\n\x04kind\x18\x01 \x02(\t\x12\n\n\x02id\x18\x02 \x01(\x03\x12\x0c\n\x04name\x18\x03 \x01(\t\"\xf4\x02\n\x05Value\x12\x15\n\rboolean_value\x18\x01 \x01(\x08\x12\x15\n\rinteger_value\x18\x02 \x01(\x03\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12$\n\x1ctimestamp_microseconds_value\x18\x04 \x01(\x03\x12.\n\tkey_value\x18\x05 \x01(\x0b\x32\x1b.api.services.datastore.Key\x12\x16\n\x0e\x62lob_key_value\x18\x10 \x01(\t\x12\x14\n\x0cstring_value\x18\x11 \x01(\t\x12\x12\n\nblob_value\x18\x12 \x01(\x0c\x12\x34\n\x0c\x65ntity_value\x18\x06 \x01(\x0b\x32\x1e.api.services.datastore.Entity\x12\x31\n\nlist_value\x18\x07 \x03(\x0b\x32\x1d.api.services.datastore.Value\x12\x0f\n\x07meaning\x18\x0e \x01(\x05\x12\x15\n\x07indexed\x18\x0f \x01(\x08:\x04true\"F\n\x08Property\x12\x0c\n\x04name\x18\x01 \x02(\t\x12,\n\x05value\x18\x04 \x02(\x0b\x32\x1d.api.services.datastore.Value\"f\n\x06\x45ntity\x12(\n\x03key\x18\x01 \x01(\x0b\x32\x1b.api.services.datastore.Key\x12\x32\n\x08property\x18\x02 \x03(\x0b\x32 .api.services.datastore.Property\"t\n\x0c\x45ntityResult\x12.\n\x06\x65ntity\x18\x01 \x02(\x0b\x32\x1e.api.services.datastore.Entity\"4\n\nResultType\x12\x08\n\x04\x46ULL\x10\x01\x12\x0e\n\nPROJECTION\x10\x02\x12\x0c\n\x08KEY_ONLY\x10\x03\"\xec\x02\n\x05Query\x12>\n\nprojection\x18\x02 \x03(\x0b\x32*.api.services.datastore.PropertyExpression\x12\x34\n\x04kind\x18\x03 \x03(\x0b\x32&.api.services.datastore.KindExpression\x12.\n\x06\x66ilter\x18\x04 \x01(\x0b\x32\x1e.api.services.datastore.Filter\x12\x34\n\x05order\x18\x05 \x03(\x0b\x32%.api.services.datastore.PropertyOrder\x12;\n\x08group_by\x18\x06 \x03(\x0b\x32).api.services.datastore.PropertyReference\x12\x14\n\x0cstart_cursor\x18\x07 \x01(\x0c\x12\x12\n\nend_cursor\x18\x08 \x01(\x0c\x12\x11\n\x06offset\x18\n \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x0b \x01(\x05\"\x1e\n\x0eKindExpression\x12\x0c\n\x04name\x18\x01 \x02(\t\"!\n\x11PropertyReference\x12\x0c\n\x04name\x18\x02 \x02(\t\"\xd1\x01\n\x12PropertyExpression\x12;\n\x08property\x18\x01 \x02(\x0b\x32).api.services.datastore.PropertyReference\x12\\\n\x14\x61ggregation_function\x18\x02 \x01(\x0e\x32>.api.services.datastore.PropertyExpression.AggregationFunction\" \n\x13\x41ggregationFunction\x12\t\n\x05\x46IRST\x10\x01\"\xc7\x01\n\rPropertyOrder\x12;\n\x08property\x18\x01 \x02(\x0b\x32).api.services.datastore.PropertyReference\x12M\n\tdirection\x18\x02 \x01(\x0e\x32/.api.services.datastore.PropertyOrder.Direction:\tASCENDING\"*\n\tDirection\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"\x8c\x01\n\x06\x46ilter\x12\x41\n\x10\x63omposite_filter\x18\x01 \x01(\x0b\x32\'.api.services.datastore.CompositeFilter\x12?\n\x0fproperty_filter\x18\x02 \x01(\x0b\x32&.api.services.datastore.PropertyFilter\"\x9a\x01\n\x0f\x43ompositeFilter\x12\x42\n\x08operator\x18\x01 \x02(\x0e\x32\x30.api.services.datastore.CompositeFilter.Operator\x12.\n\x06\x66ilter\x18\x02 \x03(\x0b\x32\x1e.api.services.datastore.Filter\"\x13\n\x08Operator\x12\x07\n\x03\x41ND\x10\x01\"\xbb\x02\n\x0ePropertyFilter\x12;\n\x08property\x18\x01 \x02(\x0b\x32).api.services.datastore.PropertyReference\x12\x41\n\x08operator\x18\x02 \x02(\x0e\x32/.api.services.datastore.PropertyFilter.Operator\x12,\n\x05value\x18\x03 \x02(\x0b\x32\x1d.api.services.datastore.Value\"{\n\x08Operator\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x04\x12\t\n\x05\x45QUAL\x10\x05\x12\x10\n\x0cHAS_ANCESTOR\x10\x0b\"\xae\x01\n\x08GqlQuery\x12\x14\n\x0cquery_string\x18\x01 \x02(\t\x12\x1c\n\rallow_literal\x18\x02 \x01(\x08:\x05\x66\x61lse\x12\x35\n\x08name_arg\x18\x03 \x03(\x0b\x32#.api.services.datastore.GqlQueryArg\x12\x37\n\nnumber_arg\x18\x04 \x03(\x0b\x32#.api.services.datastore.GqlQueryArg\"Y\n\x0bGqlQueryArg\x12\x0c\n\x04name\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.api.services.datastore.Value\x12\x0e\n\x06\x63ursor\x18\x03 \x01(\x0c\"\xf1\x02\n\x10QueryResultBatch\x12K\n\x12\x65ntity_result_type\x18\x01 \x02(\x0e\x32/.api.services.datastore.EntityResult.ResultType\x12;\n\rentity_result\x18\x02 \x03(\x0b\x32$.api.services.datastore.EntityResult\x12\x12\n\nend_cursor\x18\x04 \x01(\x0c\x12N\n\x0cmore_results\x18\x05 \x02(\x0e\x32\x38.api.services.datastore.QueryResultBatch.MoreResultsType\x12\x17\n\x0fskipped_results\x18\x06 \x01(\x05\"V\n\x0fMoreResultsType\x12\x10\n\x0cNOT_FINISHED\x10\x01\x12\x1c\n\x18MORE_RESULTS_AFTER_LIMIT\x10\x02\x12\x13\n\x0fNO_MORE_RESULTS\x10\x03\"\x8e\x02\n\x08Mutation\x12.\n\x06upsert\x18\x01 \x03(\x0b\x32\x1e.api.services.datastore.Entity\x12.\n\x06update\x18\x02 \x03(\x0b\x32\x1e.api.services.datastore.Entity\x12.\n\x06insert\x18\x03 \x03(\x0b\x32\x1e.api.services.datastore.Entity\x12\x36\n\x0einsert_auto_id\x18\x04 \x03(\x0b\x32\x1e.api.services.datastore.Entity\x12+\n\x06\x64\x65lete\x18\x05 \x03(\x0b\x32\x1b.api.services.datastore.Key\x12\r\n\x05\x66orce\x18\x06 \x01(\x08\"`\n\x0eMutationResult\x12\x15\n\rindex_updates\x18\x01 \x02(\x05\x12\x37\n\x12insert_auto_id_key\x18\x02 \x03(\x0b\x32\x1b.api.services.datastore.Key\"\xb4\x01\n\x0bReadOptions\x12V\n\x10read_consistency\x18\x01 \x01(\x0e\x32\x33.api.services.datastore.ReadOptions.ReadConsistency:\x07\x44\x45\x46\x41ULT\x12\x13\n\x0btransaction\x18\x02 \x01(\x0c\"8\n\x0fReadConsistency\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\n\n\x06STRONG\x10\x01\x12\x0c\n\x08\x45VENTUAL\x10\x02\"t\n\rLookupRequest\x12\x39\n\x0cread_options\x18\x01 \x01(\x0b\x32#.api.services.datastore.ReadOptions\x12(\n\x03key\x18\x03 \x03(\x0b\x32\x1b.api.services.datastore.Key\"\xab\x01\n\x0eLookupResponse\x12\x33\n\x05\x66ound\x18\x01 \x03(\x0b\x32$.api.services.datastore.EntityResult\x12\x35\n\x07missing\x18\x02 \x03(\x0b\x32$.api.services.datastore.EntityResult\x12-\n\x08\x64\x65\x66\x65rred\x18\x03 \x03(\x0b\x32\x1b.api.services.datastore.Key\"\xea\x01\n\x0fRunQueryRequest\x12\x39\n\x0cread_options\x18\x01 \x01(\x0b\x32#.api.services.datastore.ReadOptions\x12\x39\n\x0cpartition_id\x18\x02 \x01(\x0b\x32#.api.services.datastore.PartitionId\x12,\n\x05query\x18\x03 \x01(\x0b\x32\x1d.api.services.datastore.Query\x12\x33\n\tgql_query\x18\x07 \x01(\x0b\x32 .api.services.datastore.GqlQuery\"K\n\x10RunQueryResponse\x12\x37\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32(.api.services.datastore.QueryResultBatch\"\xae\x01\n\x17\x42\x65ginTransactionRequest\x12\x61\n\x0fisolation_level\x18\x01 \x01(\x0e\x32>.api.services.datastore.BeginTransactionRequest.IsolationLevel:\x08SNAPSHOT\"0\n\x0eIsolationLevel\x12\x0c\n\x08SNAPSHOT\x10\x00\x12\x10\n\x0cSERIALIZABLE\x10\x01\"/\n\x18\x42\x65ginTransactionResponse\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\"&\n\x0fRollbackRequest\x12\x13\n\x0btransaction\x18\x01 \x02(\x0c\"\x12\n\x10RollbackResponse\"\xd3\x01\n\rCommitRequest\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\x12\x32\n\x08mutation\x18\x02 \x01(\x0b\x32 .api.services.datastore.Mutation\x12G\n\x04mode\x18\x05 \x01(\x0e\x32*.api.services.datastore.CommitRequest.Mode:\rTRANSACTIONAL\"0\n\x04Mode\x12\x11\n\rTRANSACTIONAL\x10\x01\x12\x15\n\x11NON_TRANSACTIONAL\x10\x02\"Q\n\x0e\x43ommitResponse\x12?\n\x0fmutation_result\x18\x01 \x01(\x0b\x32&.api.services.datastore.MutationResult\">\n\x12\x41llocateIdsRequest\x12(\n\x03key\x18\x01 \x03(\x0b\x32\x1b.api.services.datastore.Key\"?\n\x13\x41llocateIdsResponse\x12(\n\x03key\x18\x01 \x03(\x0b\x32\x1b.api.services.datastore.Key2\xed\x04\n\x10\x44\x61tastoreService\x12Y\n\x06Lookup\x12%.api.services.datastore.LookupRequest\x1a&.api.services.datastore.LookupResponse\"\x00\x12_\n\x08RunQuery\x12\'.api.services.datastore.RunQueryRequest\x1a(.api.services.datastore.RunQueryResponse\"\x00\x12w\n\x10\x42\x65ginTransaction\x12/.api.services.datastore.BeginTransactionRequest\x1a\x30.api.services.datastore.BeginTransactionResponse\"\x00\x12Y\n\x06\x43ommit\x12%.api.services.datastore.CommitRequest\x1a&.api.services.datastore.CommitResponse\"\x00\x12_\n\x08Rollback\x12\'.api.services.datastore.RollbackRequest\x1a(.api.services.datastore.RollbackResponse\"\x00\x12h\n\x0b\x41llocateIds\x12*.api.services.datastore.AllocateIdsRequest\x1a+.api.services.datastore.AllocateIdsResponse\"\x00\x42#\n!com.google.api.services.datastore') + + _ENTITYRESULT_RESULTTYPE = _descriptor.EnumDescriptor( name='ResultType', full_name='api.services.datastore.EntityResult.ResultType', @@ -221,6 +226,7 @@ serialized_end=4718, ) + _PARTITIONID = _descriptor.Descriptor( name='PartitionId', full_name='api.services.datastore.PartitionId', @@ -255,6 +261,7 @@ serialized_end=98, ) + _KEY_PATHELEMENT = _descriptor.Descriptor( name='PathElement', full_name='api.services.datastore.Key.PathElement', @@ -330,6 +337,7 @@ serialized_end=283, ) + _VALUE = _descriptor.Descriptor( name='Value', full_name='api.services.datastore.Value', @@ -434,6 +442,7 @@ serialized_end=658, ) + _PROPERTY = _descriptor.Descriptor( name='Property', full_name='api.services.datastore.Property', @@ -468,6 +477,7 @@ serialized_end=730, ) + _ENTITY = _descriptor.Descriptor( name='Entity', full_name='api.services.datastore.Entity', @@ -502,6 +512,7 @@ serialized_end=834, ) + _ENTITYRESULT = _descriptor.Descriptor( name='EntityResult', full_name='api.services.datastore.EntityResult', @@ -530,6 +541,7 @@ serialized_end=952, ) + _QUERY = _descriptor.Descriptor( name='Query', full_name='api.services.datastore.Query', @@ -613,6 +625,7 @@ serialized_end=1319, ) + _KINDEXPRESSION = _descriptor.Descriptor( name='KindExpression', full_name='api.services.datastore.KindExpression', @@ -640,6 +653,7 @@ serialized_end=1351, ) + _PROPERTYREFERENCE = _descriptor.Descriptor( name='PropertyReference', full_name='api.services.datastore.PropertyReference', @@ -667,6 +681,7 @@ serialized_end=1386, ) + _PROPERTYEXPRESSION = _descriptor.Descriptor( name='PropertyExpression', full_name='api.services.datastore.PropertyExpression', @@ -702,6 +717,7 @@ serialized_end=1598, ) + _PROPERTYORDER = _descriptor.Descriptor( name='PropertyOrder', full_name='api.services.datastore.PropertyOrder', @@ -737,6 +753,7 @@ serialized_end=1800, ) + _FILTER = _descriptor.Descriptor( name='Filter', full_name='api.services.datastore.Filter', @@ -771,6 +788,7 @@ serialized_end=1943, ) + _COMPOSITEFILTER = _descriptor.Descriptor( name='CompositeFilter', full_name='api.services.datastore.CompositeFilter', @@ -806,6 +824,7 @@ serialized_end=2100, ) + _PROPERTYFILTER = _descriptor.Descriptor( name='PropertyFilter', full_name='api.services.datastore.PropertyFilter', @@ -848,6 +867,7 @@ serialized_end=2418, ) + _GQLQUERY = _descriptor.Descriptor( name='GqlQuery', full_name='api.services.datastore.GqlQuery', @@ -896,6 +916,7 @@ serialized_end=2595, ) + _GQLQUERYARG = _descriptor.Descriptor( name='GqlQueryArg', full_name='api.services.datastore.GqlQueryArg', @@ -937,6 +958,7 @@ serialized_end=2686, ) + _QUERYRESULTBATCH = _descriptor.Descriptor( name='QueryResultBatch', full_name='api.services.datastore.QueryResultBatch', @@ -993,6 +1015,7 @@ serialized_end=3058, ) + _MUTATION = _descriptor.Descriptor( name='Mutation', full_name='api.services.datastore.Mutation', @@ -1055,6 +1078,7 @@ serialized_end=3331, ) + _MUTATIONRESULT = _descriptor.Descriptor( name='MutationResult', full_name='api.services.datastore.MutationResult', @@ -1089,6 +1113,7 @@ serialized_end=3429, ) + _READOPTIONS = _descriptor.Descriptor( name='ReadOptions', full_name='api.services.datastore.ReadOptions', @@ -1124,6 +1149,7 @@ serialized_end=3612, ) + _LOOKUPREQUEST = _descriptor.Descriptor( name='LookupRequest', full_name='api.services.datastore.LookupRequest', @@ -1158,6 +1184,7 @@ serialized_end=3730, ) + _LOOKUPRESPONSE = _descriptor.Descriptor( name='LookupResponse', full_name='api.services.datastore.LookupResponse', @@ -1199,6 +1226,7 @@ serialized_end=3904, ) + _RUNQUERYREQUEST = _descriptor.Descriptor( name='RunQueryRequest', full_name='api.services.datastore.RunQueryRequest', @@ -1247,6 +1275,7 @@ serialized_end=4141, ) + _RUNQUERYRESPONSE = _descriptor.Descriptor( name='RunQueryResponse', full_name='api.services.datastore.RunQueryResponse', @@ -1274,6 +1303,7 @@ serialized_end=4218, ) + _BEGINTRANSACTIONREQUEST = _descriptor.Descriptor( name='BeginTransactionRequest', full_name='api.services.datastore.BeginTransactionRequest', @@ -1302,6 +1332,7 @@ serialized_end=4395, ) + _BEGINTRANSACTIONRESPONSE = _descriptor.Descriptor( name='BeginTransactionResponse', full_name='api.services.datastore.BeginTransactionResponse', @@ -1329,6 +1360,7 @@ serialized_end=4444, ) + _ROLLBACKREQUEST = _descriptor.Descriptor( name='RollbackRequest', full_name='api.services.datastore.RollbackRequest', @@ -1356,6 +1388,7 @@ serialized_end=4484, ) + _ROLLBACKRESPONSE = _descriptor.Descriptor( name='RollbackResponse', full_name='api.services.datastore.RollbackResponse', @@ -1376,6 +1409,7 @@ serialized_end=4504, ) + _COMMITREQUEST = _descriptor.Descriptor( name='CommitRequest', full_name='api.services.datastore.CommitRequest', @@ -1418,6 +1452,7 @@ serialized_end=4718, ) + _COMMITRESPONSE = _descriptor.Descriptor( name='CommitResponse', full_name='api.services.datastore.CommitResponse', @@ -1445,6 +1480,7 @@ serialized_end=4801, ) + _ALLOCATEIDSREQUEST = _descriptor.Descriptor( name='AllocateIdsRequest', full_name='api.services.datastore.AllocateIdsRequest', @@ -1472,6 +1508,7 @@ serialized_end=4865, ) + _ALLOCATEIDSRESPONSE = _descriptor.Descriptor( name='AllocateIdsResponse', full_name='api.services.datastore.AllocateIdsResponse', @@ -1499,8 +1536,7 @@ serialized_end=4930, ) -_KEY_PATHELEMENT.containing_type = _KEY - +_KEY_PATHELEMENT.containing_type = _KEY; _KEY.fields_by_name['partition_id'].message_type = _PARTITIONID _KEY.fields_by_name['path_element'].message_type = _KEY_PATHELEMENT _VALUE.fields_by_name['key_value'].message_type = _KEY @@ -1510,8 +1546,7 @@ _ENTITY.fields_by_name['key'].message_type = _KEY _ENTITY.fields_by_name['property'].message_type = _PROPERTY _ENTITYRESULT.fields_by_name['entity'].message_type = _ENTITY -_ENTITYRESULT_RESULTTYPE.containing_type = _ENTITYRESULT - +_ENTITYRESULT_RESULTTYPE.containing_type = _ENTITYRESULT; _QUERY.fields_by_name['projection'].message_type = _PROPERTYEXPRESSION _QUERY.fields_by_name['kind'].message_type = _KINDEXPRESSION _QUERY.fields_by_name['filter'].message_type = _FILTER @@ -1519,31 +1554,26 @@ _QUERY.fields_by_name['group_by'].message_type = _PROPERTYREFERENCE _PROPERTYEXPRESSION.fields_by_name['property'].message_type = _PROPERTYREFERENCE _PROPERTYEXPRESSION.fields_by_name['aggregation_function'].enum_type = _PROPERTYEXPRESSION_AGGREGATIONFUNCTION -_PROPERTYEXPRESSION_AGGREGATIONFUNCTION.containing_type = _PROPERTYEXPRESSION - +_PROPERTYEXPRESSION_AGGREGATIONFUNCTION.containing_type = _PROPERTYEXPRESSION; _PROPERTYORDER.fields_by_name['property'].message_type = _PROPERTYREFERENCE _PROPERTYORDER.fields_by_name['direction'].enum_type = _PROPERTYORDER_DIRECTION -_PROPERTYORDER_DIRECTION.containing_type = _PROPERTYORDER - +_PROPERTYORDER_DIRECTION.containing_type = _PROPERTYORDER; _FILTER.fields_by_name['composite_filter'].message_type = _COMPOSITEFILTER _FILTER.fields_by_name['property_filter'].message_type = _PROPERTYFILTER _COMPOSITEFILTER.fields_by_name['operator'].enum_type = _COMPOSITEFILTER_OPERATOR _COMPOSITEFILTER.fields_by_name['filter'].message_type = _FILTER -_COMPOSITEFILTER_OPERATOR.containing_type = _COMPOSITEFILTER - +_COMPOSITEFILTER_OPERATOR.containing_type = _COMPOSITEFILTER; _PROPERTYFILTER.fields_by_name['property'].message_type = _PROPERTYREFERENCE _PROPERTYFILTER.fields_by_name['operator'].enum_type = _PROPERTYFILTER_OPERATOR _PROPERTYFILTER.fields_by_name['value'].message_type = _VALUE -_PROPERTYFILTER_OPERATOR.containing_type = _PROPERTYFILTER - +_PROPERTYFILTER_OPERATOR.containing_type = _PROPERTYFILTER; _GQLQUERY.fields_by_name['name_arg'].message_type = _GQLQUERYARG _GQLQUERY.fields_by_name['number_arg'].message_type = _GQLQUERYARG _GQLQUERYARG.fields_by_name['value'].message_type = _VALUE _QUERYRESULTBATCH.fields_by_name['entity_result_type'].enum_type = _ENTITYRESULT_RESULTTYPE _QUERYRESULTBATCH.fields_by_name['entity_result'].message_type = _ENTITYRESULT _QUERYRESULTBATCH.fields_by_name['more_results'].enum_type = _QUERYRESULTBATCH_MORERESULTSTYPE -_QUERYRESULTBATCH_MORERESULTSTYPE.containing_type = _QUERYRESULTBATCH - +_QUERYRESULTBATCH_MORERESULTSTYPE.containing_type = _QUERYRESULTBATCH; _MUTATION.fields_by_name['upsert'].message_type = _ENTITY _MUTATION.fields_by_name['update'].message_type = _ENTITY _MUTATION.fields_by_name['insert'].message_type = _ENTITY @@ -1551,8 +1581,7 @@ _MUTATION.fields_by_name['delete'].message_type = _KEY _MUTATIONRESULT.fields_by_name['insert_auto_id_key'].message_type = _KEY _READOPTIONS.fields_by_name['read_consistency'].enum_type = _READOPTIONS_READCONSISTENCY -_READOPTIONS_READCONSISTENCY.containing_type = _READOPTIONS - +_READOPTIONS_READCONSISTENCY.containing_type = _READOPTIONS; _LOOKUPREQUEST.fields_by_name['read_options'].message_type = _READOPTIONS _LOOKUPREQUEST.fields_by_name['key'].message_type = _KEY _LOOKUPRESPONSE.fields_by_name['found'].message_type = _ENTITYRESULT @@ -1564,12 +1593,10 @@ _RUNQUERYREQUEST.fields_by_name['gql_query'].message_type = _GQLQUERY _RUNQUERYRESPONSE.fields_by_name['batch'].message_type = _QUERYRESULTBATCH _BEGINTRANSACTIONREQUEST.fields_by_name['isolation_level'].enum_type = _BEGINTRANSACTIONREQUEST_ISOLATIONLEVEL -_BEGINTRANSACTIONREQUEST_ISOLATIONLEVEL.containing_type = _BEGINTRANSACTIONREQUEST - +_BEGINTRANSACTIONREQUEST_ISOLATIONLEVEL.containing_type = _BEGINTRANSACTIONREQUEST; _COMMITREQUEST.fields_by_name['mutation'].message_type = _MUTATION _COMMITREQUEST.fields_by_name['mode'].enum_type = _COMMITREQUEST_MODE -_COMMITREQUEST_MODE.containing_type = _COMMITREQUEST - +_COMMITREQUEST_MODE.containing_type = _COMMITREQUEST; _COMMITRESPONSE.fields_by_name['mutation_result'].message_type = _MUTATIONRESULT _ALLOCATEIDSREQUEST.fields_by_name['key'].message_type = _KEY _ALLOCATEIDSRESPONSE.fields_by_name['key'].message_type = _KEY @@ -1606,203 +1633,204 @@ DESCRIPTOR.message_types_by_name['AllocateIdsRequest'] = _ALLOCATEIDSREQUEST DESCRIPTOR.message_types_by_name['AllocateIdsResponse'] = _ALLOCATEIDSRESPONSE - class PartitionId(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PARTITIONID + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PARTITIONID - # @@protoc_insertion_point(class_scope:api.services.datastore.PartitionId) + # @@protoc_insertion_point(class_scope:api.services.datastore.PartitionId) class Key(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType + __metaclass__ = _reflection.GeneratedProtocolMessageType - class PathElement(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _KEY_PATHELEMENT + class PathElement(_message.Message): + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _KEY_PATHELEMENT - # @@protoc_insertion_point(class_scope:api.services.datastore.Key.PathElement) - DESCRIPTOR = _KEY + # @@protoc_insertion_point(class_scope:api.services.datastore.Key.PathElement) + DESCRIPTOR = _KEY - # @@protoc_insertion_point(class_scope:api.services.datastore.Key) + # @@protoc_insertion_point(class_scope:api.services.datastore.Key) class Value(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _VALUE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _VALUE - # @@protoc_insertion_point(class_scope:api.services.datastore.Value) + # @@protoc_insertion_point(class_scope:api.services.datastore.Value) class Property(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PROPERTY + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PROPERTY - # @@protoc_insertion_point(class_scope:api.services.datastore.Property) + # @@protoc_insertion_point(class_scope:api.services.datastore.Property) class Entity(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ENTITY + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ENTITY - # @@protoc_insertion_point(class_scope:api.services.datastore.Entity) + # @@protoc_insertion_point(class_scope:api.services.datastore.Entity) class EntityResult(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ENTITYRESULT + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ENTITYRESULT - # @@protoc_insertion_point(class_scope:api.services.datastore.EntityResult) + # @@protoc_insertion_point(class_scope:api.services.datastore.EntityResult) class Query(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _QUERY + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _QUERY - # @@protoc_insertion_point(class_scope:api.services.datastore.Query) + # @@protoc_insertion_point(class_scope:api.services.datastore.Query) class KindExpression(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _KINDEXPRESSION + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _KINDEXPRESSION - # @@protoc_insertion_point(class_scope:api.services.datastore.KindExpression) + # @@protoc_insertion_point(class_scope:api.services.datastore.KindExpression) class PropertyReference(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PROPERTYREFERENCE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PROPERTYREFERENCE - # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyReference) + # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyReference) class PropertyExpression(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PROPERTYEXPRESSION + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PROPERTYEXPRESSION - # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyExpression) + # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyExpression) class PropertyOrder(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PROPERTYORDER + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PROPERTYORDER - # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyOrder) + # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyOrder) class Filter(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _FILTER + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _FILTER - # @@protoc_insertion_point(class_scope:api.services.datastore.Filter) + # @@protoc_insertion_point(class_scope:api.services.datastore.Filter) class CompositeFilter(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _COMPOSITEFILTER + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _COMPOSITEFILTER - # @@protoc_insertion_point(class_scope:api.services.datastore.CompositeFilter) + # @@protoc_insertion_point(class_scope:api.services.datastore.CompositeFilter) class PropertyFilter(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _PROPERTYFILTER + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _PROPERTYFILTER - # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyFilter) + # @@protoc_insertion_point(class_scope:api.services.datastore.PropertyFilter) class GqlQuery(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _GQLQUERY + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _GQLQUERY - # @@protoc_insertion_point(class_scope:api.services.datastore.GqlQuery) + # @@protoc_insertion_point(class_scope:api.services.datastore.GqlQuery) class GqlQueryArg(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _GQLQUERYARG + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _GQLQUERYARG - # @@protoc_insertion_point(class_scope:api.services.datastore.GqlQueryArg) + # @@protoc_insertion_point(class_scope:api.services.datastore.GqlQueryArg) class QueryResultBatch(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _QUERYRESULTBATCH + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _QUERYRESULTBATCH - # @@protoc_insertion_point(class_scope:api.services.datastore.QueryResultBatch) + # @@protoc_insertion_point(class_scope:api.services.datastore.QueryResultBatch) class Mutation(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _MUTATION + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _MUTATION - # @@protoc_insertion_point(class_scope:api.services.datastore.Mutation) + # @@protoc_insertion_point(class_scope:api.services.datastore.Mutation) class MutationResult(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _MUTATIONRESULT + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _MUTATIONRESULT - # @@protoc_insertion_point(class_scope:api.services.datastore.MutationResult) + # @@protoc_insertion_point(class_scope:api.services.datastore.MutationResult) class ReadOptions(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _READOPTIONS + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _READOPTIONS - # @@protoc_insertion_point(class_scope:api.services.datastore.ReadOptions) + # @@protoc_insertion_point(class_scope:api.services.datastore.ReadOptions) class LookupRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LOOKUPREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _LOOKUPREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.LookupRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.LookupRequest) class LookupResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _LOOKUPRESPONSE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _LOOKUPRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.LookupResponse) + # @@protoc_insertion_point(class_scope:api.services.datastore.LookupResponse) class RunQueryRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _RUNQUERYREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _RUNQUERYREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.RunQueryRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.RunQueryRequest) class RunQueryResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _RUNQUERYRESPONSE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _RUNQUERYRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.RunQueryResponse) + # @@protoc_insertion_point(class_scope:api.services.datastore.RunQueryResponse) class BeginTransactionRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _BEGINTRANSACTIONREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _BEGINTRANSACTIONREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.BeginTransactionRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.BeginTransactionRequest) class BeginTransactionResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _BEGINTRANSACTIONRESPONSE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _BEGINTRANSACTIONRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.BeginTransactionResponse) + # @@protoc_insertion_point(class_scope:api.services.datastore.BeginTransactionResponse) class RollbackRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ROLLBACKREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ROLLBACKREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.RollbackRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.RollbackRequest) class RollbackResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ROLLBACKRESPONSE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ROLLBACKRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.RollbackResponse) + # @@protoc_insertion_point(class_scope:api.services.datastore.RollbackResponse) class CommitRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _COMMITREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _COMMITREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.CommitRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.CommitRequest) class CommitResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _COMMITRESPONSE + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _COMMITRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.CommitResponse) + # @@protoc_insertion_point(class_scope:api.services.datastore.CommitResponse) class AllocateIdsRequest(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ALLOCATEIDSREQUEST + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ALLOCATEIDSREQUEST - # @@protoc_insertion_point(class_scope:api.services.datastore.AllocateIdsRequest) + # @@protoc_insertion_point(class_scope:api.services.datastore.AllocateIdsRequest) class AllocateIdsResponse(_message.Message): - __metaclass__ = _reflection.GeneratedProtocolMessageType - DESCRIPTOR = _ALLOCATEIDSRESPONSE - # @@protoc_insertion_point(class_scope:api.services.datastore.AllocateIdsResponse) + __metaclass__ = _reflection.GeneratedProtocolMessageType + DESCRIPTOR = _ALLOCATEIDSRESPONSE + + # @@protoc_insertion_point(class_scope:api.services.datastore.AllocateIdsResponse) + DESCRIPTOR.has_options = True DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), '\n!com.google.api.services.datastore')