From aca3978f2d746e8225dca38255608d4847f1ae1a Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 24 Mar 2024 17:21:53 +0100
Subject: [PATCH] Remove DataStreams (2)

---
 programs/odbc-bridge/CMakeLists.txt                           | 4 ++--
 programs/odbc-bridge/MainHandler.cpp                          | 4 ++--
 .../odbc-bridge/{ODBCBlockOutputStream.cpp => ODBCSink.cpp}   | 2 +-
 programs/odbc-bridge/{ODBCBlockOutputStream.h => ODBCSink.h}  | 0
 .../odbc-bridge/{ODBCBlockInputStream.cpp => ODBCSource.cpp}  | 3 +--
 programs/odbc-bridge/{ODBCBlockInputStream.h => ODBCSource.h} | 0
 6 files changed, 6 insertions(+), 7 deletions(-)
 rename programs/odbc-bridge/{ODBCBlockOutputStream.cpp => ODBCSink.cpp} (97%)
 rename programs/odbc-bridge/{ODBCBlockOutputStream.h => ODBCSink.h} (100%)
 rename programs/odbc-bridge/{ODBCBlockInputStream.cpp => ODBCSource.cpp} (98%)
 rename programs/odbc-bridge/{ODBCBlockInputStream.h => ODBCSource.h} (100%)

diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index 18cda4d7a04..d6cbe8f7215 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -4,8 +4,8 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
     ColumnInfoHandler.cpp
     IdentifierQuoteHandler.cpp
     MainHandler.cpp
-    ODBCBlockInputStream.cpp
-    ODBCBlockOutputStream.cpp
+    ODBCSource.cpp
+    ODBCSink.cpp
     ODBCBridge.cpp
     ODBCHandlerFactory.cpp
     PingHandler.cpp
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index e350afa2b10..2cf1576ccd7 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -1,8 +1,8 @@
 #include "MainHandler.h"
 
 #include "validateODBCConnectionString.h"
-#include "ODBCBlockInputStream.h"
-#include "ODBCBlockOutputStream.h"
+#include "ODBCSource.h"
+#include "ODBCSink.h"
 #include "getIdentifierQuote.h"
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatFactory.h>
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCSink.cpp
similarity index 97%
rename from programs/odbc-bridge/ODBCBlockOutputStream.cpp
rename to programs/odbc-bridge/ODBCSink.cpp
index 37b70023169..ea2e88690ce 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCSink.cpp
@@ -1,4 +1,4 @@
-#include "ODBCBlockOutputStream.h"
+#include "ODBCSink.h"
 
 #include <IO/WriteBufferFromString.h>
 #include <Interpreters/Context.h>
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.h b/programs/odbc-bridge/ODBCSink.h
similarity index 100%
rename from programs/odbc-bridge/ODBCBlockOutputStream.h
rename to programs/odbc-bridge/ODBCSink.h
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCSource.cpp
similarity index 98%
rename from programs/odbc-bridge/ODBCBlockInputStream.cpp
rename to programs/odbc-bridge/ODBCSource.cpp
index 59a5deac960..7f0d47f7e2e 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCSource.cpp
@@ -1,11 +1,10 @@
-#include "ODBCBlockInputStream.h"
+#include "ODBCSource.h"
 #include <vector>
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Common/assert_cast.h>
 #include <IO/ReadHelpers.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.h b/programs/odbc-bridge/ODBCSource.h
similarity index 100%
rename from programs/odbc-bridge/ODBCBlockInputStream.h
rename to programs/odbc-bridge/ODBCSource.h