thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-14 02:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working commit

Browse Source
This commit is contained in:
millb 2019-11-11 07:20:08 +03:00
parent efc531c953
commit 2920d0bce3
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Core/SettingsCommon.cpp
View File

@ -65,7 +65,7 @@ template <typename Type>
void SettingNumber<Type>::set(const String & x)
{
std::cerr << "\n\nEnter in set_function_for_string\n\n";
set(parse<Type>(x));
set(completeParse<Type>(x));
}
template <>

48
dbms/src/IO/ReadHelpers.h
View File

@ -299,7 +299,8 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
res += *buf.position() - '0';
break;
default:
throw Exception("Invalid characters used", ErrorCodes::CANNOT_PARSE_NUMBER);
x = negative ? -res : res;
return ReturnType(true);
}
++buf.position();
}
@ -308,6 +309,15 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
return ReturnType(true);
}
template <typename T>
void completeReadIntTextImpl(T & x, ReadBuffer & buf)
{
std::cerr << "\n\nEnter in exactReadIntTextImpl function\n\n";
readIntTextImpl<T, void>(x, buf);
if (!buf.eof())
throw Exception("Invalid characters used", ErrorCodes::CANNOT_PARSE_NUMBER);
}
template <typename T>
void readIntText(T & x, ReadBuffer & buf)
{
@ -570,6 +580,9 @@ inline void readUUIDText(UUID & uuid, ReadBuffer & buf)
template <typename T>
inline T parse(const char * data, size_t size);
template <typename T>
inline T exactParse(const char * data, size_t size);
template <typename T>
inline T parseFromString(const String & str)
{
@ -676,7 +689,7 @@ readText(T & x, ReadBuffer & buf) { readIntText(x, buf); std::cerr << "\n\nEnter
template <typename T>
inline std::enable_if_t<std::is_floating_point_v<T>, void>
readText(T & x, ReadBuffer & buf) { readFloatText(x, buf); std::cerr << "\n\nEnter in readText for float\n\n";}
readText(T & x, ReadBuffer & buf) { readFloatText(x, buf);}
inline void readText(bool & x, ReadBuffer & buf) { readBoolText(x, buf); }
inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
@ -879,6 +892,37 @@ inline T parse(const char * data, size_t size)
return res;
}
template <typename T>
std::enable_if_t<is_integral_v<T>, T>
inline completeParse(const char * data, size_t size)
{
std::cerr << "\n\nenter in exact parse function\n\n";
T res;
ReadBufferFromMemory buf(data, size);
completeReadIntTextImpl<T>(res, buf);
return res;
}
template <typename T>
std::enable_if_t<!is_integral_v<T>, T>
inline completeParse(const char * data, size_t size)
{
return parse<T>(data, size);
}
template <typename T>
inline T completeParse(const String & s)
{
std::cerr << "\n\nenter in exact parse function_for_string\n\n";
return completeParse<T>(s.data(), s.size());
}
template <typename T>
inline T completeParse(const char * data)
{
return completeParse<T>(data, strlen(data));
}
template <typename T>
inline T parse(const char * data)
{