From a29ee137028150afc5288a42268cc7b7b42dce16 Mon Sep 17 00:00:00 2001 From: Vitaliy Lyudvichenko Date: Tue, 4 Oct 2016 19:36:07 +0300 Subject: [PATCH 1/2] Fixed compilation error after inaccurate renaming of force_quoting parametr. [#METR-22950] --- .../DataStreams/JSONEachRowRowOutputStream.cpp | 6 +++--- dbms/src/DataStreams/JSONRowOutputStream.cpp | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp b/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp index abf8519a9b1..27dc9bf6fd4 100644 --- a/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp +++ b/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp @@ -7,8 +7,8 @@ namespace DB { -JSONEachRowRowOutputStream::JSONEachRowRowOutputStream(WriteBuffer & ostr_, const Block & sample, bool force_quoting_) - : ostr(ostr_), force_quoting(force_quoting_) +JSONEachRowRowOutputStream::JSONEachRowRowOutputStream(WriteBuffer & ostr_, const Block & sample, bool force_quoting_64bit_integers_) + : ostr(ostr_), force_quoting_64bit_integers(force_quoting_64bit_integers_) { size_t columns = sample.columns(); fields.resize(columns); @@ -25,7 +25,7 @@ void JSONEachRowRowOutputStream::writeField(const IColumn & column, const IDataT { writeString(fields[field_number], ostr); writeChar(':', ostr); - type.serializeTextJSON(column, row_num, ostr, force_quoting); + type.serializeTextJSON(column, row_num, ostr, force_quoting_64bit_integers); ++field_number; } diff --git a/dbms/src/DataStreams/JSONRowOutputStream.cpp b/dbms/src/DataStreams/JSONRowOutputStream.cpp index c804bd03160..90e92f4ac3d 100644 --- a/dbms/src/DataStreams/JSONRowOutputStream.cpp +++ b/dbms/src/DataStreams/JSONRowOutputStream.cpp @@ -7,8 +7,8 @@ namespace DB { -JSONRowOutputStream::JSONRowOutputStream(WriteBuffer & ostr_, const Block & sample_, bool write_statistics_, bool force_quoting_) - : dst_ostr(ostr_), write_statistics(write_statistics_), force_quoting(force_quoting_) +JSONRowOutputStream::JSONRowOutputStream(WriteBuffer & ostr_, const Block & sample_, bool write_statistics_, bool force_quoting_64bit_integers_) + : dst_ostr(ostr_), write_statistics(write_statistics_), force_quoting_64bit_integers(force_quoting_64bit_integers_) { NamesAndTypesList columns(sample_.getColumnsList()); fields.assign(columns.begin(), columns.end()); @@ -72,7 +72,7 @@ void JSONRowOutputStream::writeField(const IColumn & column, const IDataType & t writeCString("\t\t\t", *ostr); writeString(fields[field_number].name, *ostr); writeCString(": ", *ostr); - type.serializeTextJSON(column, row_num, *ostr, force_quoting); + type.serializeTextJSON(column, row_num, *ostr, force_quoting_64bit_integers); ++field_number; } @@ -152,7 +152,7 @@ void JSONRowOutputStream::writeTotals() writeCString("\t\t", *ostr); writeJSONString(column.name, *ostr); writeCString(": ", *ostr); - column.type->serializeTextJSON(*column.column.get(), 0, *ostr, force_quoting); + column.type->serializeTextJSON(*column.column.get(), 0, *ostr, force_quoting_64bit_integers); } writeChar('\n', *ostr); @@ -161,7 +161,7 @@ void JSONRowOutputStream::writeTotals() } -static void writeExtremesElement(const char * title, const Block & extremes, size_t row_num, WriteBuffer & ostr, bool force_quoting) +static void writeExtremesElement(const char * title, const Block & extremes, size_t row_num, WriteBuffer & ostr, bool force_quoting_64bit_integers) { writeCString("\t\t\"", ostr); writeCString(title, ostr); @@ -179,7 +179,7 @@ static void writeExtremesElement(const char * title, const Block & extremes, siz writeCString("\t\t\t", ostr); writeJSONString(column.name, ostr); writeCString(": ", ostr); - column.type->serializeTextJSON(*column.column.get(), row_num, ostr, force_quoting); + column.type->serializeTextJSON(*column.column.get(), row_num, ostr, force_quoting_64bit_integers); } writeChar('\n', ostr); @@ -195,9 +195,9 @@ void JSONRowOutputStream::writeExtremes() writeCString("\t\"extremes\":\n", *ostr); writeCString("\t{\n", *ostr); - writeExtremesElement("min", extremes, 0, *ostr, force_quoting); + writeExtremesElement("min", extremes, 0, *ostr, force_quoting_64bit_integers); writeCString(",\n", *ostr); - writeExtremesElement("max", extremes, 1, *ostr, force_quoting); + writeExtremesElement("max", extremes, 1, *ostr, force_quoting_64bit_integers); writeChar('\n', *ostr); writeCString("\t}", *ostr); From d09297a840002848616595d40c103fe8f19a6644 Mon Sep 17 00:00:00 2001 From: Vladimir Chebotarev Date: Fri, 7 Oct 2016 17:56:52 +0300 Subject: [PATCH 2/2] cmake: Minor fix. [#METR-21516] --- dbms/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt index d40deba0f56..12b54078fde 100644 --- a/dbms/CMakeLists.txt +++ b/dbms/CMakeLists.txt @@ -9,7 +9,7 @@ if ($ENV{DISABLE_MONGODB}) set (DISABLE_MONGODB TRUE) endif() -if (${DISABLE_MONGODB}) +if (DISABLE_MONGODB) add_definitions(-D DISABLE_MONGODB) else() set (LINK_MONGOCLIENT libmongoclient.a libssl.a libcrypto.a libboost_thread.a)