return TiFlash system table by grpc rather than http (#7196)

close #6941
pingcap · Apr 10, 2023 · cf4802c · cf4802c
1 parent 0dd78ba
commit cf4802c
Show file tree

Hide file tree

Showing 40 changed files with 131 additions and 2,521 deletions.
diff --git a/contrib/kvproto b/contrib/kvproto
diff --git a/dbms/src/Client/Connection.h b/dbms/src/Client/Connection.h
@@ -125,7 +125,8 @@ class Connection : private boost::noncopyable
         setDescription();
     }
 
-    virtual ~Connection(){};
+    virtual ~Connection() = default;
+    ;
 
     /// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
     void setThrottler(const ThrottlerPtr & throttler_)
@@ -268,7 +269,7 @@ class Connection : private boost::noncopyable
     class LoggerWrapper
     {
     public:
-        LoggerWrapper(Connection & parent_)
+        explicit LoggerWrapper(Connection & parent_)
             : log(nullptr)
             , parent(parent_)
         {

diff --git a/dbms/src/Common/ExternalTable.h b/dbms/src/Common/ExternalTable.h
@@ -15,7 +15,6 @@
 #pragma once
 
 #include <Client/Connection.h>
-#include <Common/HTMLForm.h>
 #include <DataStreams/AsynchronousBlockInputStream.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ReadBufferFromFile.h>
@@ -195,7 +194,7 @@ class ExternalTablesHandler : public Poco::Net::PartHandler
         , params(params_)
     {}
 
-    void handlePart(const Poco::Net::MessageHeader & header, std::istream & stream)
+    void handlePart(const Poco::Net::MessageHeader & header, std::istream & stream) override
     {
         /// The buffer is initialized here, not in the virtual function initReadBuffer
         read_buffer = std::make_unique<ReadBufferFromIStream>(stream);

diff --git a/dbms/src/Common/HTMLForm.h b/dbms/src/Common/HTMLForm.h
diff --git a/dbms/src/Core/Defines.h b/dbms/src/Core/Defines.h
@@ -17,14 +17,13 @@
 #include <common/defines.h>
 #include <common/types.h>
 
-#define DBMS_NAME "ClickHouse"
+#define DBMS_NAME "TiFlash"
 #define DBMS_VERSION_MAJOR 1
 #define DBMS_VERSION_MINOR 1
 
 #define DBMS_DEFAULT_HOST "localhost"
 #define DBMS_DEFAULT_PORT 9000
 #define DBMS_DEFAULT_SECURE_PORT 9440
-#define DBMS_DEFAULT_HTTP_PORT 8123
 #define DBMS_DEFAULT_CONNECT_TIMEOUT_SEC 10
 #define DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS 50
 #define DBMS_DEFAULT_SEND_TIMEOUT_SEC 300
@@ -104,17 +103,12 @@ static constexpr UInt64 DEFAULT_DISAGG_TASK_TIMEOUT_SEC = 5 * 60;
 
 #define DEFAULT_QUERY_LOG_FLUSH_INTERVAL_MILLISECONDS 7500
 
-#define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
-#define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1
-
 #define PLATFORM_NOT_SUPPORTED "The only supported platforms are x86_64 and AArch64 (work in progress)"
 
 #define DEFAULT_MARK_CACHE_SIZE (1ULL * 1024 * 1024 * 1024)
 
 #define DEFAULT_METRICS_PORT 8234
 
-#define DEFAULT_HTTP_PORT 8123
-
 #if !defined(__x86_64__) && !defined(__aarch64__)
 //    #error PLATFORM_NOT_SUPPORTED
 #endif
diff --git a/dbms/src/Dictionaries/DictionarySourceFactory.cpp b/dbms/src/Dictionaries/DictionarySourceFactory.cpp
@@ -23,7 +23,6 @@
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/ExecutableDictionarySource.h>
 #include <Dictionaries/FileDictionarySource.h>
-#include <Dictionaries/HTTPDictionarySource.h>
 #include <Dictionaries/LibraryDictionarySource.h>
 #include <IO/HTTPCommon.h>
 #include <Poco/Logger.h>
@@ -143,15 +142,6 @@ DictionarySourcePtr DictionarySourceFactory::create(
 
         return std::make_unique<ExecutableDictionarySource>(dict_struct, config, config_prefix + ".executable", sample_block, context);
     }
-    else if ("http" == source_type)
-    {
-        if (dict_struct.has_expressions)
-            throw Exception{
-                "Dictionary source of type `http` does not support attribute expressions",
-                ErrorCodes::LOGICAL_ERROR};
-
-        return std::make_unique<HTTPDictionarySource>(dict_struct, config, config_prefix + ".http", sample_block, context);
-    }
     else if ("library" == source_type)
     {
         return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context);

diff --git a/dbms/src/Dictionaries/HTTPDictionarySource.cpp b/dbms/src/Dictionaries/HTTPDictionarySource.cpp
+7 −0		Dockerfile
+3 −3		go.mod
+6 −6		go.sum
+1,128 −249		pkg/brpb/brpb.pb.go
+814 −411		pkg/kvrpcpb/kvrpcpb.pb.go
+195 −155		pkg/tikvpb/tikvpb.pb.go
+19 −0		proto/brpb.proto
+12 −0		proto/kvrpcpb.proto
+3 −0		proto/tikvpb.proto
+5 −0		scripts/check.sh
+103 −0		scripts/proto.lock