1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
/**
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This file is part of osm2pgsql (https://osm2pgsql.org/).
*
* Copyright (C) 2006-2023 by the osm2pgsql developer community.
* For a full list of authors see the git log.
*/
#include <catch.hpp>
#include "common-pg.hpp"
#include "db-copy.hpp"
#include "gazetteer-style.hpp"
static testing::pg::tempdb_t db;
static int table_count(testing::pg::conn_t const &conn,
std::string const &where = "")
{
return conn.result_as_int("SELECT count(*) FROM test_copy_thread " + where);
}
TEST_CASE("db_copy_thread_t with db_deleter_by_id_t")
{
auto const conn = db.connect();
conn.exec("DROP TABLE IF EXISTS test_copy_thread");
conn.exec("CREATE TABLE test_copy_thread (id int8)");
auto const table = std::make_shared<db_target_descr_t>();
table->name = "test_copy_thread";
table->id = "id";
db_copy_thread_t t(db.conninfo());
using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_by_id_t>;
auto cmd = std::make_unique<cmd_copy_t>(table);
SECTION("simple copy command")
{
SECTION("add one copy line and sync")
{
cmd->buffer += "42\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(conn.result_as_int("SELECT id FROM test_copy_thread") ==
42);
}
SECTION("add multiple rows and sync")
{
cmd->buffer += "101\n 23\n 900\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn) == 3);
}
SECTION("add one line and finish")
{
cmd->buffer += "2\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.finish();
REQUIRE(conn.result_as_int("SELECT id FROM test_copy_thread") == 2);
}
}
SECTION("delete command")
{
cmd->buffer += "42\n43\n133\n223\n224\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
cmd = std::make_unique<cmd_copy_t>(table);
SECTION("simple delete of existing rows")
{
cmd->add_deletable(223);
cmd->add_deletable(42);
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE id = 42") == 0);
REQUIRE(table_count(conn, "WHERE id = 223") == 0);
}
SECTION("delete one and add another")
{
cmd->add_deletable(133);
cmd->buffer += "134\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE id = 133") == 0);
REQUIRE(table_count(conn, "WHERE id = 134") == 1);
}
SECTION("delete one and add the same")
{
cmd->add_deletable(133);
cmd->buffer += "133\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE id = 133") == 1);
}
}
SECTION("multi buffer add without delete")
{
cmd->buffer += "542\n5543\n10133\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
cmd = std::make_unique<cmd_copy_t>(table);
cmd->buffer += "12\n784\n523\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.finish();
REQUIRE(table_count(conn) == 6);
REQUIRE(table_count(conn, "WHERE id = 10133") == 1);
REQUIRE(table_count(conn, "WHERE id = 523") == 1);
}
SECTION("multi buffer add with delete")
{
cmd->buffer += "542\n5543\n10133\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
cmd = std::make_unique<cmd_copy_t>(table);
cmd->add_deletable(542);
cmd->buffer += "12\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.finish();
REQUIRE(table_count(conn) == 3);
REQUIRE(table_count(conn, "WHERE id = 542") == 0);
REQUIRE(table_count(conn, "WHERE id = 12") == 1);
}
}
TEST_CASE("db_copy_thread_t with db_deleter_place_t")
{
auto const conn = db.connect();
conn.exec("DROP TABLE IF EXISTS test_copy_thread");
conn.exec("CREATE TABLE test_copy_thread ("
"osm_type char(1),"
"osm_id bigint,"
"class text)");
auto table = std::make_shared<db_target_descr_t>();
table->name = "test_copy_thread";
table->id = "place_id";
db_copy_thread_t t(db.conninfo());
using cmd_copy_t = db_cmd_copy_delete_t<db_deleter_place_t>;
auto cmd = std::make_unique<cmd_copy_t>(table);
SECTION("simple delete")
{
cmd->buffer += "N\t42\tbuilding\n"
"N\t43\tbuilding\n"
"W\t42\thighway\n"
"R\t42\twaterway\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
cmd = std::make_unique<cmd_copy_t>(table);
SECTION("full delete of existing rows")
{
cmd->add_deletable('N', 42);
cmd->add_deletable('R', 42);
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
" and osm_id = 42") == 0);
REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
" and osm_id = 43") == 1);
REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
" and osm_id = 42") == 1);
REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
" and osm_id = 42") == 0);
}
SECTION("partial delete of existing rows")
{
cmd->add_deletable('N', 42, "'road','building','amenity'");
cmd->add_deletable('R', 42, "'road','building','amenity'");
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
" and osm_id = 42") == 1);
REQUIRE(table_count(conn, "WHERE osm_type = 'N'"
" and osm_id = 43") == 1);
REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
" and osm_id = 42") == 1);
REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
" and osm_id = 42") == 0);
}
SECTION("delete one add another id")
{
cmd->add_deletable('R', 42);
cmd->buffer += "W\t43\tamenity\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE osm_type = 'R'"
" and osm_id = 42") == 0);
REQUIRE(table_count(conn, "WHERE osm_type = 'W'"
" and osm_id = 43") == 1);
}
SECTION("delete one add another class type")
{
cmd->add_deletable('W', 42, "'amenity'");
cmd->buffer += "W\t42\tamenity\n";
t.add_buffer(std::unique_ptr<db_cmd_t>(cmd.release()));
t.sync_and_wait();
REQUIRE(table_count(conn, "WHERE osm_type = 'W' and osm_id = 42"
" and class = 'highway'") == 0);
REQUIRE(table_count(conn, "WHERE osm_type = 'W' and osm_id = 42"
" and class = 'amenity'") == 1);
}
}
}
|
