Skip to content

Commit 7391284

Browse files
committed
[#435] Remove initializeOffsets calling from SQL Table write
1 parent b078b5b commit 7391284

File tree

4 files changed

+2
-38
lines changed

4 files changed

+2
-38
lines changed

compiler/extensions/cpp/freemarker/Sql.inc.ftl

-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
<#return false>
88
</#function>
99

10-
<#function sql_table_has_blob_field fields>
11-
<#list fields as field>
12-
<#if field.sqlTypeData.isBlob>
13-
<#return true>
14-
</#if>
15-
</#list>
16-
<#return false>
17-
</#function>
18-
1910
<#function sql_db_has_without_rowid_table fields>
2011
<#list fields as field>
2112
<#if field.isWithoutRowIdTable>

compiler/extensions/cpp/freemarker/SqlTable.cpp.ftl

-17
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<@namespace_begin package.path/>
2626

2727
<#assign needsParameterProvider=explicitParameters?has_content/>
28-
<#assign hasBlobField=sql_table_has_blob_field(fields)/>
2928
<#if withValidationCode>
3029
<#assign hasPrimaryKeyField=false/>
3130
<#list fields as field>
@@ -697,10 +696,6 @@ void ${name}::writeRow(<#if needsParameterProvider>IParameterProvider& parameter
697696
<#if needsChildrenInitialization>
698697
row.initializeChildren(<#if needsParameterProvider>parameterProvider</#if>);
699698

700-
</#if>
701-
<#if hasBlobField>
702-
row.initializeOffsets();
703-
704699
</#if>
705700
int result;
706701

@@ -897,18 +892,6 @@ void ${name}::Row::initializeChildren(<#if needsParameterProvider>IParameterProv
897892
}
898893
</#if>
899894
</#list>
900-
}
901-
</#if>
902-
<#if hasBlobField>
903-
904-
void ${name}::Row::initializeOffsets()
905-
{
906-
<#list fields as field>
907-
<#if field.sqlTypeData.isBlob>
908-
if (<@sql_field_member_name field/>)
909-
<@sql_field_member_name field/>->initializeOffsets();
910-
</#if>
911-
</#list>
912895
}
913896
</#if>
914897
</#if>

compiler/extensions/cpp/freemarker/SqlTable.h.ftl

-12
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<@namespace_begin package.path/>
2828

2929
<#assign needsParameterProvider=explicitParameters?has_content/>
30-
<#assign hasBlobField=sql_table_has_blob_field(fields)/>
3130
<#if withValidationCode>
3231
<#assign hasNonVirtualField=sql_table_has_non_virtual_field(fields)/>
3332
</#if>
@@ -233,17 +232,6 @@ public:
233232
void initializeChildren(<#if needsParameterProvider>IParameterProvider& parameterProvider</#if>);
234233

235234
</#if>
236-
<#if hasBlobField>
237-
<#if withCodeComments>
238-
/**
239-
* Initializes offsets in all blob fields of the table.
240-
*
241-
* This method sets offsets in all blob fields recursively.
242-
*/
243-
</#if>
244-
void initializeOffsets();
245-
246-
</#if>
247235
</#if>
248236
private:
249237
<#if hasImplicitParameters>

test/language/sql_tables/cpp/BlobOffsetsParamTableTest.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ class BlobOffsetsParamTableTest : public ::testing::Test
5353
vector_type<uint32_t>& array = parameterizedBlob.getArray();
5454
for (uint32_t i = 0; i < array_size; ++i)
5555
array.push_back(i);
56+
parameterizedBlob.initialize(row.getOffsetsHolder());
57+
parameterizedBlob.initializeOffsets();
5658
}
5759

5860
static void fillBlobOffsetsParamTableRows(vector_type<BlobOffsetsParamTable::Row>& rows)

0 commit comments

Comments
 (0)