@@ -74,11 +74,6 @@ message TableReaderSpec {
74
74
// limit hint.
75
75
optional bool parallelize = 12 [(gogoproto.nullable ) = false ];
76
76
77
- // batch_bytes_limit, if non-zero, controls the TargetBytes limits that the
78
- // TableReader will use for its scans. If zero, then the server-side default
79
- // is used. If parallelize is set, this cannot be set.
80
- optional int64 batch_bytes_limit = 17 [(gogoproto.nullable ) = false ];
81
-
82
77
// If non-zero, this enables inconsistent historical scanning where different
83
78
// batches can be read with different timestamps. This is used for
84
79
// long-running table statistics which may outlive the TTL. Using this setting
@@ -124,7 +119,7 @@ message TableReaderSpec {
124
119
// leaseholder of the beginning of the key spans to be scanned).
125
120
optional bool ignore_misplanned_ranges = 22 [(gogoproto.nullable ) = false ];
126
121
127
- reserved 1 , 2 , 4 , 6 , 7 , 8 , 13 , 14 , 15 , 16 , 19 ;
122
+ reserved 1 , 2 , 4 , 6 , 7 , 8 , 13 , 14 , 15 , 16 , 17 , 19 ;
128
123
}
129
124
130
125
// FiltererSpec is the specification for a processor that filters input rows
@@ -303,18 +298,10 @@ message JoinReaderSpec {
303
298
// variables @(N+1) to @(N+M) refer to fetched columns.
304
299
optional Expression on_expr = 4 [(gogoproto.nullable ) = false ];
305
300
306
- // This used to be used for an extra index filter expression. It was removed
307
- // in DistSQL version 24.
308
- reserved 5 ;
309
-
310
301
// For lookup joins. Only JoinType_INNER and JoinType_LEFT_OUTER are
311
302
// supported.
312
303
optional sqlbase.JoinType type = 6 [(gogoproto.nullable ) = false ];
313
304
314
- // This field used to be a visibility level of the columns that should be
315
- // produced. We now produce the columns in the FetchSpec.
316
- reserved 7 ;
317
-
318
305
// Indicates the row-level locking strength to be used by the join. If set to
319
306
// FOR_NONE, no row-level locking should be performed.
320
307
optional sqlbase.ScanLockingStrength locking_strength = 9 [(gogoproto.nullable ) = false ];
@@ -335,8 +322,6 @@ message JoinReaderSpec {
335
322
// optimizations.
336
323
optional bool maintain_ordering = 11 [(gogoproto.nullable ) = false ];
337
324
338
- reserved 12 , 13 ;
339
-
340
325
// LeftJoinWithPairedJoiner is used when a left {outer,anti,semi} join is
341
326
// being achieved by pairing two joins, and this is the second join. See
342
327
// the comment above.
@@ -349,13 +334,6 @@ message JoinReaderSpec {
349
334
// be true.
350
335
optional bool output_group_continuation_for_left_row = 15 [(gogoproto.nullable ) = false ];
351
336
352
- // lookup_batch_bytes_limit, if non-zero, controls the TargetBytes limits that
353
- // the joiner will use for its lookups. If zero, then the server-side default
354
- // is used. Note that, regardless of this setting, bytes limits are not always
355
- // used for lookups - it depends on whether the joiner decides it wants
356
- // DistSender-parallelism or not.
357
- optional int64 lookup_batch_bytes_limit = 18 [(gogoproto.nullable ) = false ];
358
-
359
337
// A hint for how many rows the consumer of the join reader output might
360
338
// need. This is used to size the initial batches of input rows to try to
361
339
// avoid reading many more rows than needed by the processor receiving the
@@ -384,6 +362,8 @@ message JoinReaderSpec {
384
362
// reverse order. This is only useful if a lookup can return more than one
385
363
// row.
386
364
optional bool reverse_scans = 25 [(gogoproto.nullable ) = false ];
365
+
366
+ reserved 5 , 7 , 12 , 13 , 18 ;
387
367
}
388
368
389
369
// SorterSpec is the specification for a "sorting aggregator". A sorting
0 commit comments