--- a/src/StreamRelationalReader.h Sat Sep 15 22:52:15 2018 +0200
+++ b/src/StreamRelationalReader.h Sat Sep 15 23:22:50 2018 +0200
@@ -142,24 +142,23 @@
// Read column count
columnCount = integerReader.readValue(input);
- columnTypes.resize(columnCount);
- columnNames.resize(columnCount);
- columns.resize(columnCount);
+ columnTypes.reserve(columnCount);
+ columnNames.reserve(columnCount);
+ columns.reserve(columnCount);
// Read column names
for (int i = 0; i < columnCount; i++) {
- columnNames[i] = stringReader.readValue(input);
+ columnNames.push_back(stringReader.readValue(input));
}
// Read column types
for (int i = 0; i < columnCount; i++) {
TypeId typeId = (TypeId) integerReader.readValue(input); // TODO: přetypování OK?
string_t typeCode = toTypeCode(typeId); // validate typeId TODO: je potřeba?
- columnTypes[i] = typeId;
+ columnTypes.push_back(typeId);
// put together names, type ids and type codes:
- handlers::AttributeMetadataPrivate* xxx = new handlers::AttributeMetadataPrivate({columnNames[i], columnTypes[i], typeCode});
- columns[i] = handlers::AttributeMetadata(xxx);
+ columns.push_back(handlers::AttributeMetadata(new handlers::AttributeMetadataPrivate({columnNames[i], columnTypes[i], typeCode})));
}
for (StringHandler* handler : stringHandlers) handler->startRelation(tableName, columns);