mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-28 02:21:59 +00:00
Small fix
This commit is contained in:
parent
2129230b1e
commit
8e200b68a4
@ -385,7 +385,7 @@ void ClientBase::processTextAsSingleQuery(const String & full_query)
|
|||||||
{
|
{
|
||||||
if (!is_interactive)
|
if (!is_interactive)
|
||||||
{
|
{
|
||||||
e.addMessage("(query: {})", full_query);
|
e.addMessage("(in query: {})", full_query);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#include <Interpreters/executeQuery.h>
|
#include <Interpreters/executeQuery.h>
|
||||||
#include <Storages/IStorage.h>
|
#include <Storages/IStorage.h>
|
||||||
|
|
||||||
|
|
||||||
namespace DB
|
namespace DB
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -362,8 +363,8 @@ Packet LocalConnection::receivePacket()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
throw Exception("Unknown packet " + toString(packet.type)
|
throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER,
|
||||||
+ " from server " + getDescription(), ErrorCodes::UNKNOWN_PACKET_FROM_SERVER);
|
"Unknown packet {} for {}", toString(packet.type), getDescription());
|
||||||
}
|
}
|
||||||
|
|
||||||
next_packet_type.reset();
|
next_packet_type.reset();
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
namespace DB
|
namespace DB
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
/// State of query processing.
|
/// State of query processing.
|
||||||
struct LocalQueryState
|
struct LocalQueryState
|
||||||
{
|
{
|
||||||
@ -124,15 +123,14 @@ private:
|
|||||||
|
|
||||||
ContextMutablePtr query_context;
|
ContextMutablePtr query_context;
|
||||||
Session session;
|
Session session;
|
||||||
bool send_progress;
|
|
||||||
std::optional<ThreadStatus> thread_status;
|
|
||||||
|
|
||||||
/// At the moment, only one ongoing query in the connection is supported at a time.
|
bool send_progress;
|
||||||
|
String description = "clickhouse-local";
|
||||||
|
|
||||||
|
std::optional<ThreadStatus> thread_status;
|
||||||
std::optional<LocalQueryState> state;
|
std::optional<LocalQueryState> state;
|
||||||
|
|
||||||
/// Last "server" packet.
|
/// Last "server" packet.
|
||||||
std::optional<UInt64> next_packet_type;
|
std::optional<UInt64> next_packet_type;
|
||||||
|
|
||||||
String description = "clickhouse-local";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user