mirror of
https://github.com/hanzo-ds/cpp.git
synced 2026-10-30 20:31:26 +00:00
zeekay
286f257aae
Pure rename applied on top of upstream tag v2.6.2 (8d2415d6), not HEAD.
The fork was cut at 737145d = v2.6.2-57, which still declared version 2.6.2
in version.h; renaming there would have shipped 57 unreleased commits wearing
a 2.6.2 label. Reset to the tag first so this commit changes names only.
clickhouse/ -> datastore/ (public include root)
namespace clickhouse -> namespace datastore
CLICKHOUSE_CPP_VERSION -> DATASTORE_CPP_VERSION
clickhouse-cpp-lib/-ut -> datastore-cpp-lib/-ut (CMake, Bazel)
CH_MAP_BOOL_TO_UINT8 -> DS_MAP_BOOL_TO_UINT8
CLICKHOUSE_* -> DATASTORE_* (test env vars)
doc links -> docs.hanzo.ai/datastore
This client speaks the NATIVE binary protocol only - there is no HTTP path
and no X-ClickHouse-* header anywhere in it, so the header rename that the
HTTP clients required does not apply and nothing here was broken.
The one string that reaches the wire is CLIENT_NAME, sent by both SendHello
and SendQuery's ClientInfo from a single macro, and it lands in
system.query_log.client_name. Both sites still read the one macro, so they
stay consistent and the server's Hello/Query consistency check is satisfied.
Old rows keep the old name; that is a reporting discontinuity, not a
migration, since nothing keys on it.
CI is repointed at our own server: ghcr.io/hanzoai/datastore:26.2.3.2, the
image production runs. Its entrypoint honours DATASTORE_SKIP_USER_SETUP, not
the CLICKHOUSE_ spelling the compose file used, and its config lives in
/etc/hanzo-datastore-server. ci/docker-compose/config.xml is now layered in
as a config.d drop-in so the image keeps its own white-labelling. That file
and users.xml deliberately keep a <clickhouse> root: it must match the roots
of the drop-ins the image ships, and a mismatch fails silently - the server
logs "Merging bypassed" and starts with every drop-in discarded.
The remote-TLS suites used to default to the third-party host
play.clickhouse.com. They now read DATASTORE_SECURE*_HOST and skip when it is
unset rather than point at a host we do not run.
Dropped as upstream infrastructure with no meaning here: AI_POLICY.md
(upstream's policy about their codebase), .travis.yml (dead CI referencing a
third-party apt repo), cross-repo-bug-relay.yml (relays our issues into an
upstream triage repo). LICENSE keeps its copyright notice, as Apache-2.0
requires.
Verified: cmake configure + 115-target build clean; the full suite is green
against ghcr.io/hanzoai/datastore:26.2.3.2 (894 passed, 0 failed); the
pristine v2.6.2 build run against that same server passes the identical set,
and both logged the same 3914 queries under their respective client names.
79 lines
2.0 KiB
C++
79 lines
2.0 KiB
C++
#include "tcp_server.h"
|
|
|
|
#include <iostream>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
|
|
# include <winsock2.h>
|
|
#else
|
|
# include <netinet/in.h>
|
|
# include <sys/socket.h>
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#include <thread>
|
|
|
|
namespace datastore {
|
|
|
|
LocalTcpServer::LocalTcpServer(int port)
|
|
: port_(port)
|
|
, serverSd_(-1)
|
|
{}
|
|
|
|
LocalTcpServer::~LocalTcpServer() {
|
|
stop();
|
|
}
|
|
|
|
void LocalTcpServer::start() {
|
|
//setup a socket
|
|
sockaddr_in servAddr;
|
|
memset((char*)&servAddr, 0, sizeof(servAddr));
|
|
servAddr.sin_family = AF_INET;
|
|
servAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
|
servAddr.sin_port = htons(port_);
|
|
serverSd_ = socket(AF_INET, SOCK_STREAM, 0);
|
|
if (serverSd_ < 0) {
|
|
std::cerr << "Error establishing server socket" << std::endl;
|
|
throw std::runtime_error("Error establishing server socket");
|
|
}
|
|
int enable = 1;
|
|
|
|
#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
|
|
auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, (const char*)&enable, sizeof(enable));
|
|
#else
|
|
auto res = setsockopt(serverSd_, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
|
|
#endif
|
|
|
|
if (res < 0) {
|
|
std::cerr << "setsockopt(SO_REUSEADDR) failed" << std::endl;
|
|
}
|
|
//bind the socket to its local address
|
|
int bindStatus = bind(serverSd_, (struct sockaddr*) &servAddr, sizeof(servAddr));
|
|
if (bindStatus < 0) {
|
|
auto err = errno;
|
|
const char * error = strerror(err);
|
|
|
|
std::cerr << "Error binding socket to local address: " << error << std::endl;
|
|
throw std::runtime_error("Error binding socket to local address: " + std::string(error ? error : ""));
|
|
}
|
|
listen(serverSd_, 3);
|
|
}
|
|
|
|
void LocalTcpServer::stop() {
|
|
if(serverSd_ > 0) {
|
|
|
|
#if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
|
|
shutdown(serverSd_, SD_BOTH);
|
|
closesocket(serverSd_);
|
|
#else
|
|
shutdown(serverSd_, SHUT_RDWR);
|
|
close(serverSd_);
|
|
#endif
|
|
serverSd_ = -1;
|
|
}
|
|
}
|
|
|
|
}
|