Skip to content

Commit 4b7160e

Browse files
PavelShilin89PavelShilin89
committed
Merge branch 'master' into feature/log-level-opt
2 parents ca773e2 + fa4e70d commit 4b7160e

27 files changed

+144
-95
lines changed

‎deps.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
backup 1.9.1+25040420-c6e46da2-dev
2-
buddy 3.28.3+25052217-bc18e391-dev
3-
mcl 4.2.2+25052221-53337148-dev
2+
buddy 3.28.5+25052812-0b8d369c-dev
3+
mcl 5.0.1+25052612-ecff7aa8-dev
44
executor 1.3.1 25011510 1856ac9
55
tzdata 1.0.1 240904 3ba592a
66
load 1.18.2+25050118-8537968a-dev

‎manual/Node_info_and_management/SHOW_VERSION.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ mysql> SHOW VERSION;
2020

2121
<!-- response SQL -->
2222
```
23-
+-----------+--------------------------------+
24-
| Component | Version |
25-
+-----------+--------------------------------+
26-
| Daemon | 6.2.13 61cfe38d2@24011520 dev |
27-
| Columnar | columnar 2.2.5 214ce90@240115 |
28-
| Secondary | secondary 2.2.5 214ce90@240115 |
29-
| KNN | knn 2.2.5 214ce90@240115 |
30-
| Buddy | buddy v2.0.11 |
31-
+-----------+--------------------------------+
23+
+------------+--------------------------------+
24+
| Component | Version |
25+
+------------+--------------------------------+
26+
| Daemon | 6.2.13 61cfe38d2@24011520 dev |
27+
| Columnar | columnar 2.2.5 214ce90@240115 |
28+
| Secondary | secondary 2.2.5 214ce90@240115 |
29+
| Knn | knn 2.2.5 214ce90@240115 |
30+
| Embeddings | embeddings 1.0.0 |
31+
| Buddy | buddy v2.0.11 |
32+
+------------+--------------------------------+
3233
```
3334

3435
<!-- end -->

‎src/daemon/search_handler.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2193,13 +2193,16 @@ void SearchHandler_c::RunSubset ( int iStart, int iEnd )
21932193
AggrResult_t & tRes = m_dNAggrResults[i];
21942194
auto& pTableFunc = m_dTables[iStart+i];
21952195

2196+
if ( !pTableFunc )
2197+
continue;
2198+
2199+
if ( !tRes.m_iSuccesses )
2200+
continue;
2201+
21962202
// FIXME! log such queries properly?
2197-
if ( pTableFunc )
2198-
{
2199-
SwitchProfile ( m_pProfile, SPH_QSTATE_TABLE_FUNC );
2200-
if ( !pTableFunc->Process ( &tRes, tRes.m_sError ) )
2201-
tRes.m_iSuccesses = 0;
2202-
}
2203+
SwitchProfile ( m_pProfile, SPH_QSTATE_TABLE_FUNC );
2204+
if ( !pTableFunc->Process ( &tRes, tRes.m_sError ) )
2205+
tRes.m_iSuccesses = 0;
22032206
}
22042207

22052208
/////////

