Skip to content

Commit e536c0e

Browse files
committed
api!: Renamed namespace to questdb::ilp and include to questdb/ilp/..
1 parent 9154fd9 commit e536c0e

File tree

10 files changed

+57
-57
lines changed

10 files changed

+57
-57
lines changed

DEPENDENCY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ In all examples below, we will attempt to compile:
3838

3939
```cpp
4040
// main.cpp
41-
#include <questdb/line_sender.hpp>
41+
#include <questdb/ilp/line_sender.hpp>
4242

4343
int main()
4444
{
45-
questdb::line_sender sender{"localhost", 9009};
45+
questdb::ilp::line_sender sender{"localhost", 9009};
4646
return 0;
4747
}
4848
```

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Once you know you can build the library, you can learn how to
130130
### From a C program
131131

132132
```c
133-
#include <questdb/line_sender.h>
133+
#include <questdb/ilp/line_sender.h>
134134

135135
...
136136

@@ -147,12 +147,12 @@ See a [complete example in C](examples/line_sender_c_example.c).
147147
### From a C++ program
148148

149149
```cpp
150-
#include <questdb/line_sender.hpp>
150+
#include <questdb/ilp/line_sender.hpp>
151151

152152
...
153153

154154
// Automatically connects on object construction.
155-
questdb::line_sender sender{
155+
questdb::ilp::line_sender sender{
156156
"127.0.0.1", // QuestDB hostname
157157
"9009"}; // QuestDB port
158158

@@ -225,7 +225,7 @@ also be called automatically on object destruction.
225225
For simplicity the the diagram above does not show that the `.close()` method
226226
and the `~line_sender` destructor.
227227

228-
Note that most methods in C++ may throw `questdb::line_sender_error`
228+
Note that most methods in C++ may throw `questdb::ilp::line_sender_error`
229229
exceptions. The C++ `line_sender_error` type inherits from `std::runtime_error`
230230
and you can obtain an error message description by calling `.what()`.
231231

examples/line_sender_c_example.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <questdb/line_sender.h>
1+
#include <questdb/ilp/line_sender.h>
22
#include <stdio.h>
33
#include <stdbool.h>
44
#include <string.h>

examples/line_sender_cpp_example.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#include <questdb/line_sender.hpp>
1+
#include <questdb/ilp/line_sender.hpp>
22
#include <iostream>
33

44
using namespace std::literals::string_view_literals;
5-
using namespace questdb::literals;
5+
using namespace questdb::ilp::literals;
66

77
static bool example(std::string_view host, std::string_view port)
88
{
99
try
1010
{
11-
questdb::line_sender sender{host, port};
11+
questdb::ilp::line_sender sender{host, port};
1212

1313
// We prepare all our table names and colum names in advance.
1414
// If we're inserting multiple rows, this allows us to avoid
@@ -37,7 +37,7 @@ static bool example(std::string_view host, std::string_view port)
3737

3838
return true;
3939
}
40-
catch (const questdb::line_sender_error& err)
40+
catch (const questdb::ilp::line_sender_error& err)
4141
{
4242
std::cerr
4343
<< "Error running example: "
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <stdexcept>
3232
#include <cstdint>
3333

34-
namespace questdb
34+
namespace questdb::ilp
3535
{
3636
constexpr const char* inaddr_any = "0.0.0.0";
3737

src/line_sender.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define _POSIX_C_SOURCE 200809L
2727
#endif
2828

29-
#include <questdb/line_sender.h>
29+
#include <questdb/ilp/line_sender.h>
3030

3131
#include "build_env.h"
3232
#include "mem_writer.h"

test/mock_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static void release_winsock()
8989
}
9090
#endif
9191

92-
namespace questdb::test
92+
namespace questdb::ilp::test
9393
{
9494

9595
mock_server::mock_server()

test/mock_server.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ typedef int socketfd_t;
3939
typedef SOCKET socketfd_t;
4040
#endif
4141

42-
namespace questdb::test
42+
namespace questdb::ilp::test
4343
{
4444

4545
/**

test/test_line_sender.cpp

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
#include "mock_server.hpp"
2929

30-
#include <questdb/line_sender.h>
31-
#include <questdb/line_sender.hpp>
30+
#include <questdb/ilp/line_sender.h>
31+
#include <questdb/ilp/line_sender.hpp>
3232
#include "../src/utf8.h"
3333

3434
#include <vector>
@@ -40,7 +40,7 @@ extern "C"
4040
}
4141

4242
using namespace std::string_literals;
43-
using namespace questdb::literals;
43+
using namespace questdb::ilp::literals;
4444

4545
TEST_CASE("next_pow2")
4646
{
@@ -122,7 +122,7 @@ template <typename F>
122122

123123
TEST_CASE("line_sender c api basics")
124124
{
125-
questdb::test::mock_server server;
125+
questdb::ilp::test::mock_server server;
126126
::line_sender_error* err = nullptr;
127127
on_scope_exit error_free_guard{[&]{
128128
if (err)
@@ -163,8 +163,8 @@ TEST_CASE("line_sender c api basics")
163163

164164
TEST_CASE("line_sender c++ connect disconnect")
165165
{
166-
questdb::test::mock_server server;
167-
questdb::line_sender sender{
166+
questdb::ilp::test::mock_server server;
167+
questdb::ilp::line_sender sender{
168168
"localhost",
169169
std::to_string(server.port()).c_str()};
170170
CHECK_FALSE(sender.must_close());
@@ -174,8 +174,8 @@ TEST_CASE("line_sender c++ connect disconnect")
174174

175175
TEST_CASE("line_sender c++ api basics")
176176
{
177-
questdb::test::mock_server server;
178-
questdb::line_sender sender{
177+
questdb::ilp::test::mock_server server;
178+
questdb::ilp::line_sender sender{
179179
"localhost",
180180
std::to_string(server.port()).c_str()};
181181
CHECK_FALSE(sender.must_close());
@@ -197,8 +197,8 @@ TEST_CASE("line_sender c++ api basics")
197197

198198
TEST_CASE("test multiple lines")
199199
{
200-
questdb::test::mock_server server;
201-
questdb::line_sender sender{
200+
questdb::ilp::test::mock_server server;
201+
questdb::ilp::line_sender sender{
202202
"localhost",
203203
std::to_string(server.port()).c_str()};
204204
CHECK_FALSE(sender.must_close());
@@ -238,8 +238,8 @@ TEST_CASE("test multiple lines")
238238

239239
TEST_CASE("State machine testing -- flush without data.")
240240
{
241-
questdb::test::mock_server server;
242-
questdb::line_sender sender{
241+
questdb::ilp::test::mock_server server;
242+
questdb::ilp::line_sender sender{
243243
"localhost",
244244
std::to_string(server.port()).c_str()};
245245

@@ -249,15 +249,15 @@ TEST_CASE("State machine testing -- flush without data.")
249249
"State error: Bad call to `flush`, "
250250
"should have called `table` instead. "
251251
"Must now call `close`.",
252-
questdb::line_sender_error);
252+
questdb::ilp::line_sender_error);
253253
CHECK(sender.must_close());
254254
sender.close();
255255
}
256256

257257
TEST_CASE("One symbol only - flush before server accept")
258258
{
259-
questdb::test::mock_server server;
260-
questdb::line_sender sender{
259+
questdb::ilp::test::mock_server server;
260+
questdb::ilp::line_sender sender{
261261
"localhost",
262262
std::to_string(server.port()).c_str()};
263263

@@ -277,8 +277,8 @@ TEST_CASE("One symbol only - flush before server accept")
277277

278278
TEST_CASE("One column only - server.accept() after flush, before close")
279279
{
280-
questdb::test::mock_server server;
281-
questdb::line_sender sender{
280+
questdb::ilp::test::mock_server server;
281+
questdb::ilp::line_sender sender{
282282
"localhost",
283283
server.port()};
284284

@@ -297,16 +297,16 @@ TEST_CASE("One column only - server.accept() after flush, before close")
297297

298298
TEST_CASE("Symbol after column")
299299
{
300-
questdb::test::mock_server server;
301-
questdb::line_sender sender{
300+
questdb::ilp::test::mock_server server;
301+
questdb::ilp::line_sender sender{
302302
"localhost",
303303
server.port()};
304304

305305
sender.table("test"_name).column("t1"_name, "v1"_utf8);
306306

307307
CHECK_THROWS_AS(
308308
sender.symbol("t2"_name, "v2"_utf8),
309-
questdb::line_sender_error);
309+
questdb::ilp::line_sender_error);
310310

311311
CHECK(sender.must_close());
312312

@@ -315,7 +315,7 @@ TEST_CASE("Symbol after column")
315315
"State error: Bad call to `flush`, "
316316
"unrecoverable state due to previous error. "
317317
"Must now call `close`.",
318-
questdb::line_sender_error);
318+
questdb::ilp::line_sender_error);
319319

320320
// Check idempotency of close.
321321
sender.close();
@@ -330,7 +330,7 @@ TEST_CASE("Bad UTF-8")
330330
"\xff\xff"_utf8,
331331
"Bad string \"\\xff\\xff\": "
332332
"Invalid UTF-8. Illegal codepoint starting at byte index 0.",
333-
questdb::line_sender_error);
333+
questdb::ilp::line_sender_error);
334334
}
335335

336336
TEST_CASE("Validation of bad chars in key names.")
@@ -341,7 +341,7 @@ TEST_CASE("Validation of bad chars in key names.")
341341
"Bad string \"a*b\": table, symbol and column names "
342342
"can't contain a '*' character, "
343343
"which was found at byte position 1.",
344-
questdb::line_sender_error);
344+
questdb::ilp::line_sender_error);
345345
}
346346

347347
{
@@ -350,24 +350,24 @@ TEST_CASE("Validation of bad chars in key names.")
350350
"Bad string \"a+b\": table, symbol and column names "
351351
"can't contain a '+' character, "
352352
"which was found at byte position 1.",
353-
questdb::line_sender_error);
353+
questdb::ilp::line_sender_error);
354354
}
355355

356356
{
357357
std::string_view column_name{"a\0b", 3};
358358
CHECK_THROWS_WITH_AS(
359-
questdb::name_view{column_name},
359+
questdb::ilp::name_view{column_name},
360360
"Bad string \"a\\0b\": table, symbol and column names "
361361
"can't contain a '\\0' character, "
362362
"which was found at byte position 1.",
363-
questdb::line_sender_error);
363+
questdb::ilp::line_sender_error);
364364
}
365365

366366
auto test_bad_name = [](std::string bad_name)
367367
{
368368
try
369369
{
370-
questdb::name_view{bad_name};
370+
questdb::ilp::name_view{bad_name};
371371
std::stringstream ss;
372372
ss << "Name `" << bad_name << "` (";
373373
for (const char& c : bad_name)
@@ -381,7 +381,7 @@ TEST_CASE("Validation of bad chars in key names.")
381381
ss << ") did not raise.";
382382
CHECK_MESSAGE(false, ss.str());
383383
}
384-
catch (const questdb::line_sender_error&)
384+
catch (const questdb::ilp::line_sender_error&)
385385
{
386386
return;
387387
}
@@ -410,24 +410,24 @@ TEST_CASE("Validation of bad chars in key names.")
410410

411411
TEST_CASE("Move testing.")
412412
{
413-
questdb::test::mock_server server1;
414-
questdb::test::mock_server server2;
413+
questdb::ilp::test::mock_server server1;
414+
questdb::ilp::test::mock_server server2;
415415

416-
questdb::line_sender sender1{
416+
questdb::ilp::line_sender sender1{
417417
"localhost",
418418
std::to_string(server1.port()).c_str()};
419419

420420
CHECK_THROWS_AS(
421421
sender1.at_now(),
422-
questdb::line_sender_error);
422+
questdb::ilp::line_sender_error);
423423
CHECK(sender1.must_close());
424424

425-
questdb::line_sender sender2{std::move(sender1)};
425+
questdb::ilp::line_sender sender2{std::move(sender1)};
426426

427427
CHECK_FALSE(sender1.must_close());
428428
CHECK(sender2.must_close());
429429

430-
questdb::line_sender sender3{
430+
questdb::ilp::line_sender sender3{
431431
"localhost",
432432
std::to_string(server2.port()).c_str()};
433433
sender3.table("test"_name);
@@ -443,10 +443,10 @@ TEST_CASE("Bad hostname")
443443
{
444444
try
445445
{
446-
questdb::line_sender sender{"dummy_hostname", "9009"};
446+
questdb::ilp::line_sender sender{"dummy_hostname", "9009"};
447447
CHECK_MESSAGE(false, "Expected exception");
448448
}
449-
catch (const questdb::line_sender_error& se)
449+
catch (const questdb::ilp::line_sender_error& se)
450450
{
451451
std::string msg{se.what()};
452452
CHECK(msg.rfind("Could not resolve \"dummy_hostname:9009\": ", 0) == 0);
@@ -461,13 +461,13 @@ TEST_CASE("Bad interface")
461461
{
462462
try
463463
{
464-
questdb::line_sender sender{
464+
questdb::ilp::line_sender sender{
465465
"localhost",
466466
"9009",
467467
"dummy_hostname"};
468468
CHECK_MESSAGE(false, "Expected exception");
469469
}
470-
catch (const questdb::line_sender_error& se)
470+
catch (const questdb::ilp::line_sender_error& se)
471471
{
472472
std::string msg{se.what()};
473473
CHECK(msg.rfind("Could not resolve \"dummy_hostname\": ", 0) == 0);
@@ -484,12 +484,12 @@ TEST_CASE("Bad port")
484484
{
485485
try
486486
{
487-
questdb::line_sender sender{
487+
questdb::ilp::line_sender sender{
488488
"localhost",
489489
bad_port};
490490
CHECK_MESSAGE(false, "Expected exception");
491491
}
492-
catch (const questdb::line_sender_error& se)
492+
catch (const questdb::ilp::line_sender_error& se)
493493
{
494494
std::string msg{se.what()};
495495
std::string exp_msg{"\"localhost:" + bad_port + "\": "};
@@ -514,12 +514,12 @@ TEST_CASE("Bad connect")
514514
{
515515
// Port 1 is generally the tcpmux service which one would
516516
// very much expect to never be running.
517-
questdb::line_sender sender{
517+
questdb::ilp::line_sender sender{
518518
"127.0.0.1",
519519
1};
520520
CHECK_MESSAGE(false, "Expected exception");
521521
}
522-
catch (const questdb::line_sender_error& se)
522+
catch (const questdb::ilp::line_sender_error& se)
523523
{
524524
std::string msg{se.what()};
525525
CHECK(msg.rfind("Could not connect", 0) == 0);

0 commit comments

Comments
 (0)