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

withdraw INSERT INFILE feature

Browse Source
This commit is contained in:
chenxing.xc 2018-11-21 11:59:24 +08:00
parent 596e136b73
commit 86f1a18185
9 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitmodules vendored
View File

@ -43,12 +43,12 @@
[submodule "contrib/unixodbc"]
path = contrib/unixodbc
url = https://github.com/ClickHouse-Extras/UnixODBC.git
[submodule "contrib/libhdfs3"]
path = contrib/libhdfs3
url = https://github.com/chenxing-xc/ClickHouse-Extras-libhdfs3.git
[submodule "contrib/protobuf"]
path = contrib/protobuf
url = https://github.com/chenxing-xc/ClickHouse-Extras-protobuf.git
url = https://github.com/ClickHouse-Extras/protobuf.git
[submodule "contrib/libhdfs3"]
path = contrib/libhdfs3
url = https://github.com/ClickHouse-Extras/libhdfs3.git
[submodule "contrib/boost"]
path = contrib/boost
url = https://github.com/chenxing-xc/ClickHouse-Extras-boost.git
url = https://github.com/ClickHouse-Extras/boost-extra.git

5
CMakeLists.txt
View File

@ -77,6 +77,7 @@ endif ()
option (TEST_COVERAGE "Enables flags for test coverage" OFF)
option (ENABLE_TESTS "Enables tests" ON)
option (ENABLE_INSERT_INFILE "Enables INSERT INFILE syntax" OFF)
if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
option (USE_INTERNAL_MEMCPY "Use internal implementation of 'memcpy' function instead of provided by libc. Only for x86_64." ON)
@ -212,6 +213,10 @@ if (ENABLE_TESTS)
enable_testing()
endif ()
if (ENABLE_INSERT_INFILE)
message (STATUS "INSERT INFILE SYNTAX support")
endif ()
# when installing to /usr - place configs to /etc but for /usr/local place to /usr/local/etc
if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
set (CLICKHOUSE_ETC_DIR "/etc")

6
dbms/programs/client/Client.cpp
View File

@ -31,6 +31,7 @@
#include <Common/typeid_cast.h>
#include <Common/Config/ConfigProcessor.h>
#include <Common/config_version.h>
#include <Common/config.h>
#include <Core/Types.h>
#include <Core/QueryProcessingStage.h>
#include <Core/ExternalTable.h>
@ -801,8 +802,11 @@ private:
const ASTInsertQuery * insert = typeid_cast<const ASTInsertQuery *>(&*parsed_query);
connection->forceConnected();
#if ENABLE_INSERT_INFILE
if (insert && !insert->select && !insert->in_file)
#else
if (insert && !insert->select)
#endif
processInsertQuery();
else
processOrdinaryQuery();

1
dbms/src/Common/config.h.in
View File

@ -15,3 +15,4 @@
#cmakedefine01 USE_POCO_MONGODB
#cmakedefine01 USE_POCO_NETSSL
#cmakedefine01 CLICKHOUSE_SPLIT_BINARY
#cmakedefine01 ENABLE_INSERT_INFILE

3
dbms/src/Interpreters/InterpreterInsertQuery.cpp
View File

@ -1,6 +1,7 @@
#include <IO/ConcatReadBuffer.h>
#include <Common/typeid_cast.h>
#include <Common/config.h>
#include <DataStreams/AddingDefaultBlockOutputStream.h>
#include <DataStreams/CountingBlockOutputStream.h>
@ -149,6 +150,7 @@ BlockIO InterpreterInsertQuery::execute()
throw Exception("Cannot insert column " + name_type.name + ", because it is MATERIALIZED column.", ErrorCodes::ILLEGAL_COLUMN);
}
}
#if ENABLE_INSERT_INFILE
else if (query.in_file)
{
// read data stream from in_file, and copy it to out
@ -228,6 +230,7 @@ BlockIO InterpreterInsertQuery::execute()
res.out = nullptr;
}
#endif
return res;
}

5
dbms/src/Parsers/ASTInsertQuery.cpp
View File