‎src/sphinxjson.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ bool JsonObj_c::FetchStrItem ( std::string & sValue, const char * szName, CSphSt
19731973
{
19741974
CSphString sTmp;
19751975
bool bRes = FetchStrItem ( sTmp, szName, sError, bIgnoreMissing );
1976-
sValue = sTmp.cstr();
1976+
sValue = sTmp.scstr();
19771977
return bRes;
19781978
}
19791979

‎src/sphinxrt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@ bool RtIndex_c::VerifyKNN ( InsertDocData_c & tDoc, CSphString & sError ) const
20542054
if ( tAttr.m_eAttrType!=SPH_ATTR_FLOAT_VECTOR || !tAttr.IsIndexedKNN() )
20552055
continue;
20562056

2057-
if ( m_dAttrsWithModels[i].m_pModel )
2057+
if ( m_dAttrsWithModels.GetLength() && m_dAttrsWithModels[i].m_pModel )
20582058
{
20592059
if ( iNumValues!=0 )
20602060
{

‎src/std/bitcount.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
#include "ints.h"
1616

17-
int sphBitCount ( DWORD n );
17+
int sphBitCount ( DWORD n ) noexcept;
1818

19-
int sphBitCount ( uint64_t n );
19+
int sphBitCount ( uint64_t n ) noexcept;
2020

21-
int sphBitCount ( BYTE n );
21+
int sphBitCount ( BYTE n ) noexcept;
2222

2323
#include "bitcount_impl.h"

‎src/std/bitcount_impl.h

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414

1515
#if __GNUC__ || __clang__
1616

17-
inline int sphBitCount ( DWORD n )
17+
inline int sphBitCount ( DWORD n ) noexcept
1818
{
1919
return __builtin_popcount ( n );
2020
}
2121

22-
inline int sphBitCount ( uint64_t n )
22+
23+
inline int sphBitCount ( uint64_t n ) noexcept
2324
{
2425
return __builtin_popcountll ( n );
2526
}
@@ -29,31 +30,39 @@ inline int sphBitCount ( uint64_t n )
2930
// MIT HACKMEM count
3031
// works for 32-bit numbers only
3132
// fix last line for 64-bit numbers
32-
inline int sphBitCount ( DWORD n )
33+
inline int sphBitCount ( DWORD n ) noexcept
3334
{
34-
DWORD tmp;
35-
tmp = n - ( ( n >> 1 ) & 033333333333 ) - ( ( n >> 2 ) & 011111111111 );
36-
return ( ( tmp + ( tmp >> 3 ) ) & 030707070707 ) % 63;
35+
n -= ( n >> 1 ) & 0x55555555;
36+
const auto tmp = n & 0x33333333;
37+
n = ( n >> 2 ) & 0x33333333 + tmp;
38+
n = ( n + ( n >> 4 ) ) & 0x0F0F0F0F;
39+
n = n * 0x01010101;
40+
return n >> 24;
3741
}
3842

39-
// MIT HACKMEM count without division
40-
inline int sphBitCount ( uint64_t n )
43+
// MIT HACKMEM count without division (equals to __builtin_popcountll when no popcount op in cpu)
44+
inline int sphBitCount ( uint64_t n ) noexcept
4145
{
42-
unsigned long tmp = ( n >> 1 ) & 0x7777777777777777UL;
43-
n -= tmp;
44-
tmp = ( tmp >> 1 ) & 0x7777777777777777UL;
45-
n -= tmp;
46-
tmp = ( tmp >> 1 ) & 0x7777777777777777UL;
47-
n -= tmp;
46+
n -= ( n >> 1 ) & 0x5555555555555555UL;
47+
const auto tmp = n & 0x3333333333333333UL;
48+
n = ( n >> 2 ) & 0x3333333333333333UL + tmp;
4849
n = ( n + ( n >> 4 ) ) & 0x0F0F0F0F0F0F0F0FUL;
49-
n = n * 0x0101010101010101UL;
50-
return n >> 56;
50+
n = n * 0x0101010101010101UL;
51+
return n >> 56;
5152
}
5253
#endif
5354

5455
// that is the fastest variant of MIT HACKMEM count specified to single byte argument
5556
// benches of different variants are available in gbenches/popcount
56-
inline int sphBitCount ( BYTE n )
57+
inline int sphBitCount ( BYTE n ) noexcept
58+
{
59+
return (int) (((((DWORD ( n ) * 0x08040201) >> 3) & 0x11111111) * 0x11111111) >> 28);
60+
}
61+
62+
63+
// with LUT - just for benching
64+
inline int sphBitCount_case ( BYTE n ) noexcept
5765
{
58-
return (int)( ( ( ( ( DWORD ( n ) * 0x08040201 ) >> 3 ) & 0x11111111 ) * 0x11111111 ) >> 28 );
59-
}
66+
constexpr BYTE nbits[16] = {0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4};
67+
return nbits [ n >> 4 ] + nbits [ n & 0x0F ];
68+
}

‎test/clt-tests/buddy/test-fuzzy-search.rec

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,16 @@ mysql -h0 -P9306 -e "SELECT username FROM name WHERE MATCH('SMITH') OPTION cutof
401401
| APRYL SMYTH |
402402
+-----------------+
403403
––– input –––
404+
mysql -h0 -P9306 -e "SELECT * FROM name WHERE MATCH('SMITH') ORDER BY id ASC OPTION fuzzy=0;" > /tmp/result_fuzzy0.txt
405+
––– output –––
406+
––– input –––
407+
mysql -h0 -P9306 -e "SELECT * FROM name WHERE MATCH('SMITH') ORDER BY id ASC;" > /tmp/result_no_fuzzy.txt
408+
––– output –––
409+
––– input –––
410+
diff /tmp/result_fuzzy0.txt /tmp/result_no_fuzzy.txt; echo $?
411+
––– output –––
412+
0
413+
––– input –––
404414
mysql -h0 -P9306 -e "CALL AUTOCOMPLETE('jo', 'name', 1 AS fuzziness);" | tail -n +4 | sort
405415
––– output –––
406416
+--------+

‎test/clt-tests/buddy/test-inconsistent-comunication-with-buddy.rec

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,9 +515,13 @@ curl -s -X POST "http://localhost:9308/sql?mode=raw" -d "query=SHOW VERSION" | j
515515
"Version": "secondary %{VERSION}"
516516
},
517517
{
518-
"Component": "KNN",
518+
"Component": "Knn",
519519
"Version": "knn %{VERSION}"
520520
},
521+
{
522+
"Component": "Embeddings",
523+
"Version": "embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"
524+
},
521525
{
522526
"Component": "Buddy",
523527
"Version": "buddy %{VERSION}"
@@ -559,9 +563,13 @@ curl -s "http://localhost:9308/sql?mode=raw&query=SHOW%20VERSION" | jq '.[0].dat
559563
"Version": "secondary %{VERSION}"
560564
},
561565
{
562-
"Component": "KNN",
566+
"Component": "Knn",
563567
"Version": "knn %{VERSION}"
564568
},
569+
{
570+
"Component": "Embeddings",
571+
"Version": "embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"
572+
},
565573
{
566574
"Component": "Buddy",
567575
"Version": "buddy %{VERSION}"
@@ -603,9 +611,13 @@ curl -s -X POST "http://localhost:9308/sql?raw_response=true" -d "query=SHOW VER
603611
"Version": "secondary %{VERSION}"
604612
},
605613
{
606-
"Component": "KNN",
614+
"Component": "Knn",
607615
"Version": "knn %{VERSION}"
608616
},
617+
{
618+
"Component": "Embeddings",
619+
"Version": "embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"
620+
},
609621
{
610622
"Component": "Buddy",
611623
"Version": "buddy %{VERSION}"
@@ -647,9 +659,13 @@ curl -s "http://localhost:9308/sql?raw_response=true&query=SHOW%20VERSION" | jq
647659
"Version": "secondary %{VERSION}"
648660
},
649661
{
650-
"Component": "KNN",
662+
"Component": "Knn",
651663
"Version": "knn %{VERSION}"
652664
},
665+
{
666+
"Component": "Embeddings",
667+
"Version": "embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"
668+
},
653669
{
654670
"Component": "Buddy",
655671
"Version": "buddy %{VERSION}"

‎test/clt-tests/buddy/test-show-version.rec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ Component: Columnar
1212
Component: Secondary
1313
Version: secondary %{VERSION}
1414
*************************** 4. row ***************************
15-
Component: KNN
15+
Component: Knn
1616
Version: knn %{VERSION}
1717
*************************** 5. row ***************************
18+
Component: Embeddings
19+
Version: embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#
20+
*************************** 6. row ***************************
1821
Component: Buddy
1922
Version: buddy %{VERSION}

‎test/clt-tests/core/show-version-trailing-semicolon.rec

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@ mysql -h0 -P9306 -e "CREATE TABLE t (id INT, value TEXT); INSERT INTO t VALUES (
55
––– input –––
66
curl -s "http://localhost:9308/cli?show%20version" | awk '!/row.*in set/'; echo
77
––– output –––
8-
+-----------+----------------------------------+
9-
| Component | Version |
10-
+-----------+----------------------------------+
11-
| Daemon | %{VERSION} #!/\s*/!#|
12-
| Columnar | columnar %{VERSION} #!/\s*/!#|
13-
| Secondary | secondary %{VERSION} #!/\s*/!#|
14-
| KNN | knn %{VERSION} #!/\s*/!#|
15-
| Buddy | buddy %{VERSION} #!/\s*/!#|
16-
+-----------+----------------------------------+
8+
+------------+----------------------------------+
9+
| Component | Version |
10+
+------------+----------------------------------+
11+
| Daemon | %{VERSION} #!/\s*/!#|
12+
| Columnar | columnar %{VERSION} #!/\s*/!#|
13+
| Secondary | secondary %{VERSION} #!/\s*/!#|
14+
| Knn | knn %{VERSION} #!/\s*/!#|
15+
| Embeddings | embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)\s*/!#|
16+
| Buddy | buddy %{VERSION} #!/\s*/!#|
17+
+------------+----------------------------------+
1718
––– input –––
1819
curl -s "http://localhost:9308/cli_json" -d "show version"; echo
1920
––– output –––
20-
[{"total":%{NUMBER},"error":"","warning":"","columns":[{"Component":{"type":"string"}},{"Version":{"type":"string"}}],"data":[{"Component":"Daemon","Version":"%{VERSION}"},{"Component":"Columnar","Version":"columnar %{VERSION}"},{"Component":"Secondary","Version":"secondary %{VERSION}"},{"Component":"KNN","Version":"knn %{VERSION}"},{"Component":"Buddy","Version":"buddy %{VERSION}"}]}]
21+
[{"total":%{NUMBER},"error":"","warning":"","columns":[{"Component":{"type":"string"}},{"Version":{"type":"string"}}],"data":[{"Component":"Daemon","Version":"%{VERSION}"},{"Component":"Columnar","Version":"columnar %{VERSION}"},{"Component":"Secondary","Version":"secondary %{VERSION}"},{"Component":"Knn","Version":"knn %{VERSION}"},{"Component":"Embeddings","Version":"embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"},{"Component":"Buddy","Version":"buddy %{VERSION}"}]}]
2122
––– input –––
2223
curl -s "http://localhost:9308/sql?mode=raw" -d "show version"; echo
2324
––– output –––
24-
[{"total":%{NUMBER},"error":"","warning":"","columns":[{"Component":{"type":"string"}},{"Version":{"type":"string"}}],"data":[{"Component":"Daemon","Version":"%{VERSION}"},{"Component":"Columnar","Version":"columnar %{VERSION}"},{"Component":"Secondary","Version":"secondary %{VERSION}"},{"Component":"KNN","Version":"knn %{VERSION}"},{"Component":"Buddy","Version":"buddy %{VERSION}"}]}]
25+
[{"total":%{NUMBER},"error":"","warning":"","columns":[{"Component":{"type":"string"}},{"Version":{"type":"string"}}],"data":[{"Component":"Daemon","Version":"%{VERSION}"},{"Component":"Columnar","Version":"columnar %{VERSION}"},{"Component":"Secondary","Version":"secondary %{VERSION}"},{"Component":"Knn","Version":"knn %{VERSION}"},{"Component":"Embeddings","Version":"embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#"},{"Component":"Buddy","Version":"buddy %{VERSION}"}]}]

‎test/clt-tests/core/test-alter-rename-nightly.rec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
––– input –––
22
stdbuf -oL searchd; if timeout 10 grep -qm1 'accepting' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Started'; else echo 'Timeout or failed!'; fi
33
––– output –––
4-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
4+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
55
Copyright (c) 2001-2016, Andrew Aksyonoff
66
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
77
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
88
[#!/[0-9a-zA-Z\:\.\s]+/!#] [#!/[0-9]+/!#] using config file '/etc/manticoresearch/manticore.conf' (%{NUMBER} chars)...
9-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
9+
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)' ...
1010
listening on %{IPADDR}:9312 for sphinx and http(s)
1111
listening on %{IPADDR}:9306 for mysql
1212
listening on %{IPADDR}:9308 for sphinx and http(s)

‎test/clt-tests/core/test-buddy-max-connections-configuration.rec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ sed -i '/^searchd/a\ max_connections=1' /etc/manticoresearch/manticore.conf
44
––– input –––
55
rm -f /var/log/manticore/searchd.log; stdbuf -oL searchd --stopwait > /dev/null; stdbuf -oL searchd; if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore/searchd.log;fi;
66
––– output –––
7-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
7+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
88
Copyright (c) 2001-2016, Andrew Aksyonoff
99
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
1010
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
1111
[#!/[0-9a-zA-Z\:\.\s]+/!#] [#!/[0-9]+/!#] using config file '/etc/manticoresearch/manticore.conf' (%{NUMBER} chars)...
12-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
12+
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)' ...
1313
listening on %{IPADDR}:9312 for sphinx and http(s)
1414
listening on %{IPADDR}:9306 for mysql
1515
listening on %{IPADDR}:9308 for sphinx and http(s)
@@ -38,7 +38,7 @@ protocol: http
3838
––– input –––
3939
stdbuf -oL searchd --stopwait
4040
––– output –––
41-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
41+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
4242
Copyright (c) 2001-2016, Andrew Aksyonoff
4343
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
4444
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
@@ -50,12 +50,12 @@ sed -i '/^searchd/,/^}/s/max_connections=1/max_connections=2/' /etc/manticoresea
5050
––– input –––
5151
rm -f /var/log/manticore/searchd.log; stdbuf -oL searchd --stopwait > /dev/null; stdbuf -oL searchd; if timeout 10 grep -qm1 '\[BUDDY\] started' <(tail -n 1000 -f /var/log/manticore/searchd.log); then echo 'Buddy started!'; else echo 'Timeout or failed!'; cat /var/log/manticore/searchd.log;fi;
5252
––– output –––
53-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
53+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
5454
Copyright (c) 2001-2016, Andrew Aksyonoff
5555
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
5656
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
5757
[#!/[0-9a-zA-Z\:\.\s]+/!#] [#!/[0-9]+/!#] using config file '/etc/manticoresearch/manticore.conf' (%{NUMBER} chars)...
58-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
58+
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)' ...
5959
listening on %{IPADDR}:9312 for sphinx and http(s)
6060
listening on %{IPADDR}:9306 for mysql
6161
listening on %{IPADDR}:9308 for sphinx and http(s)

‎test/clt-tests/core/test-manticore-version-in-telemetry.rec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ timeout 60 bash -c 'grep -m 1 "labels:" <(tail -f /var/log/manticore/searchd.log
2424
"columnar_version": "%{VERSION}",
2525
"secondary_version": "%{VERSION}",
2626
"knn_version": "%{VERSION}",
27+
"embeddings_version": "%{VERSION}",
2728
"manticore_mode": "#!/[A-Za-z]+/!#",
2829
"manticore_binlog_enabled": "#!/\b(?:no|yes)\b/!#",
2930
"manticore_auto_optimize_enabled": "#!/\b(?:no|yes)\b/!#",

‎test/clt-tests/expected-errors/start-searchd.recb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ apt-get -y remove 'manticore-buddy' > /dev/null; echo $?
55
––– input –––
66
stdbuf -oL searchd
77
––– output –––
8-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
8+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
99
Copyright (c) 2001-2016, Andrew Aksyonoff
1010
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
1111
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
1212
[#!/[0-9a-zA-Z\:\.\s]+/!#] [%{NUMBER}] using config file '%{PATH}' (%{NUMBER} chars)...
13-
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})' ...
13+
starting daemon version '%{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)' ...
1414
listening on %{IPADDR}:9312 for sphinx and http(s)
1515
listening on %{IPADDR}:9306 for mysql
1616
listening on %{IPADDR}:9308 for sphinx and http(s)

