try fix synchronization check

This commit is contained in:
Alexander Tokmakov 2020-08-06 15:30:51 +03:00
parent a3bc18bed2
commit 789a6022c5
8 changed files with 28 additions and 3 deletions

View File

@ -17,7 +17,9 @@ SRCS(
ExternalTable.cpp ExternalTable.cpp
Field.cpp Field.cpp
iostream_debug_helpers.cpp iostream_debug_helpers.cpp
MySQLClient.cpp
MySQLProtocol.cpp MySQLProtocol.cpp
MySQLReplication.cpp
NamesAndTypes.cpp NamesAndTypes.cpp
PostgreSQLProtocol.cpp PostgreSQLProtocol.cpp
Settings.cpp Settings.cpp

View File

@ -11,6 +11,7 @@ NO_COMPILER_WARNINGS()
SRCS( SRCS(
AddingDefaultBlockOutputStream.cpp AddingDefaultBlockOutputStream.cpp
AddingDefaultsBlockInputStream.cpp AddingDefaultsBlockInputStream.cpp
AddingVersionsBlockOutputStream.cpp
AsynchronousBlockInputStream.cpp AsynchronousBlockInputStream.cpp
BlockIO.cpp BlockIO.cpp
BlockStreamProfileInfo.cpp BlockStreamProfileInfo.cpp

View File

@ -1,6 +1,8 @@
#pragma once #pragma once
#include "config_core.h" #if !defined(ARCADIA_BUILD)
# include "config_core.h"
#endif
#if USE_MYSQL #if USE_MYSQL

View File

@ -11,11 +11,15 @@ SRCS(
DatabaseFactory.cpp DatabaseFactory.cpp
DatabaseLazy.cpp DatabaseLazy.cpp
DatabaseMemory.cpp DatabaseMemory.cpp
DatabaseMySQL.cpp
DatabaseOnDisk.cpp DatabaseOnDisk.cpp
DatabaseOrdinary.cpp DatabaseOrdinary.cpp
DatabasesCommon.cpp DatabasesCommon.cpp
DatabaseWithDictionaries.cpp DatabaseWithDictionaries.cpp
MySQL/DatabaseConnectionMySQL.cpp
MySQL/DatabaseMaterializeMySQL.cpp
MySQL/MaterializeMetadata.cpp
MySQL/MaterializeMySQLSettings.cpp
MySQL/MaterializeMySQLSyncThread.cpp
) )

View File

@ -22,7 +22,6 @@ static inline ASTPtr tryRewrittenCreateQuery(const String & query, const Context
ASTPtr ast = parseQuery(external_ddl_parser, query, 0, 0); ASTPtr ast = parseQuery(external_ddl_parser, query, 0, 0);
Context context = context_; Context context = context_;
context.unsafeSetCurrentDatabase("default");
return MySQLInterpreter::InterpreterCreateImpl::getRewrittenQuery( return MySQLInterpreter::InterpreterCreateImpl::getRewrittenQuery(
*ast->as<ASTExternalDDLQuery>()->external_ddl->as<MySQLParser::ASTCreateQuery>(), *ast->as<ASTExternalDDLQuery>()->external_ddl->as<MySQLParser::ASTCreateQuery>(),
context, "test_database", "test_database"); context, "test_database", "test_database");

View File

@ -78,6 +78,7 @@ SRCS(
InterpreterDropQuery.cpp InterpreterDropQuery.cpp
InterpreterExistsQuery.cpp InterpreterExistsQuery.cpp
InterpreterExplainQuery.cpp InterpreterExplainQuery.cpp
InterpreterExternalDDLQuery.cpp
InterpreterFactory.cpp InterpreterFactory.cpp
InterpreterGrantQuery.cpp InterpreterGrantQuery.cpp
InterpreterInsertQuery.cpp InterpreterInsertQuery.cpp
@ -110,6 +111,7 @@ SRCS(
MergeJoin.cpp MergeJoin.cpp
MetricLog.cpp MetricLog.cpp
MutationsInterpreter.cpp MutationsInterpreter.cpp
MySQL/InterpretersMySQLDDLQuery.cpp
NullableUtils.cpp NullableUtils.cpp
OptimizeIfChains.cpp OptimizeIfChains.cpp
OptimizeIfWithConstantConditionVisitor.cpp OptimizeIfWithConstantConditionVisitor.cpp

View File

@ -66,6 +66,19 @@ SRCS(
IParserBase.cpp IParserBase.cpp
Lexer.cpp Lexer.cpp
makeASTForLogicalFunction.cpp makeASTForLogicalFunction.cpp
MySQL/ASTAlterCommand.cpp
MySQL/ASTAlterQuery.cpp
MySQL/ASTCreateDefines.cpp
MySQL/ASTCreateQuery.cpp
MySQL/ASTDeclareColumn.cpp
MySQL/ASTDeclareConstraint.cpp
MySQL/ASTDeclareIndex.cpp
MySQL/ASTDeclareOption.cpp
MySQL/ASTDeclarePartition.cpp
MySQL/ASTDeclarePartitionOptions.cpp
MySQL/ASTDeclareReference.cpp
MySQL/ASTDeclareSubPartition.cpp
MySQL/ASTDeclareTableOptions.cpp
parseDatabaseAndTableName.cpp parseDatabaseAndTableName.cpp
parseIdentifierOrStringLiteral.cpp parseIdentifierOrStringLiteral.cpp
parseIntervalKind.cpp parseIntervalKind.cpp
@ -86,6 +99,7 @@ SRCS(
ParserDropAccessEntityQuery.cpp ParserDropAccessEntityQuery.cpp
ParserDropQuery.cpp ParserDropQuery.cpp
ParserExplainQuery.cpp ParserExplainQuery.cpp
ParserExternalDDLQuery.cpp
ParserGrantQuery.cpp ParserGrantQuery.cpp
ParserInsertQuery.cpp ParserInsertQuery.cpp
ParserKillQueryQuery.cpp ParserKillQueryQuery.cpp

View File

@ -115,6 +115,7 @@ SRCS(
StorageLog.cpp StorageLog.cpp
StorageLogSettings.cpp StorageLogSettings.cpp
StorageMaterializedView.cpp StorageMaterializedView.cpp
StorageMaterializeMySQL.cpp
StorageMemory.cpp StorageMemory.cpp
StorageMerge.cpp StorageMerge.cpp
StorageMergeTree.cpp StorageMergeTree.cpp