Skip to content

Commit 0c8b011

Browse files
schmidt-sebastianschmidt-sebastian
authored
Don't use UserDataReader for Increment transform (#3332)
1 parent a754645 commit 0c8b011

File tree

3 files changed

+19
-73
lines changed

3 files changed

+19
-73
lines changed

‎.changeset/plenty-maps-brush.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎packages/firestore/lite/test/dependencies.json

Lines changed: 15 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
],
249249
"variables": []
250250
},
251-
"sizeInBytes": 99162
251+
"sizeInBytes": 98934
252252
},
253253
"DocumentReference": {
254254
"dependencies": {
@@ -745,7 +745,7 @@
745745
],
746746
"variables": []
747747
},
748-
"sizeInBytes": 85476
748+
"sizeInBytes": 85248
749749
},
750750
"QueryDocumentSnapshot": {
751751
"dependencies": {
@@ -1077,7 +1077,6 @@
10771077
"binaryStringFromUint8Array",
10781078
"blobEquals",
10791079
"cast",
1080-
"coercedFieldValuesArray",
10811080
"createError",
10821081
"createMetadata",
10831082
"debugAssert",
@@ -1095,18 +1094,12 @@
10951094
"fromDotSeparatedString",
10961095
"fullyQualifiedPrefixPath",
10971096
"geoPointEquals",
1098-
"getEncodedDatabaseId",
10991097
"getLocalWriteTime",
11001098
"hardAssert",
11011099
"invalidClassError",
1102-
"invokeCommitRpc",
1103-
"isArray",
1104-
"isDouble",
11051100
"isEmpty",
1106-
"isInteger",
11071101
"isMapValue",
11081102
"isNegativeZero",
1109-
"isNumber",
11101103
"isPlainObject",
11111104
"isSafeInteger",
11121105
"isServerTimestamp",
@@ -1136,23 +1129,15 @@
11361129
"parseSentinelFieldValue",
11371130
"primitiveComparator",
11381131
"registerFirestore",
1139-
"serverTimestamp",
11401132
"terminate",
11411133
"terminateDatastore",
11421134
"timestampEquals",
11431135
"toBytes",
1144-
"toDocumentMask",
11451136
"toDouble",
1146-
"toFieldTransform",
11471137
"toInteger",
1148-
"toMutation",
1149-
"toMutationDocument",
1150-
"toName",
11511138
"toNumber",
1152-
"toPrecondition",
11531139
"toResourceName",
11541140
"toTimestamp",
1155-
"toVersion",
11561141
"tryGetCustomObjectType",
11571142
"typeOrder",
11581143
"uint8ArrayFromBinaryString",
@@ -1166,8 +1151,6 @@
11661151
"valueEquals"
11671152
],
11681153
"classes": [
1169-
"ArrayRemoveTransformOperation",
1170-
"ArrayUnionTransformOperation",
11711154
"BaseFieldPath",
11721155
"BasePath",
11731156
"Blob",
@@ -1195,7 +1178,6 @@
11951178
"MaybeDocument",
11961179
"Mutation",
11971180
"NoDocument",
1198-
"NumericIncrementTransformOperation",
11991181
"OAuthToken",
12001182
"ObjectValue",
12011183
"ObjectValueBuilder",
@@ -1206,7 +1188,6 @@
12061188
"Precondition",
12071189
"ResourcePath",
12081190
"SerializableFieldValue",
1209-
"ServerTimestampTransform",
12101191
"SetMutation",
12111192
"SnapshotVersion",
12121193
"StreamBridge",
@@ -1215,12 +1196,11 @@
12151196
"UnknownDocument",
12161197
"User",
12171198
"UserDataReader",
1218-
"VerifyMutation",
12191199
"WriteBatch"
12201200
],
12211201
"variables": []
12221202
},
1223-
"sizeInBytes": 72512
1203+
"sizeInBytes": 65618
12241204
},
12251205
"addDoc": {
12261206
"dependencies": {
@@ -1438,7 +1418,7 @@
14381418
],
14391419
"variables": []
14401420
},
1441-
"sizeInBytes": 109513
1421+
"sizeInBytes": 109285
14421422
},
14431423
"arrayRemove": {
14441424
"dependencies": {
@@ -1853,7 +1833,7 @@
18531833
],
18541834
"variables": []
18551835
},
1856-
"sizeInBytes": 99790
1836+
"sizeInBytes": 99562
18571837
},
18581838
"collectionGroup": {
18591839
"dependencies": {
@@ -2044,7 +2024,7 @@
20442024
],
20452025
"variables": []
20462026
},
2047-
"sizeInBytes": 99222
2027+
"sizeInBytes": 98994
20482028
},
20492029
"deleteDoc": {
20502030
"dependencies": {
@@ -2398,7 +2378,7 @@
23982378
],
23992379
"variables": []
24002380
},
2401-
"sizeInBytes": 100611
2381+
"sizeInBytes": 100383
24022382
},
24032383
"documentId": {
24042384
"dependencies": {
@@ -2734,6 +2714,7 @@
27342714
"uint8ArrayFromBinaryString",
27352715
"validateArgType",
27362716
"validateExactNumberOfArgs",
2717+
"validateHasExplicitOrderByForLimitToLast",
27372718
"validateNamedArrayAtLeastNumberOfElements",
27382719
"validatePlainObject",
27392720
"validatePositiveNumber",
@@ -2805,48 +2786,37 @@
28052786
],
28062787
"variables": []
28072788
},
2808-
"sizeInBytes": 91235
2789+
"sizeInBytes": 91307
28092790
},
28102791
"increment": {
28112792
"dependencies": {
28122793
"functions": [
28132794
"argToString",
28142795
"arrayEquals",
2815-
"assertUint8ArrayAvailable",
28162796
"binaryStringFromUint8Array",
28172797
"blobEquals",
28182798
"cast",
2819-
"createError",
28202799
"createMetadata",
2821-
"createSentinelChildContext",
28222800
"debugAssert",
28232801
"debugCast",
28242802
"decodeBase64",
28252803
"encodeBase64",
28262804
"fail",
2827-
"forEach",
28282805
"formatJSON",
2829-
"formatPlural",
2830-
"fullyQualifiedPrefixPath",
28312806
"geoPointEquals",
28322807
"getLocalWriteTime",
28332808
"hardAssert",
28342809
"increment",
2835-
"invalidClassError",
28362810
"isDouble",
2837-
"isEmpty",
28382811
"isInteger",
28392812
"isNegativeZero",
28402813
"isNumber",
2841-
"isPlainObject",
28422814
"isSafeInteger",
28432815
"isServerTimestamp",
2844-
"isWrite",
28452816
"loadProtos",
28462817
"logDebug",
28472818
"logError",
28482819
"logWarn",
2849-
"looksLikeJsonObject",
28502820
"mapCodeFromRpcCode",
28512821
"newConnection",
28522822
"newDatastore",
@@ -2858,65 +2828,44 @@
28582828
"numberEquals",
28592829
"objectEquals",
28602830
"objectSize",
2861-
"ordinal",
2862-
"parseArray",
2863-
"parseData",
2864-
"parseObject",
2865-
"parseScalarValue",
2866-
"parseSentinelFieldValue",
28672831
"primitiveComparator",
28682832
"registerFirestore",
28692833
"terminate",
28702834
"terminateDatastore",
28712835
"timestampEquals",
2872-
"toBytes",
28732836
"toDouble",
28742837
"toInteger",
28752838
"toNumber",
2876-
"toResourceName",
2877-
"toTimestamp",
2878-
"tryGetCustomObjectType",
28792839
"typeOrder",
28802840
"uint8ArrayFromBinaryString",
2881-
"validateArgType",
2882-
"validateExactNumberOfArgs",
2883-
"validatePlainObject",
2884-
"validateType",
2885-
"valueDescription",
28862841
"valueEquals"
28872842
],
28882843
"classes": [
2889-
"BasePath",
2890-
"Blob",
28912844
"ByteString",
28922845
"DatabaseId",
28932846
"DatabaseInfo",
28942847
"Datastore",
28952848
"DatastoreImpl",
28962849
"Deferred",
2897-
"DocumentKeyReference",
28982850
"FieldTransform",
28992851
"FieldValue",
29002852
"FieldValueDelegate",
29012853
"FirebaseCredentialsProvider",
29022854
"Firestore",
29032855
"FirestoreError",
2904-
"GeoPoint",
29052856
"GrpcConnection",
29062857
"JsonProtoSerializer",
29072858
"NumericIncrementFieldValueImpl",
29082859
"NumericIncrementTransformOperation",
29092860
"OAuthToken",
2910-
"ParseContext",
2911-
"ResourcePath",
29122861
"SerializableFieldValue",
29132862
"StreamBridge",
29142863
"Timestamp",
29152864
"User"
29162865
],
29172866
"variables": []
29182867
},
2919-
"sizeInBytes": 42341
2868+
"sizeInBytes": 27564
29202869
},
29212870
"initializeFirestore": {
29222871
"dependencies": {
@@ -3153,7 +3102,7 @@
31533102
],
31543103
"variables": []
31553104
},
3156-
"sizeInBytes": 99505
3105+
"sizeInBytes": 99277
31573106
},
31583107
"queryEqual": {
31593108
"dependencies": {
@@ -3317,7 +3266,7 @@
33173266
],
33183267
"variables": []
33193268
},
3320-
"sizeInBytes": 85680
3269+
"sizeInBytes": 85452
33213270
},
33223271
"refEqual": {
33233272
"dependencies": {
@@ -3509,7 +3458,7 @@
35093458
],
35103459
"variables": []
35113460
},
3512-
"sizeInBytes": 99447
3461+
"sizeInBytes": 99219
35133462
},
35143463
"runTransaction": {
35153464
"dependencies": {
@@ -4108,7 +4057,7 @@
41084057
],
41094058
"variables": []
41104059
},
4111-
"sizeInBytes": 86413
4060+
"sizeInBytes": 86185
41124061
},
41134062
"terminate": {
41144063
"dependencies": {
@@ -4461,6 +4410,6 @@
44614410
],
44624411
"variables": []
44634412
},
4464-
"sizeInBytes": 72592
4413+
"sizeInBytes": 72710
44654414
}
44664415
}

‎packages/firestore/src/api/field_value.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
} from '../model/transform_operation';
3232
import { ParseContext, parseData, UserDataSource } from './user_data_reader';
3333
import { debugAssert } from '../util/assert';
34+
import { toNumber } from '../remote/serializer';
3435

3536
/**
3637
* An opaque base class for FieldValue sentinel objects in our public API that
@@ -188,15 +189,9 @@ export class NumericIncrementFieldValueImpl extends SerializableFieldValue {
188189
}
189190

190191
_toFieldTransform(context: ParseContext): FieldTransform {
191-
const parseContext = createSentinelChildContext(
192-
this,
193-
context,
194-
/*array=*/ false
195-
);
196-
const operand = parseData(this._operand, parseContext)!;
197192
const numericIncrement = new NumericIncrementTransformOperation(
198193
context.serializer,
199-
operand
194+
toNumber(context.serializer, this._operand)
200195
);
201196
return new FieldTransform(context.path!, numericIncrement);
202197
}

0 commit comments

Comments
 (0)