‎test/clt-tests/indexer-latest-mysql-postgres/indexer-latest-mysql-postgres.rec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ timeout 30 grep -m2 "Plugin ready for connections" <(docker logs -f mysql 2>&1)
2727
––– input –––
2828
docker run --network=t_network --platform linux/x86_64 --name manticore -v ./test/clt-tests/indexer-latest-mysql-postgres/min_mysql.conf:/min_mysql.conf ghcr.io/manticoresoftware/manticoresearch:test-kit-latest indexer --all -c /min_mysql.conf
2929
––– output –––
30-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
30+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
3131
Copyright (c) 2001-2016, Andrew Aksyonoff
3232
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
3333
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)
@@ -53,7 +53,7 @@ timeout 30 grep -m2 'database system is ready to accept connections' <(docker lo
5353
––– input –––
5454
docker run --network=t_network --platform linux/x86_64 --name manticore2 -v ./test/clt-tests/indexer-latest-mysql-postgres/min_postgres.sql:/min_postgres.sql ghcr.io/manticoresoftware/manticoresearch:test-kit-latest indexer --all -c /min_postgres.sql
5555
––– output –––
56-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
56+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
5757
Copyright (c) 2001-2016, Andrew Aksyonoff
5858
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
5959
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)

‎test/clt-tests/installation/deb-dev-install.rec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ apt-get install -y manticore manticore-extra > /dev/null 2>&1; echo $?
3434
––– input –––
3535
stdbuf -oL searchd --version
3636
––– output –––
37-
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION})
37+
Manticore %{VERSION} (columnar %{VERSION}) (secondary %{VERSION}) (knn %{VERSION}) (embeddings #!/([0-9]+\.[0-9]+\.[0-9]+)/!#)
3838
Copyright (c) 2001-2016, Andrew Aksyonoff
3939
Copyright (c) 2008-2016, Sphinx Technologies Inc (http://sphinxsearch.com)
4040
Copyright (c) 2017-%{YEAR}, Manticore Software LTD (https://manticoresearch.com)

0 commit comments

Comments
 (0)