thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 21:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some review fixes

Browse Source
This commit is contained in:
Arslan G 2021-06-01 23:52:12 +03:00
parent fbc5734302
commit bf4171e0ea
5 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DataStreams/SQLiteBlockInputStream.cpp
View File

@ -77,8 +77,10 @@ Block SQLiteBlockInputStream::readImpl()
case SQLITE_NULL:
{
const char * data = reinterpret_cast<const char *>(sqlite3_column_text(compiled_statement.get(), idx));
if (!data) {
(*columns[idx]).insertFrom(*sample.column, 0); break;
if (!data)
{
(*columns[idx]).insertFrom(*sample.column, 0);
break;
}
int len = sqlite3_column_bytes(compiled_statement.get(), idx);
assert_cast<ColumnString &>(*columns[idx]).insertData(data, len);

10
src/Databases/SQLite/DatabaseSQLite.cpp
View File

@ -47,9 +47,9 @@ DatabaseTablesIteratorPtr DatabaseSQLite::getTablesIterator(ContextPtr local_con
std::unordered_set<std::string> DatabaseSQLite::fetchTablesList() const
{
std::unordered_set<String> tables;
std::string query = "SELECT name FROM sqlite_schema \n"
"WHERE type IN ('table','view') AND name NOT LIKE 'sqlite_%'\n"
"ORDER BY 1;";
std::string query = "SELECT name FROM sqlite_master \n"
"WHERE type = 'table' AND \n"
" name NOT LIKE 'sqlite_%'";
auto callback_get_data = [](void * res, int col_num, char ** data_by_col, char ** /* col_names */) -> int {
for (int i = 0; i < col_num; ++i)
@ -131,8 +131,7 @@ StoragePtr DatabaseSQLite::fetchTable(const String & table_name, ContextPtr loca
table_name,
ColumnsDescription{*columns},
ConstraintsDescription{},
local_context,
"");
local_context);
return storage;
}
@ -149,5 +148,4 @@ void DatabaseSQLite::shutdown()
{
}
}

12
src/Databases/SQLite/fetchSQLiteTableStructure.cpp
View File

@ -1,5 +1,6 @@
#include <Databases/SQLite/fetchSQLiteTableStructure.h>
#include <Common/quoteString.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeDate.h>
#include <DataTypes/DataTypeDateTime.h>
@ -36,11 +37,13 @@ std::shared_ptr<NamesAndTypesList> fetchSQLiteTableStructure(sqlite3 * connectio
{
auto columns = NamesAndTypesList();
std::string query = fmt::format("pragma table_info({});", sqlite_table_name);
std::string query = fmt::format("pragma table_info({});", quoteString(sqlite_table_name));
auto callback_get_data = [](void * res, int col_num, char ** data_by_col, char ** col_names) -> int {
NameAndTypePair name_and_type;
bool is_nullable = false;
for (int i = 0; i < col_num; ++i)
{
if (strcmp(col_names[i], "name") == 0)
@ -51,7 +54,14 @@ std::shared_ptr<NamesAndTypesList> fetchSQLiteTableStructure(sqlite3 * connectio
{
name_and_type.type = convertSQLiteDataType(data_by_col[i]);
}
else if (strcmp(col_names[i], "notnull") == 0)
{
is_nullable = (data_by_col[i][0] == '0');
}
}
if (is_nullable)
name_and_type.type = std::make_shared<DataTypeNullable>(name_and_type.type);
static_cast<NamesAndTypesList *>(res)->push_back(name_and_type);

22
src/Storages/StorageSQLite.cpp
View File

@ -26,12 +26,10 @@ StorageSQLite::StorageSQLite(
const String & remote_table_name_,
const ColumnsDescription & columns_,
const ConstraintsDescription & constraints_,
ContextPtr context_,
const String & remote_table_schema_)
ContextPtr context_)
: IStorage(table_id_)
, WithContext(context_->getGlobalContext())
, remote_table_name(remote_table_name_)
, remote_table_schema(remote_table_schema_)
, global_context(context_)
, db_ptr(db_ptr_)
{
@ -51,13 +49,11 @@ Pipe StorageSQLite::read(
{
metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
/// Connection is already made to the needed database, so it should not be present in the query;
/// remote_table_schema is empty if it is not specified, will access only table_name.
String query = transformQueryForExternalDatabase(
query_info,
metadata_snapshot->getColumns().getOrdinary(),
IdentifierQuotingStyle::DoubleQuotes,
remote_table_schema,
"",
remote_table_name,
context_);
@ -79,12 +75,10 @@ public:
const StorageSQLite & storage_,
const StorageMetadataPtr & metadata_snapshot_,
std::shared_ptr<sqlite3> connection_,
const std::string & remote_database_name_,
const std::string & remote_table_name_)
: storage{storage_}
, metadata_snapshot(metadata_snapshot_)
, connection(connection_)
, remote_database_name{remote_database_name_}
, remote_table_name(remote_table_name_)
{
}
@ -98,16 +92,14 @@ public:
{
WriteBufferFromOwnString sqlbuf;
sqlbuf << "INSERT INTO ";
if (!remote_database_name.empty())
sqlbuf << "\"" << remote_database_name << "\".";
sqlbuf << "\"" << remote_table_name << "\"";
sqlbuf << doubleQuoteString(remote_table_name);
sqlbuf << " (";
for (auto it = block.begin(); it != block.end(); ++it)
{
if (it != block.begin())
sqlbuf << ", ";
sqlbuf << "'" << it->name << "'";
sqlbuf << quoteString(it->name);
}
sqlbuf << ") VALUES ";
@ -136,13 +128,12 @@ private:
const StorageSQLite & storage;
StorageMetadataPtr metadata_snapshot;
std::shared_ptr<sqlite3> connection;
std::string remote_database_name;
std::string remote_table_name;
};
BlockOutputStreamPtr StorageSQLite::write(const ASTPtr & /* query */, const StorageMetadataPtr & metadata_snapshot, ContextPtr)
{
return std::make_shared<SQLiteBlockOutputStream>(*this, metadata_snapshot, db_ptr, "", remote_table_name);
return std::make_shared<SQLiteBlockOutputStream>(*this, metadata_snapshot, db_ptr, remote_table_name);
}
void registerStorageSQLite(StorageFactory & factory)
@ -175,8 +166,7 @@ void registerStorageSQLite(StorageFactory & factory)
table_name,
args.columns,
args.constraints,
args.getContext(),
"");
args.getContext());
},
{
.source_access_type = AccessType::SQLITE,

4
src/Storages/StorageSQLite.h
View File

@ -20,8 +20,7 @@ public:
const String & remote_table_name_,
const ColumnsDescription & columns_,
const ConstraintsDescription & constraints_,
ContextPtr context_,
const String & remote_table_schema_);
ContextPtr context_);
std::string getName() const override { return "SQLite"; }
@ -38,7 +37,6 @@ public:
private:
String remote_table_name;
String remote_table_schema;
ContextPtr global_context;
std::shared_ptr<sqlite3> db_ptr;
};