fix build

src/DataTypes/DataTypeDateTime.cpp

@@ -15,29 +15,6 @@
 
 namespace DB
 {
-<<<<<<< HEAD
-=======
-
-namespace
-{
-
-inline void readTextHelper(
-    time_t & x, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
-{
-    switch (settings.date_time_input_format)
-    {
-        case FormatSettings::DateTimeInputFormat::Basic:
-            readDateTimeText(x, istr, time_zone);
-            return;
-        case FormatSettings::DateTimeInputFormat::BestEffort:
-            parseDateTimeBestEffort(x, istr, time_zone, utc_time_zone);
-            return;
-    }
-}
-
-}
-
->>>>>>> upstream/master
 
 TimezoneMixin::TimezoneMixin(const String & time_zone_name)
     : has_explicit_time_zone(!time_zone_name.empty()),
@@ -66,127 +43,6 @@ String DataTypeDateTime::doGetName() const
     return out.str();
 }
 
-<<<<<<< HEAD
-=======
-void DataTypeDateTime::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    auto value = assert_cast<const ColumnType &>(column).getData()[row_num];
-    switch (settings.date_time_output_format)
-    {
-        case FormatSettings::DateTimeOutputFormat::Simple:
-            writeDateTimeText(value, ostr, time_zone);
-            return;
-        case FormatSettings::DateTimeOutputFormat::UnixTimestamp:
-            writeIntText(value, ostr);
-            return;
-        case FormatSettings::DateTimeOutputFormat::ISO:
-            writeDateTimeTextISO(value, ostr, utc_time_zone);
-            return;
-    }
-}
-
-void DataTypeDateTime::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
-
-void DataTypeDateTime::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    deserializeTextEscaped(column, istr, settings);
-}
-
-void DataTypeDateTime::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x = 0;
-    readTextHelper(x, istr, settings, time_zone, utc_time_zone);
-    if (x < 0)
-        x = 0;
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('\'', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('\'', ostr);
-}
-
-void DataTypeDateTime::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x = 0;
-
-    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
-    {
-        readTextHelper(x, istr, settings, time_zone, utc_time_zone);
-        assertChar('\'', istr);
-    }
-    else /// Just 1504193808 or 01504193808
-    {
-        readIntText(x, istr);
-    }
-    if (x < 0)
-        x = 0;
-    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-}
-
-void DataTypeDateTime::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x = 0;
-
-    if (checkChar('"', istr))
-    {
-        readTextHelper(x, istr, settings, time_zone, utc_time_zone);
-        assertChar('"', istr);
-    }
-    else
-    {
-        readIntText(x, istr);
-    }
-
-    if (x < 0)
-        x = 0;
-
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
-void DataTypeDateTime::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    writeChar('"', ostr);
-    serializeText(column, row_num, ostr, settings);
-    writeChar('"', ostr);
-}
-
-void DataTypeDateTime::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
-{
-    time_t x = 0;
-
-    if (istr.eof())
-        throwReadAfterEOF();
-
-    char maybe_quote = *istr.position();
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        ++istr.position();
-
-    readTextHelper(x, istr, settings, time_zone, utc_time_zone);
-
-    if (maybe_quote == '\'' || maybe_quote == '\"')
-        assertChar(maybe_quote, istr);
-
-    if (x < 0)
-        x = 0;
-
-    assert_cast<ColumnType &>(column).getData().push_back(x);
-}
-
->>>>>>> upstream/master
 bool DataTypeDateTime::equals(const IDataType & rhs) const
 {
     /// DateTime with different timezones are equal, because: