Pavel Kartavyy
|
07861aca9b
|
zkutil: use apache C client library instead of libzkcpp
|
2014-06-11 21:29:04 +04:00 |
|
Michael Kolupaev
|
38c5500a71
|
Refactored DB::ConnectionPool, DB::ConnectionPoolWithFailover and sqxxl::Pool. [#METR-10202]
|
2014-06-03 18:32:08 +04:00 |
|
Michael Kolupaev
|
3aad8dad8f
|
Merge
|
2014-05-27 16:08:40 +04:00 |
|
Alexey Milovidov
|
34eeed7ed3
|
Renamed mysqlxx::String and sqxxl::String to mysqlxx::Value and sqxxl::Value [#METR-2807].
|
2014-05-20 02:05:33 +04:00 |
|
Pavel Kartavyy
|
44cac6fb1a
|
zkutil: maybe recursive delay using multi will be faster
|
2014-05-19 13:21:57 +04:00 |
|
Michael Kolupaev
|
ca6f5df30e
|
zkutil: tiny logging improvement. [#METR-2807]
|
2014-05-16 19:54:39 +04:00 |
|
Pavel Kartavyy
|
226ea78f5b
|
Revert "improved revision detection"
This reverts commit 6bfc93eac0b05885e1cbc7954d394f4d64a607e5.
|
2014-05-16 16:37:21 +04:00 |
|
Pavel Kartavyy
|
0dabdd9950
|
improved revision detection
|
2014-05-15 15:26:16 +04:00 |
|
Pavel Kartavyy
|
c39737b755
|
zkcpp: timeout if zk session is expired [#METR-11085]
|
2014-05-13 23:01:03 +04:00 |
|
Michael Kolupaev
|
2765b93851
|
Merge
|
2014-05-13 14:16:33 +04:00 |
|
Michael Kolupaev
|
90e93b171d
|
Merge
|
2014-05-13 14:10:26 +04:00 |
|
Alexey Milovidov
|
f855ff1803
|
zkutil_test: fixed error [#METR-10687].
|
2014-05-08 23:03:22 +04:00 |
|
Alexey Milovidov
|
6e83aa2253
|
zkutil_test: added history support [#METR-10687].
|
2014-05-08 22:50:31 +04:00 |
|
Alexey Milovidov
|
19078df53c
|
zkutil_test: added support for quoted data [#METR-10687].
|
2014-05-08 22:48:34 +04:00 |
|
Michael Kolupaev
|
be5a9cf820
|
Merge
|
2014-05-08 17:27:18 +04:00 |
|
Michael Kolupaev
|
a6d0c9693e
|
dbms: development. [#METR-10202]
|
2014-05-08 17:27:18 +04:00 |
|
Michael Kolupaev
|
0b7928f6a9
|
Merge
|
2014-05-07 17:58:20 +04:00 |
|
Michael Kolupaev
|
db9263f5f3
|
zkutil: not blocking calls if session is expired. [#METR-10202]
|
2014-04-22 15:20:03 +04:00 |
|
Michael Kolupaev
|
ad3954a28a
|
zkutil: explained a test. [#METR-10202]
|
2014-04-22 15:20:02 +04:00 |
|
Michael Kolupaev
|
052b2bd83b
|
zkcpp: added test showing that zkcpp blocks calls forever after session expiration. [#METR-10202]
|
2014-04-22 15:20:02 +04:00 |
|
Michael Kolupaev
|
c2b556f51b
|
Merge
|
2014-04-22 14:43:18 +04:00 |
|
Pavel Kartavyy
|
72edd15363
|
███████████: added writing files to zookeeper [#METR-10172]
|
2014-04-21 16:29:23 +04:00 |
|
Pavel Kartavyy
|
f53eba5eed
|
zkutil: added path to exception [#METR-10190]
|
2014-04-21 11:26:08 +04:00 |
|
Pavel Kartavyy
|
892cc08ece
|
added fetch tags in create_revision.sh
|
2014-04-21 11:26:08 +04:00 |
|
Pavel Kartavyy
|
2d131264e1
|
statdaemons: improvement [#METR-10190]
|
2014-04-18 18:26:00 +04:00 |
|
Pavel Kartavyy
|
16d8fe8ab0
|
zkutil: added state to LeaderElection [#METR-10190]
|
2014-04-18 18:25:59 +04:00 |
|
Pavel Kartavyy
|
886548859c
|
███████████: added progress file [#METR-9888]
|
2014-04-10 19:21:01 +04:00 |
|
Michael Kolupaev
|
e3dfe90ffe
|
Merge
|
2014-04-09 19:53:47 +04:00 |
|
Michael Kolupaev
|
e0d2bce6e2
|
zkutil: Probably fixed crashing on ZK connection loss. [#METR-10202]
|
2014-04-08 14:13:52 +04:00 |
|
Alexey Milovidov
|
63cff6a5a4
|
Improvement [#METR-2807].
|
2014-04-08 11:58:53 +04:00 |
|
Alexey Milovidov
|
5ca21127c7
|
Improvement [#METR-2807].
|
2014-04-08 11:31:51 +04:00 |
|
Alexey Milovidov
|
34bf7dd0ae
|
Removed useless code [#METR-2807].
|
2014-04-08 10:51:53 +04:00 |
|
Michael Kolupaev
|
847128152e
|
Merge
|
2014-04-04 14:37:33 +04:00 |
|
Michael Kolupaev
|
b92f1ff480
|
Merge
|
2014-04-02 17:45:39 +04:00 |
|
Michael Kolupaev
|
83fce6973a
|
Fixed build. [#METR-10202]
|
2014-04-02 14:44:55 +04:00 |
|
Michael Kolupaev
|
233557ec72
|
Merge
|
2014-04-02 14:40:23 +04:00 |
|
Michael Kolupaev
|
91f6a73617
|
zkutil: Inherited KeeperException from DB::Exception. [#METR-10202]
|
2014-04-02 14:38:27 +04:00 |
|
Michael Kolupaev
|
7b6ce30656
|
Merge
|
2014-03-22 18:44:44 +04:00 |
|
Michael Kolupaev
|
36b152f2b1
|
Added interserver IO host and port to context. [#METR-10202]
|
2014-03-21 23:49:27 +04:00 |
|
Michael Kolupaev
|
7084f03ab9
|
Merge
|
2014-03-21 23:17:59 +04:00 |
|
Michael Kolupaev
|
2809291432
|
zkutil: Thread safety. [#METR-10202]
|
2014-03-21 22:58:24 +04:00 |
|
Pavel Kartavyy
|
4384ba0009
|
zookeeper: added config description [#METR-10172]
|
2014-03-14 13:31:25 +04:00 |
|
Pavel Kartavyy
|
42dc0516d2
|
added config for zookeeper [#METR-10172]
|
2014-03-13 18:51:00 +04:00 |
|
Alexey Milovidov
|
896182ed8a
|
daemon: improved ThreadNumber; showing source thread number on signals [#METR-2944].
|
2014-03-08 21:48:22 +04:00 |
|
Michael Kolupaev
|
3411d3db64
|
libzkutil: added multi; many fixes. [#METR-10202]
|
2014-03-07 23:19:06 +04:00 |
|
Michael Kolupaev
|
7ea73ab849
|
libzkutil: working. [#METR-10202]
|
2014-03-07 21:57:53 +04:00 |
|
Michael Kolupaev
|
5ceab75c8a
|
libzkutil: development. [#METR-10202]
|
2014-03-07 17:50:58 +04:00 |
|
Alexey Milovidov
|
e51227f502
|
Updated LZ4. Added LZ4HC. [#METR-2944].
|
2014-03-02 08:08:03 +04:00 |
|
Pavel Kartavyy
|
101a056fb8
|
Removed suddenly reverted commit "Fixed error in prev. revision [#METR-10142]."
This reverts commit a1d4e27454689270855256fa00e6f73e954a316c.
|
2014-02-21 19:56:42 +04:00 |
|
Pavel Kartavyy
|
0a150faca5
|
Revert "Fixed error in prev. revision [#METR-10142]."
This reverts commit c139fa2b260ea9e0a77bc721767797b3cfaba0a8.
|
2014-02-21 19:14:10 +04:00 |
|
Alexey Milovidov
|
4ea2512504
|
Fixed error in prev. revision [#METR-10142].
|
2014-02-21 06:46:51 +04:00 |
|
Alexey Milovidov
|
a7f5465b91
|
Fixed error in prev. revision [#METR-10142].
|
2014-02-21 06:15:18 +04:00 |
|
Alexey Milovidov
|
b1e9204dcc
|
Fixed performance issue [#METR-10142].
|
2014-02-21 05:57:01 +04:00 |
|
Michael Kolupaev
|
080b164b09
|
slightly improved .gitignore. [#METR-2807]
|
2014-02-20 13:44:25 +04:00 |
|
Pavel Kartavyy
|
b635b253c0
|
run script generator with bash [#METR-9800]
|
2014-02-17 17:20:59 +00:00 |
|
Alexey Milovidov
|
ba3a0000ae
|
Fixed strange error in revision.h generation [#METR-9800].
|
2014-02-17 16:55:37 +00:00 |
|
Pavel Kartavyy
|
12f520e117
|
get tag from git
|
2014-02-17 15:34:29 +00:00 |
|
Pavel Kartavyy
|
508e7185d2
|
ignore build files
|
2014-02-17 15:34:27 +00:00 |
|
Pavel Kartavyy
|
0fea69d718
|
git: fixed missed folders
|
2014-02-17 15:34:26 +00:00 |
|
Sergey Fedorov
|
645a0eb544
|
create_revision: updates in script made by Lesha :) [METR-9766]
|
2014-02-12 16:16:41 +00:00 |
|
Pavel Kartavyy
|
053e453935
|
added SVN_PATH [#METR-9766]
|
2014-01-28 20:27:29 +00:00 |
|
Pavel Kartavyy
|
b9c35019e9
|
added SVN_PATH [#METR-9766]
|
2014-01-28 20:26:22 +00:00 |
|
Pavel Kartavyy
|
e839059abf
|
added SVN_PATH [#METR-9766]
|
2014-01-28 20:25:28 +00:00 |
|
Pavel Kartavyy
|
92fdc6dc88
|
added SVN_PATH [#METR-9766]
|
2014-01-28 20:13:24 +00:00 |
|
Pavel Kartavyy
|
740623b729
|
removed revision generating for git-svn.
works badly
|
2014-01-28 20:13:23 +00:00 |
|
Alexey Milovidov
|
dd4acec059
|
Updated lz4 to rev. 112 [#CONV-8766].
|
2014-01-11 19:33:11 +00:00 |
|
Alexey Milovidov
|
22fda035cc
|
Allowed to use std::vector instead of DB::Array for Arrays in ssqls [#METR-8766].
|
2014-01-05 13:40:11 +00:00 |
|
Alexey Milovidov
|
6dc9ce070c
|
Preparing to linking libmysqlclient statically [#METR-9505].
|
2013-12-16 20:15:28 +00:00 |
|
Pavel Kartavyy
|
ce5ff538ec
|
mysqlxx: fix [METR-9429]
|
2013-12-09 19:16:48 +00:00 |
|
Alexey Milovidov
|
340404eaf3
|
Fixed indents [#METR-2807].
|
2013-12-06 17:29:01 +00:00 |
|
Pavel Kartavyy
|
4ef53f6acb
|
added generating revision for git-svn repo ]
|
2013-11-18 17:44:44 +00:00 |
|
Pavel Kartavyy
|
2fab08ae10
|
libmysqlxx: enabled empty password. refactoring [#METR-8598]
|
2013-10-29 09:27:10 +00:00 |
|
Alexey Milovidov
|
fa7a666a96
|
mysqlxx: added server address to exception messages [#METR-9068].
|
2013-10-26 02:50:23 +00:00 |
|
Alexey Milovidov
|
c46b9253f3
|
PoolWithFailover: changed error to warning [#METR-9062].
|
2013-10-24 17:49:14 +00:00 |
|
Pavel Kartavyy
|
a933ed4e43
|
libmysqlxx: optimized build time and project view in qtcreator [#CONV-8598]
|
2013-09-05 11:44:10 +00:00 |
|
Pavel Kartavyy
|
afa70827c7
|
libmysqlxx: changed settings to mysql [#CONV-8598]
|
2013-09-04 15:29:02 +00:00 |
|
Alexey Milovidov
|
bd69b6d606
|
PoolWithFailover: Better error reporting [#CONV-8589].
|
2013-08-28 01:21:53 +00:00 |
|
Alexey Milovidov
|
d04ce851ae
|
PoolWithFailover: reverted priority [#RTADMIN-5725].
|
2013-08-27 16:53:20 +00:00 |
|
Alexey Milovidov
|
be67c3e3d6
|
Removed useless namespace [#CONV-2807].
|
2013-08-11 03:40:14 +00:00 |
|
Evgeniy Gatov
|
180065b7b4
|
libmysqlxx/DateTime: fixed bug [#CONV-8035].
|
2013-07-01 16:38:13 +00:00 |
|
Alexey Milovidov
|
3673752d1b
|
dbms: fixed error with formatting DateTime near begin of unix epoch; fixed error with toTime function when changing daylight saving time; fixed toTime function for non-Moscow time zones [#CONV-7755].
|
2013-06-01 04:58:52 +00:00 |
|
Alexey Milovidov
|
da4d2f91c9
|
Renamed file and removed useless code [#CONV-2807].
|
2013-05-05 16:23:54 +00:00 |
|
Alexey Milovidov
|
a14c5a4aa9
|
Improved notifications [#CONV-7461].
|
2013-04-28 02:56:13 +00:00 |
|
Alexey Milovidov
|
8ad2255fa9
|
mysqlxx: set default rw_timeout to half-hour [#CONV-7420].
|
2013-04-24 21:50:19 +00:00 |
|
Michael Kolupaev
|
d211d5b185
|
libmysqlxx: improved test [#CONV-7043].
|
2013-04-18 10:36:49 +00:00 |
|
Michael Kolupaev
|
4ffb9e936f
|
libmysqlxx: fixed PoolWithFailover [#CONV-7043].
|
2013-04-18 10:33:58 +00:00 |
|
Michael Kolupaev
|
3e12bc0c14
|
libmysqlxx: added test [#CONV-7043].
|
2013-04-18 10:23:40 +00:00 |
|
Alexey Milovidov
|
af71008e23
|
Added support for rw_timeout in mysqlxx::Pool; removed useless code [#CONV-7093].
|
2013-04-11 17:51:14 +00:00 |
|
Michael Kolupaev
|
36798abd60
|
libmysqlxx: added PoolWithFailover [#CONV-7043].
|
2013-04-04 14:39:59 +00:00 |
|
Alexey Milovidov
|
1f375250d6
|
mysqlxx: added read/write timeouts [#CONV-7093].
|
2013-03-31 01:16:35 +00:00 |
|
Alexey Milovidov
|
a55c07f449
|
Tiny improvement [#CONV-2944].
|
2013-02-16 17:31:03 +00:00 |
|
Alexey Milovidov
|
9856a89373
|
Logging stack trace on signals [#CONV-6459].
|
2013-01-14 00:45:58 +00:00 |
|
Alexey Milovidov
|
e7e9e7cc61
|
Writing core dumps into appropriate directory [#CONV-6469].
|
2013-01-13 23:04:54 +00:00 |
|
Alexey Milovidov
|
0d99e28531
|
Using terminate handler [#CONV-2807].
|
2013-01-13 21:02:41 +00:00 |
|
Alexey Milovidov
|
6a4b0139e8
|
Fixed build with clang [#CONV-2807].
|
2013-01-06 19:06:21 +00:00 |
|
Alexey Milovidov
|
037941ff83
|
Compatibility with clang [#CONV-2807].
|
2013-01-06 16:13:07 +00:00 |
|
Alexey Milovidov
|
c3e3b66dc4
|
Compatibility with clang [#CONV-2807].
|
2013-01-06 16:07:01 +00:00 |
|
Alexey Milovidov
|
aad8bab2d0
|
Tiny fixes [#CONV-2807].
|
2012-10-24 20:05:10 +00:00 |
|
Alexey Milovidov
|
9002b37164
|
Tiny modification [#CONV-5417].
|
2012-09-05 19:51:52 +00:00 |
|
Alexey Milovidov
|
0652f9da96
|
dbms: development [#CONV-2944].
|
2012-08-31 20:38:05 +00:00 |
|
Alexey Milovidov
|
777bb550f7
|
Daemon: don't creating pid file if no option 'pid-file' specified [#CONV-5295].
|
2012-07-23 16:23:51 +00:00 |
|
Alexey Milovidov
|
ec0a48e99e
|
███████████: fixed incompatibility [#CONV-5283].
|
2012-07-20 19:54:25 +00:00 |
|
Alexey Milovidov
|
3ad90a2494
|
sqxxl: development [#CONV-2944].
|
2012-06-07 20:22:15 +00:00 |
|
Alexey Milovidov
|
b631690c8c
|
sqxxl: fixed errors [#CONV-2944].
|
2012-06-07 20:02:41 +00:00 |
|
Alexey Milovidov
|
e3174f6884
|
███████████: committing data in group [#CONV-4768].
|
2012-05-02 19:16:50 +00:00 |
|
Alexey Milovidov
|
65b1caa9d7
|
Updated LZ4 http://lz4.googlecode.com/svn/trunk/ rev. 62 [#CONV-4593].
|
2012-04-14 00:09:30 +00:00 |
|
Alexey Milovidov
|
20d0b9b0f6
|
dbms: development [#CONV-2944].
|
2012-03-11 08:54:12 +00:00 |
|
Alexey Milovidov
|
fd8556bf0a
|
mysqlxx: removed initialization by current time [#CONV-2807].
|
2012-02-26 02:44:29 +00:00 |
|
Alexey Milovidov
|
51f4954d88
|
Removed garbage [#CONV-2807].
|
2012-02-26 01:49:10 +00:00 |
|
Alexey Milovidov
|
58110f5cde
|
dbms: added LZ4 [#CONV-2944].
|
2012-01-05 18:35:22 +00:00 |
|
Alexey Milovidov
|
26e7e1273a
|
Daemon: removed previous modification [#CONV-2807].
|
2011-12-20 23:15:23 +00:00 |
|
Alexey Milovidov
|
11e5fb35ec
|
Daemon: added stack trace in case of DB::Exception [#CONV-2807].
|
2011-12-20 19:30:06 +00:00 |
|
Alexey Milovidov
|
a652c56044
|
Daemon: fixed error in prev. revision [#CONV-3742].
|
2011-12-08 19:25:00 +00:00 |
|
Alexey Milovidov
|
bbf5c62f17
|
Fixed compatibility issue [#CONV-3742].
|
2011-12-08 19:16:59 +00:00 |
|
Alexey Milovidov
|
16e1632b15
|
Daemon: fixed error with IPv6 notifications [#CONV-3741].
|
2011-12-08 18:37:11 +00:00 |
|
Alexey Milovidov
|
32102bab7b
|
███████████: fixed error [#CONV-3680].
|
2011-12-06 19:52:38 +00:00 |
|
Alexey Milovidov
|
9763d1f8c8
|
SSQLS: removed useless code; improvement [#CONV-3722].
|
2011-12-05 14:13:18 +00:00 |
|
Alexey Milovidov
|
4157959cb7
|
mysqlxx: fixed error with libmysqlclient [#CONV-3336].
|
2011-11-30 19:14:06 +00:00 |
|
Alexey Milovidov
|
1cde7d6ab5
|
blobs: fixed error [#CONV-3681].
|
2011-11-29 18:53:44 +00:00 |
|
Alexey Milovidov
|
eff4e7a65f
|
Cleanup [#CONV-2807].
|
2011-11-21 07:40:03 +00:00 |
|
Alexey Milovidov
|
40255abe04
|
table-statd: fixed error ('db' required) [#CONV-3616].
|
2011-11-17 19:28:50 +00:00 |
|
Alexey Milovidov
|
4575aec0c7
|
Daemon: fixed error with listening to notifications and restart [#CONV-2807].
|
2011-11-07 16:48:06 +00:00 |
|
Alexey Milovidov
|
893b5c648b
|
daemon: reusing address while listening to notifications in datagram socket [#CONV-3466].
|
2011-10-24 17:52:55 +00:00 |
|
Alexey Milovidov
|
98164a95ec
|
mysqlxx::Date: removed useless changes, left useful changes; mysqlxx::DateTime: added useful changes [#CONV-3381].
|
2011-10-14 18:03:25 +00:00 |
|
Evgeniy Gatov
|
538df807c4
|
libmysqlxx::Date bugfix [#CONV-3381].
|
2011-10-14 11:32:08 +00:00 |
|
Alexey Milovidov
|
cb5be1a84f
|
mysqlxx: fixed error [#CONV-3336].
|
2011-10-13 23:43:14 +00:00 |
|
Alexey Milovidov
|
ac9b26cc29
|
mysqlxx: fixed error with libmysqlclient_r [#CONV-3336].
|
2011-10-10 20:32:42 +00:00 |
|
Alexey Milovidov
|
d2714cf874
|
Added listening and notifications for events [#CONV-3364].
|
2011-10-10 17:52:29 +00:00 |
|
Alexey Milovidov
|
b27f904bd3
|
Better sleep [#CONV-2807].
|
2011-10-06 18:23:00 +00:00 |
|
Alexey Milovidov
|
7cceb00dd9
|
mysqlxx::Pool: style fixes [#CONV-2807].
|
2011-10-06 15:58:20 +00:00 |
|
Alexey Milovidov
|
809ee23e73
|
mysqlxx::Pool: minor style fixes [#CONV-2807].
|
2011-10-06 15:26:48 +00:00 |
|
Alexey Milovidov
|
bbb966b677
|
mysqlxx: compatibility with new libmysqlclient; allowed to specify connect timeout in config file [#CONV-3336].
|
2011-10-05 20:21:18 +00:00 |
|
Alexey Milovidov
|
ed8905bcf6
|
Pool: fixed error [#CONV-3288].
|
2011-10-02 03:37:24 +00:00 |
|
Alexey Milovidov
|
b444be951e
|
daemon: removed garbage; using logging command line parameters when running in console [#CONV-3180].
|
2011-10-01 23:33:53 +00:00 |
|
Alexey Milovidov
|
8eb988a480
|
statdaemons: added InFileDataLoaderWithBackup [#CONV-3288].
|
2011-09-28 19:11:13 +00:00 |
|
Alexey Milovidov
|
c675a0fa40
|
Removed useless code [#CONV-2807].
|
2011-09-08 19:08:55 +00:00 |
|
Alexey Milovidov
|
f5f4599922
|
mysqlxx::Pool: trying to reconnect only if connection was successful at least once [#CONV-2807].
|
2011-09-01 18:15:15 +00:00 |
|
Alexey Milovidov
|
f306242847
|
mysqlxx: fixed ambiguity in methods take char * and int and default args [#CONV-2807].
|
2011-09-01 18:14:01 +00:00 |
|
Alexey Milovidov
|
2b5d719414
|
mysqlxx: added option MYSQL_OPT_LOCAL_INFILE [#CONV-3016].
|
2011-08-23 17:46:58 +00:00 |
|
Alexey Milovidov
|
b3bca9c160
|
dbms: development.
|
2011-08-07 03:42:36 +00:00 |
|
Evgeniy Gatov
|
cf7fcfc91c
|
Date format YYYYMMDD now supported by mysqlxx::Date constructor [#CONV-1968].
|
2011-08-03 14:24:28 +00:00 |
|
Alexey Milovidov
|
d303caa3ef
|
Fixed error in prev. revision [#CONV-2833].
|
2011-07-27 20:04:31 +00:00 |
|
Alexey Milovidov
|
6069ce3961
|
Addition to prev. revision [#CONV-2833].
|
2011-07-27 19:47:19 +00:00 |
|
Alexey Milovidov
|
f3a5c83638
|
Improvement to prev. revision [#CONV-2833].
|
2011-07-27 19:38:00 +00:00 |
|
Alexey Milovidov
|
8789c0a8ca
|
Added compression of program logs [#CONV-2833].
|
2011-07-27 19:36:02 +00:00 |
|
Alexey Milovidov
|
7e0d8039ee
|
mysqlxx:: Exception: tiny improvement [#CONV-2807].
|
2011-07-20 17:55:33 +00:00 |
|
Alexey Milovidov
|
5779760e0c
|
mysqlxx: added const [#CONV-2546].
|
2011-07-20 17:30:31 +00:00 |
|
Alexey Milovidov
|
1ea8120bb0
|
Added charset cp1252 [#CONV-2668].
|
2011-06-30 18:21:59 +00:00 |
|
Alexey Milovidov
|
d4ac9fe904
|
mysqlxx: removed MYSQL_OPT_READ_TIMEOUT [#CONV-2647].
|
2011-06-29 19:59:20 +00:00 |
|
Alexey Milovidov
|
4b2f373163
|
Added cityhash for [#CONV-2546].
|
2011-06-24 19:33:59 +00:00 |
|