Fixed SQLiteSource

src/DataStreams/SQLiteSource.cpp

@@ -33,12 +33,7 @@ SQLiteSource::SQLiteSource(
     , sqlite_db(std::move(sqlite_db_))
 {
     description.init(sample_block);
-}
 
-Chunk SQLiteSource::generate()
-{
-    if (!compiled_statement)
-    {
     sqlite3_stmt * compiled_stmt = nullptr;
     int status = sqlite3_prepare_v2(sqlite_db.get(), query_str.c_str(), query_str.size() + 1, &compiled_stmt, nullptr);
 
@@ -50,6 +45,11 @@ Chunk SQLiteSource::generate()
     compiled_statement = std::unique_ptr<sqlite3_stmt, StatementDeleter>(compiled_stmt, StatementDeleter());
 }
 
+Chunk SQLiteSource::generate()
+{
+    if (!compiled_statement)
+        return {};
+
     MutableColumns columns = description.sample_block.cloneEmptyColumns();
     size_t num_rows = 0;
 
@@ -74,25 +74,25 @@ Chunk SQLiteSource::generate()
         }
 
         int column_count = sqlite3_column_count(compiled_statement.get());
-        for (const auto idx : collections::range(0, column_count))
-        {
-            const auto & sample = description.sample_block.getByPosition(idx);
 
-            if (sqlite3_column_type(compiled_statement.get(), idx) == SQLITE_NULL)
+        for (int column_index = 0; column_index < column_count; ++column_index)
         {
-                insertDefaultSQLiteValue(*columns[idx], *sample.column);
+            if (sqlite3_column_type(compiled_statement.get(), column_index) == SQLITE_NULL)
+            {
+                columns[column_index]->insertDefault();
                 continue;
             }
 
-            if (description.types[idx].second)
+            auto & [type, is_nullable] = description.types[column_index];
+            if (is_nullable)
             {
-                ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                insertValue(column_nullable.getNestedColumn(), description.types[idx].first, idx);
+                ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[column_index]);
+                insertValue(column_nullable.getNestedColumn(), type, column_index);
                 column_nullable.getNullMapData().emplace_back(0);
             }
             else
             {
-                insertValue(*columns[idx], description.types[idx].first, idx);
+                insertValue(*columns[column_index], type, column_index);
             }
         }
 
@@ -100,6 +100,12 @@ Chunk SQLiteSource::generate()
             break;
     }
 
+    if (num_rows == 0)
+    {
+        compiled_statement.reset();
+        return {};
+    }
+
     return Chunk(std::move(columns), num_rows);
 }
 

src/DataStreams/SQLiteSource.h

@@ -13,8 +13,10 @@
 
 namespace DB
 {
+
 class SQLiteSource : public SourceWithProgress
 {
+
 using SQLitePtr = std::shared_ptr<sqlite3>;
 
 public:
@@ -26,10 +28,6 @@ public:
     String getName() const override { return "SQLite"; }
 
 private:
-    static void insertDefaultSQLiteValue(IColumn & column, const IColumn & sample_column)
-    {
-        column.insertFrom(sample_column, 0);
-    }
 
     using ValueType = ExternalResultDescription::ValueType;
 
@@ -46,7 +44,6 @@ private:
     UInt64 max_block_size;
 
     ExternalResultDescription description;
-
     SQLitePtr sqlite_db;
     std::unique_ptr<sqlite3_stmt, StatementDeleter> compiled_statement;
 };

src/Dictionaries/RedisDictionarySource.cpp

@@ -31,7 +31,7 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
 
 #include <IO/WriteHelpers.h>
 
-#include "RedisBlockInputStream.h"
+#include "RedisSource.h"
 
 
 namespace DB

src/Dictionaries/RedisSource.cpp

@@ -1,4 +1,4 @@
-#include "RedisBlockInputStream.h"
+#include "RedisSource.h"
 
 #include <string>
 #include <vector>

src/Dictionaries/ya.make

@@ -26,9 +26,9 @@ SRCS(
     CassandraHelpers.cpp
     CassandraSource.cpp
     ClickHouseDictionarySource.cpp
-    DictionaryBlockInputStream.cpp
-    DictionaryBlockInputStreamBase.cpp
     DictionaryFactory.cpp
+    DictionarySource.cpp
+    DictionarySourceBase.cpp
     DictionarySourceFactory.cpp
     DictionarySourceHelpers.cpp
     DictionaryStructure.cpp
@@ -57,8 +57,8 @@ SRCS(
     PolygonDictionaryImplementations.cpp
     PolygonDictionaryUtils.cpp
     RangeHashedDictionary.cpp
-    RedisBlockInputStream.cpp
     RedisDictionarySource.cpp
+    RedisSource.cpp
     XDBCDictionarySource.cpp
     getDictionaryConfigurationFromAST.cpp
     readInvalidateQuery.cpp