Skip to content

Commit 2a30ca4

Browse files
authored
Remove restrict from const objects (#6791)
We don't really need it if we systematically use restrict on the read/write objects. This is a minor refactoring to avoid confusion, shouldn't actually change any behavior or code generation.
1 parent 25af8f4 commit 2a30ca4

File tree

9 files changed

+23
-23
lines changed

9 files changed

+23
-23
lines changed

tsl/src/compression/array.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ text_array_decompress_all_serialized_no_header(StringInfo si, bool has_nulls,
494494
Simple8bRleSerialized *sizes_serialized = bytes_deserialize_simple8b_and_advance(si);
495495

496496
uint32 n_notnull;
497-
uint32 *restrict sizes = simple8brle_decompress_all_uint32(sizes_serialized, &n_notnull);
497+
const uint32 *sizes = simple8brle_decompress_all_uint32(sizes_serialized, &n_notnull);
498498
const uint32 n_total = has_nulls ? nulls_serialized->num_elements : n_notnull;
499499
CheckCompressedData(n_total >= n_notnull);
500500

@@ -507,7 +507,7 @@ text_array_decompress_all_serialized_no_header(StringInfo si, bool has_nulls,
507507
uint32 offset = 0;
508508
for (uint32 i = 0; i < n_notnull; i++)
509509
{
510-
void *unaligned = consumeCompressedData(si, sizes[i]);
510+
const void *unaligned = consumeCompressedData(si, sizes[i]);
511511

512512
/*
513513
* We start reading from the end of previous datum, but this pointer
@@ -517,7 +517,8 @@ text_array_decompress_all_serialized_no_header(StringInfo si, bool has_nulls,
517517
*
518518
* See the corresponding row-by-row code in bytes_to_datum_and_advance().
519519
*/
520-
void *vardata = DatumGetPointer(att_align_pointer(unaligned, TYPALIGN_INT, -1, unaligned));
520+
const void *vardata =
521+
DatumGetPointer(att_align_pointer(unaligned, TYPALIGN_INT, -1, unaligned));
521522

522523
/*
523524
* Check for potentially corrupt varlena headers since we're reading them
@@ -578,7 +579,7 @@ text_array_decompress_all_serialized_no_header(StringInfo si, bool has_nulls,
578579
* We have decompressed the data with nulls skipped, reshuffle it
579580
* according to the nulls bitmap.
580581
*/
581-
Simple8bRleBitmap nulls = simple8brle_bitmap_decompress(nulls_serialized);
582+
const Simple8bRleBitmap nulls = simple8brle_bitmap_decompress(nulls_serialized);
582583
CheckCompressedData(n_notnull + simple8brle_bitmap_num_ones(&nulls) == n_total);
583584

584585
int current_notnull_element = n_notnull - 1;

tsl/src/compression/deltadelta_impl.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ FUNCTION_NAME(delta_delta_decompress_all, ELEMENT_TYPE)(Datum compressed, Memory
3131
* test_delta4().
3232
*/
3333
uint32 num_deltas;
34-
const uint64 *restrict deltas_zigzag =
35-
simple8brle_decompress_all_uint64(deltas_compressed, &num_deltas);
34+
const uint64 *deltas_zigzag = simple8brle_decompress_all_uint64(deltas_compressed, &num_deltas);
3635

3736
Simple8bRleBitmap nulls = { 0 };
3837
if (has_nulls)

tsl/src/compression/gorilla.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ unpack_leading_zeros_array(BitArray *bitarray, uint32 *_n)
867867
for (uint32 lane = 0; lane < n_lanes; lane++)
868868
{
869869
uint8 *restrict lane_dest = &dest[lane * LANE_OUTPUTS];
870-
const uint8 *restrict lane_src = &((uint8 *) bitarray->buckets.data)[lane * LANE_INPUTS];
870+
const uint8 *lane_src = &((uint8 *) bitarray->buckets.data)[lane * LANE_INPUTS];
871871
for (uint32 output_in_lane = 0; output_in_lane < LANE_OUTPUTS; output_in_lane++)
872872
{
873873
const int startbit_abs = output_in_lane * BITS_PER_LEADING_ZEROS;

tsl/src/compression/gorilla_impl.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ FUNCTION_NAME(gorilla_decompress_all, ELEMENT_TYPE)(CompressedGorillaData *goril
4040
CheckCompressedData(n_total >= n_notnull);
4141

4242
/* Unpack the basic compressed data parts. */
43-
Simple8bRleBitmap tag0s = simple8brle_bitmap_prefixsums(gorilla_data->tag0s);
44-
Simple8bRleBitmap tag1s = simple8brle_bitmap_prefixsums(gorilla_data->tag1s);
43+
const Simple8bRleBitmap tag0s = simple8brle_bitmap_prefixsums(gorilla_data->tag0s);
44+
const Simple8bRleBitmap tag1s = simple8brle_bitmap_prefixsums(gorilla_data->tag1s);
4545

4646
BitArray leading_zeros_bitarray = gorilla_data->leading_zeros;
4747
BitArrayIterator leading_zeros_iterator;
4848
bit_array_iterator_init(&leading_zeros_iterator, &leading_zeros_bitarray);
4949

5050
uint32 num_leading_zeros_padded;
51-
uint8 *restrict all_leading_zeros =
51+
const uint8 *all_leading_zeros =
5252
unpack_leading_zeros_array(&gorilla_data->leading_zeros, &num_leading_zeros_padded);
5353

5454
uint32 num_bit_widths;
55-
uint8 *restrict bit_widths =
55+
const uint8 *bit_widths =
5656
simple8brle_decompress_all_uint8(gorilla_data->num_bits_used_per_xor, &num_bit_widths);
5757

5858
BitArray xors_bitarray = gorilla_data->xors;
@@ -147,7 +147,7 @@ FUNCTION_NAME(gorilla_decompress_all, ELEMENT_TYPE)(CompressedGorillaData *goril
147147
* We have decompressed the data with nulls skipped, reshuffle it
148148
* according to the nulls bitmap.
149149
*/
150-
Simple8bRleBitmap nulls = simple8brle_bitmap_decompress(gorilla_data->nulls);
150+
const Simple8bRleBitmap nulls = simple8brle_bitmap_decompress(gorilla_data->nulls);
151151
CheckCompressedData(n_notnull + simple8brle_bitmap_num_ones(&nulls) == n_total);
152152

153153
int current_notnull_element = n_notnull - 1;

tsl/src/compression/simple8b_rle_bitmap.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,30 @@
1515
typedef struct Simple8bRleBitmap
1616
{
1717
/* Either the bools or prefix sums, depending on the decompression method. */
18-
void *data;
18+
const void *data;
1919

2020
uint16 num_elements;
2121
uint16 num_ones;
2222
} Simple8bRleBitmap;
2323

2424
pg_attribute_always_inline static bool
25-
simple8brle_bitmap_get_at(Simple8bRleBitmap *bitmap, uint16 i)
25+
simple8brle_bitmap_get_at(const Simple8bRleBitmap *bitmap, uint16 i)
2626
{
2727
/* We have some padding on the right but we shouldn't overrun it. */
2828
Assert(i < ((bitmap->num_elements + 63) / 64 + 1) * 64);
2929

30-
return ((bool *restrict) bitmap->data)[i];
30+
return ((const bool *) bitmap->data)[i];
3131
}
3232

3333
pg_attribute_always_inline static uint16
34-
simple8brle_bitmap_prefix_sum(Simple8bRleBitmap *bitmap, uint16 i)
34+
simple8brle_bitmap_prefix_sum(const Simple8bRleBitmap *bitmap, uint16 i)
3535
{
3636
Assert(i < ((bitmap->num_elements + 63) / 64 + 1) * 64);
37-
return ((uint16 *restrict) bitmap->data)[i];
37+
return ((const uint16 *) bitmap->data)[i];
3838
}
3939

4040
pg_attribute_always_inline static uint16
41-
simple8brle_bitmap_num_ones(Simple8bRleBitmap *bitmap)
41+
simple8brle_bitmap_num_ones(const Simple8bRleBitmap *bitmap)
4242
{
4343
return bitmap->num_ones;
4444
}

tsl/src/compression/simple8b_rle_decompress_all.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ FUNCTION_NAME(simple8brle_decompress_all_buf,
3636
*/
3737
Assert(num_blocks <= GLOBAL_MAX_ROWS_PER_COMPRESSION);
3838
uint8 selector_values[GLOBAL_MAX_ROWS_PER_COMPRESSION];
39-
const uint64 *restrict slots = compressed->slots;
39+
const uint64 *slots = compressed->slots;
4040
for (uint32 block_index = 0; block_index < num_blocks; block_index++)
4141
{
4242
const uint32 selector_slot = block_index / SIMPLE8B_SELECTORS_PER_SELECTOR_SLOT;
@@ -52,7 +52,7 @@ FUNCTION_NAME(simple8brle_decompress_all_buf,
5252
* Now decompress the individual blocks.
5353
*/
5454
uint32 decompressed_index = 0;
55-
const uint64 *restrict blocks = compressed->slots + num_selector_slots;
55+
const uint64 *blocks = compressed->slots + num_selector_slots;
5656
for (uint32 block_index = 0; block_index < num_blocks; block_index++)
5757
{
5858
const uint8 selector_value = selector_values[block_index];

tsl/src/nodes/decompress_chunk/compressed_batch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ compute_plain_qual(DecompressContext *dcontext, DecompressBatchState *batch_stat
539539
const size_t n_vector_result_words = (vector->length + 63) / 64;
540540
Assert((predicate_result != default_value_predicate_result) ||
541541
n_vector_result_words == 1); /* to placate Coverity. */
542-
const uint64 *restrict validity = (uint64 *restrict) vector->buffers[0];
542+
const uint64 *validity = (const uint64 *) vector->buffers[0];
543543
for (size_t i = 0; i < n_vector_result_words; i++)
544544
{
545545
predicate_result[i] &= validity[i];

tsl/src/nodes/decompress_chunk/pred_vector_const_arithmetic_single.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ FUNCTION_NAME(PREDICATE_NAME, VECTOR_CTYPE,
2929

3030
/* Now run the predicate itself. */
3131
const CONST_CTYPE constvalue = CONST_CONVERSION(constdatum);
32-
const VECTOR_CTYPE *restrict vector = (VECTOR_CTYPE *restrict) arrow->buffers[1];
32+
const VECTOR_CTYPE *vector = (const VECTOR_CTYPE *) arrow->buffers[1];
3333

3434
for (size_t outer = 0; outer < n / 64; outer++)
3535
{

tsl/src/nodes/decompress_chunk/vector_predicates.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ vector_nulltest(const ArrowArray *arrow, int test_type, uint64 *restrict result)
7171
const bool should_be_null = test_type == IS_NULL;
7272

7373
const uint16 bitmap_words = (arrow->length + 63) / 64;
74-
const uint64 *restrict validity = (const uint64 *) arrow->buffers[0];
74+
const uint64 *validity = (const uint64 *) arrow->buffers[0];
7575
for (uint16 i = 0; i < bitmap_words; i++)
7676
{
7777
if (should_be_null)

0 commit comments

Comments
 (0)