Skip to content

Commit

Permalink
Merge branch 'master' into cop
Browse files Browse the repository at this point in the history
  • Loading branch information
zanmato1984 committed Aug 14, 2019
2 parents 0492af6 + 8188f56 commit 4a6bad8
Show file tree
Hide file tree
Showing 3 changed files with 219 additions and 12 deletions.
174 changes: 174 additions & 0 deletions dbms/src/Storages/Transaction/MyTimeParser.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
#pragma once

#include <Core/Field.h>
#include <Core/Types.h>
#include <common/DateLUT.h>
#include <cctype>
#include <initializer_list>
#include <vector>

#include <Storages/Transaction/TiDB.h>
#include <Poco/StringTokenizer.h>

namespace DB
{

int adjustYear(int year)
{
if (year >= 0 && year <= 69)
return 2000 + year;
if (year >= 70 && year <= 99)
return 1900 + year;
return year;
}

void scanTimeArgs(const std::vector<String> & seps, std::initializer_list<int *> && list)
{
int i = 0;
for (auto * ptr : list)
{
*ptr = std::stoi(seps[i]);
i++;
}
}

int getFracIndex(const String & format)
{
int idx = -1;
for (int i = int(format.size()) - 1; i >= 0; i--)
{
if (std::ispunct(format[i]))
{
if (format[i] == '.')
{
idx = i;
}
break;
}
}
return idx;
}

std::vector<String> parseDateFormat(String format)
{
format = Poco::trimInPlace(format);

std::vector<String> seps;
size_t start = 0;
for (size_t i = 0; i < format.size(); i++)
{
if (i == 0 || i + 1 == format.size())
{
if (!std::isdigit(format[i]))
return {};
continue;
}

if (!std::isdigit(format[i]))
{
if (!std::isdigit(format[i - 1]))
return {};
seps.push_back(format.substr(start, i - start));
start = i + 1;
}
}
seps.push_back(format.substr(start));
return seps;
}

std::vector<String> splitDatetime(String format)
{
int idx = getFracIndex(format);
if (idx > 0)
{
format = format.substr(0, idx);
}
return parseDateFormat(format);
}

Field parseMyDatetime(const String & str)
{
Int32 year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;

const auto & seps = splitDatetime(str);

switch (seps.size())
{
// No delimiter
case 1:
{
size_t l = seps[0].size();
switch (l)
{
case 14:
// YYYYMMDDHHMMSS
{
std::sscanf(seps[0].c_str(), "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second);
break;
}
case 12:
{
std::sscanf(seps[0].c_str(), "%2d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second);
year = adjustYear(year);
break;
}
case 11:
{
std::sscanf(seps[0].c_str(), "%2d%2d%2d%2d%2d%1d", &year, &month, &day, &hour, &minute, &second);
year = adjustYear(year);
break;
}
case 10:
{
std::sscanf(seps[0].c_str(), "%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute);
year = adjustYear(year);
break;
}
case 9:
{
std::sscanf(seps[0].c_str(), "%2d%2d%2d%2d%1d", &year, &month, &day, &hour, &minute);
year = adjustYear(year);
break;
}
case 8:
{
std::sscanf(seps[0].c_str(), "%4d%2d%2d", &year, &month, &day);
break;
}
case 6:
case 5:
{
std::sscanf(seps[0].c_str(), "%2d%2d%2d", &year, &month, &day);
year = adjustYear(year);
break;
}
default:
{
throw Exception("Wrong datetime format");
}
// TODO Process frac!
}
break;
}
case 3:
{
scanTimeArgs(seps, {&year, &month, &day});
break;
}
case 6:
{
scanTimeArgs(seps, {&year, &month, &day, &hour, &minute, &second});
break;
}
default:
{
throw Exception("Wrong datetime format");
}
}

UInt64 ymd = ((year * 13 + month) << 5) | day;
UInt64 hms = (hour << 12) | (minute << 6) | second;
return Field((ymd << 17 | hms) << 24);
}

} // namespace DB
49 changes: 39 additions & 10 deletions dbms/src/Storages/Transaction/TiDB.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include <Common/Decimal.h>
#include <IO/ReadBufferFromString.h>
#include <Storages/MutableSupport.h>
#include <Storages/Transaction/MyTimeParser.h>
#include <Storages/Transaction/TiDB.h>

namespace TiDB
Expand All @@ -9,9 +11,6 @@ using DB::WriteBufferFromOwnString;

ColumnInfo::ColumnInfo(Poco::JSON::Object::Ptr json) { deserialize(json); }

// TODO:: Refine Decimal Default Value !!
// TODO:: Refine Enum Default Value !!
// TODO:: Refine Date/Datatime/TimeStamp Defalut Value !!
Field ColumnInfo::defaultValueToField() const
{
auto & value = origin_default_value;
Expand All @@ -27,16 +26,16 @@ Field ColumnInfo::defaultValueToField() const
case TypeLong:
case TypeLongLong:
case TypeInt24:
case TypeBit:
return value.convert<Int64>();
// Floating type.
case TypeFloat:
case TypeDouble:
return value.convert<double>();
case TypeTimestamp:
// FIXME: may be string
return value.convert<Int64>();
case TypeDate:
case TypeDatetime:
case TypeTimestamp:
return DB::parseMyDatetime(value.convert<String>());
case TypeVarchar:
case TypeTinyBlob:
case TypeMediumBlob:
Expand All @@ -46,18 +45,48 @@ Field ColumnInfo::defaultValueToField() const
case TypeString:
return value.convert<String>();
case TypeEnum:
// FIXME: may be int or string
return value.convert<String>();
return getEnumIndex(value.convert<String>());
case TypeNull:
return Field();
case TypeDecimal:
case TypeNewDecimal:
return getDecimalDefaultValue(value.convert<String>());
case TypeTime:
case TypeYear:
case TypeSet:
// TODO support it !
return Field();
default:
throw Exception("Have not proccessed type: " + std::to_string(tp));
}
return Field();
}

Poco::JSON::Object::Ptr ColumnInfo::getJSONObject() const
try
DB::Decimal ColumnInfo::getDecimalDefaultValue(const String & str) const
{
DB::ReadBufferFromString buffer(str);
DB::Decimal result;
result.precision = flen;
result.scale = decimal;
DB::readDecimalText(result, buffer);
return result;
}

// FIXME it still has bug: https://github.com/pingcap/tidb/issues/11435
Int64 ColumnInfo::getEnumIndex(const String & default_str) const
{
for (const auto & elem : elems)
{
if (elem.first == default_str)
{
return elem.second;
}
}
int num = std::stoi(default_str);
return num;
}

Poco::JSON::Object::Ptr ColumnInfo::getJSONObject() const try
{
Poco::JSON::Object::Ptr json = new Poco::JSON::Object();

Expand Down
8 changes: 6 additions & 2 deletions dbms/src/Storages/Transaction/TiDB.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ using DB::Timestamp;
M(Bit, 16, CompactBytes, UInt64, false) \
M(JSON, 0xf5, Json, String, false) \
M(NewDecimal, 0xf6, Decimal, Decimal, false) \
M(Enum, 0xf7, CompactBytes, Enum16, false) \
M(Enum, 0xf7, VarUInt, Enum16, false) \
M(Set, 0xf8, CompactBytes, String, false) \
M(TinyBlob, 0xf9, CompactBytes, String, false) \
M(MediumBlob, 0xfa, CompactBytes, String, false) \
Expand Down Expand Up @@ -169,8 +169,12 @@ struct ColumnInfo
COLUMN_FLAGS(M)
#undef M

CodecFlag getCodecFlag() const;
DB::Field defaultValueToField() const;
CodecFlag getCodecFlag() const;

private:
DB::Decimal getDecimalDefaultValue(const String & str) const;
Int64 getEnumIndex(const String &) const;
};

enum PartitionType
Expand Down

0 comments on commit 4a6bad8

Please sign in to comment.