Skip to content

Commit b359f9b

Browse files
committed
[#374] Remove initialize_offsets calling from pubsub/service/sql table
1 parent e2a9fa3 commit b359f9b

File tree

6 files changed

+4
-11
lines changed

6 files changed

+4
-11
lines changed

compiler/extensions/python/freemarker/Pubsub.py.ftl

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ class ${name}:
113113

114114
def _publish(self, topic: str, message: typing.Any, context: typing.Any) -> None:
115115
writer = zserio.BitStreamWriter()
116-
message.initialize_offsets(writer.bitposition)
117116
message.write(writer)
118117
self._pubsub.publish(topic, writer.byte_array, context)
119118
</#if>

compiler/extensions/python/freemarker/SqlTable.py.ftl

-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ class ${name}:
365365
${field.snakeCaseName}_ = row_in_list[${field?index}]
366366
if isinstance(${field.snakeCaseName}_, ${field.typeInfo.typeFullName}):
367367
writer = zserio.BitStreamWriter()
368-
${field.snakeCaseName}_.initialize_offsets(writer.bitposition)
369368
${field.snakeCaseName}_.write(writer)
370369
row_in_list[${field?index}] = writer.byte_array
371370

compiler/extensions/python/runtime/src/zserio/service.py

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def byte_array(self) -> bytes:
3333

3434
if not self._is_byte_array_initialized:
3535
writer = BitStreamWriter()
36-
self._zserio_object.initialize_offsets(writer.bitposition)
3736
self._zserio_object.write(writer)
3837
self._byte_array = writer.byte_array
3938
self._is_byte_array_initialized = True

compiler/extensions/python/runtime/tests/test_service.py

+1-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ def test_service_data(self):
77
class ZserioObject:
88
def __init__(self, value):
99
self._value = value
10-
self._offsets_initialized = False
1110

1211
def __eq__(self, other):
1312
return self._value == other._value
@@ -16,14 +15,8 @@ def __eq__(self, other):
1615
def bitsizeof(_bitposition):
1716
return 31 # to make an unaligned type
1817

19-
def initialize_offsets(self, bitposition: int) -> int:
20-
self._offsets_initialized = True
21-
return bitposition + ZserioObject.bitsizeof(bitposition)
22-
2318
def write(self, writer):
24-
# don't write anything if offsets are not initialized to force test failure
25-
if self._offsets_initialized:
26-
writer.write_bits(self._value, self.bitsizeof(0))
19+
writer.write_bits(self._value, self.bitsizeof(0))
2720

2821
zserio_object = ZserioObject(0xABCD)
2922
service_data = ServiceData(zserio_object)

test/language/service_types/python/ComplexTypesServiceTest.py

+2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ def testRgbToCmyk(self):
114114

115115
requestData = self.api.RequestData(self.api.ColorModel.RGB, offsets, data)
116116
request = self.api.Request(self.api.ColorModel.RGB, requestData)
117+
request.initialize_offsets(0)
117118

118119
self.assertEqual(length, self.client.get_length(request).length)
119120

@@ -141,6 +142,7 @@ def testCmykToRgb(self):
141142

142143
requestData = self.api.RequestData(self.api.ColorModel.CMYK, offsets, data)
143144
request = self.api.Request(self.api.ColorModel.CMYK, requestData)
145+
request.initialize_offsets(0)
144146

145147
self.assertEqual(length, self.client.get_length(request).length)
146148

test/language/sql_tables/python/ComplexTableTest.py

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ def _createComplexTableRows(self):
102102
def _createComplexTableRow(self, blobId, name):
103103
values = [blobId for i in range(self.COMPLEX_TABLE_COUNT)]
104104
blob = self.api.complex_table.TestBlob(len(values), 0, values, True)
105+
blob.initialize_offsets(0)
105106

106107
return (blobId, zserio.limits.INT64_MAX, name, True, 9.9, 5.5, 0x34,
107108
self.api.complex_table.TestEnum.RED, blob)

0 commit comments

Comments
 (0)