@ -1,5 +1,6 @@
#include <iomanip>
#include <Parsers/ASTInsertQuery.h>
#include <Common/config.h>
namespace DB
@ -36,20 +37,24 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
if (!format.empty())
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << " FORMAT " << (settings.hilite ? hilite_none : "") << format;
#if ENABLE_INSERT_INFILE
if (in_file)
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << " INFILE " << (settings.hilite ? hilite_none : "");
in_file->formatImpl(settings, state, frame);
}
#endif
}
else
{
#if ENABLE_INSERT_INFILE
if (in_file)
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << " INFILE " << (settings.hilite ? hilite_none : "");
in_file->formatImpl(settings, state, frame);
}
else
#endif
{
settings.ostr << (settings.hilite ? hilite_keyword : "") << " VALUES" << (settings.hilite ? hilite_none : "");
}

8
dbms/src/Parsers/ASTInsertQuery.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <Parsers/IAST.h>
#include <Common/config.h>
namespace DB
@ -18,7 +19,10 @@ public:
String format;
ASTPtr select;
ASTPtr table_function;
#if ENABLE_INSERT_INFILE
ASTPtr in_file;
#endif
// Set to true if the data should only be inserted into attached views
bool no_destination = false;
@ -41,12 +45,12 @@ public:
{
res->table_function = table_function->clone(); res->children.push_back(res->table_function);
}
#if ENABLE_INSERT_INFILE
if (in_file)
{
res->in_file = in_file->clone(); res->children.push_back(res->in_file);
}
#endif
return res;
}

20
dbms/src/Parsers/ParserInsertQuery.cpp
View File

@ -10,6 +10,7 @@
#include <Parsers/ASTFunction.h>
#include <Common/typeid_cast.h>
#include <Common/config.h>
namespace DB
@ -31,7 +32,6 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
ParserKeyword s_format("FORMAT");
ParserKeyword s_select("SELECT");
ParserKeyword s_with("WITH");
ParserKeyword s_infile("INFILE");
ParserToken s_lparen(TokenType::OpeningRoundBracket);
ParserToken s_rparen(TokenType::ClosingRoundBracket);
ParserIdentifier name_p;
@ -44,7 +44,11 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
ASTPtr format;
ASTPtr select;
ASTPtr table_function;
#if ENABLE_INSERT_INFILE
ParserKeyword s_infile("INFILE");
ASTPtr in_file;
#endif
/// Insertion data
const char * data = nullptr;
@ -95,6 +99,7 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
if (!name_p.parse(pos, format, expected))
return false;
#if ENABLE_INSERT_INFILE
// there are two case after FORMAT xx:
// case 1: data_set.
// case 2: INFILE xx clause.
@ -108,8 +113,8 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
}
else
{
#endif
data = name_pos->end;
if (data < end && *data == ';')
throw Exception("You have excessive ';' symbol before data for INSERT.\n"
"Example:\n\n"
@ -130,7 +135,9 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
if (data < end && *data == '\n')
++data;
#if ENABLE_INSERT_INFILE
}
#endif
}
else if (s_select.ignore(pos, expected) || s_with.ignore(pos,expected))
{
@ -138,12 +145,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
ParserSelectWithUnionQuery select_p;
select_p.parse(pos, select, expected);
}
#if ENABLE_INSERT_INFILE
else if (s_infile.ignore(pos, expected))
{
ParserStringLiteral in_file_p;
if (!in_file_p.parse(pos, in_file, expected))
return false;
}
#endif
else
{
return false;
@ -169,11 +178,13 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
query->columns = columns;
query->select = select;
query->in_file = in_file;
#if ENABLE_INSERT_INFILE
query->in_file = in_file;
if (query->in_file)
query->data = nullptr;
else
#endif
query->data = data != end ? data : nullptr;
query->end = end;
@ -181,9 +192,10 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
query->children.push_back(columns);
if (select)
query->children.push_back(select);
#if ENABLE_INSERT_INFILE
if (in_file)
query->children.push_back(in_file);
#endif
return true;
}

1
dbms/src/Parsers/ParserInsertQuery.h
View File

@ -22,6 +22,7 @@ namespace DB
* INSERT INTO [db.]table (c1, c2, c3) SELECT ...
* INSERT INTO [db.]table SELECT ...
* This syntax is controversial, not open for now.
* #4 Insert of data in an arbitrary form from file(a bit variant of #2)
* INSERT INTO [db.]table (c1, c2, c3) FORMAT format INFILE 'url'
*/