dbms: development [#CONV-2944].

This commit is contained in:
Alexey Milovidov 2011-11-06 00:59:37 +00:00
parent d51ae544fc
commit e532246802
2 changed files with 6 additions and 15 deletions

View File

@ -1,5 +1,4 @@
#ifndef DBMS_DATA_TYPES_NUMBER_VARIABLE_H
#define DBMS_DATA_TYPES_NUMBER_VARIABLE_H
#pragma once
#include <DB/Columns/ColumnsNumber.h>
#include <DB/DataTypes/IDataTypeNumberVariable.h>
@ -25,5 +24,3 @@ public:
};
}
#endif

View File

@ -1,5 +1,4 @@
#ifndef DBMS_DATA_TYPES_IDATATYPE_NUMBER_VARIABLE_H
#define DBMS_DATA_TYPES_IDATATYPE_NUMBER_VARIABLE_H
#pragma once
#include <DB/Core/Exception.h>
#include <DB/Core/ErrorCodes.h>
@ -48,16 +47,13 @@ public:
{
typename ColumnType::Container_t & x = dynamic_cast<ColumnType &>(column).getData();
x.resize(limit);
for (size_t i = 0; i < limit; ++i)
size_t i = 0;
while (i < limit && !istr.eof())
{
readVarT(x[i], istr);
if (istr.eof())
{
x.resize(i);
break;
}
++i;
}
x.resize(i);
}
ColumnPtr createColumn() const
@ -72,5 +68,3 @@ public:
};
}
#endif