Skip to content

Commit 366a4b0

Browse files
vladvildanovvladvildanov
committed
Merge branch 'v2.x' of github.com:predis/predis into vv-indexing-empty-values
2 parents d35cac6 + 8c2aac4 commit 366a4b0

File tree

3 files changed

+237
-0
lines changed

3 files changed

+237
-0
lines changed

‎src/Command/Argument/Search/SchemaFields/GeoShapeField.php

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2023 Till Krüss
8+
*
9+
* For the full copyright and license information, please view the LICENSE
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Predis\Command\Argument\Search\SchemaFields;
14+
15+
class GeoShapeField extends AbstractField
16+
{
17+
public const COORD_FLAT = 'FLAT';
18+
19+
/**
20+
* @param string $identifier
21+
* @param string $alias
22+
* @param bool|string $sortable
23+
* @param bool $noIndex
24+
* @param string|null $coordSystem Constants that represents available systems available on a class level.
25+
*/
26+
public function __construct(
27+
string $identifier,
28+
string $alias = '',
29+
$sortable = self::NOT_SORTABLE,
30+
bool $noIndex = false,
31+
?string $coordSystem = null
32+
) {
33+
$this->fieldArguments[] = $identifier;
34+
35+
if ($alias !== '') {
36+
$this->fieldArguments[] = 'AS';
37+
$this->fieldArguments[] = $alias;
38+
}
39+
40+
$this->fieldArguments[] = 'GEOSHAPE';
41+
42+
if (null !== $coordSystem) {
43+
$this->fieldArguments[] = $coordSystem;
44+
}
45+
46+
if ($sortable === self::SORTABLE) {
47+
$this->fieldArguments[] = 'SORTABLE';
48+
} elseif ($sortable === self::SORTABLE_UNF) {
49+
$this->fieldArguments[] = 'SORTABLE';
50+
$this->fieldArguments[] = 'UNF';
51+
}
52+
53+
if ($noIndex) {
54+
$this->fieldArguments[] = 'NOINDEX';
55+
}
56+
}
57+
}

‎tests/Predis/Command/Argument/Search/SchemaFields/GeoShapeFieldTest.php

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Predis package.
5+
*
6+
* (c) 2009-2020 Daniele Alessandri
7+
* (c) 2021-2023 Till Krüss
8+
*
9+
* For the full copyright and license information, please view the LICENSE
10+
* file that was distributed with this source code.
11+
*/
12+
13+
namespace Predis\Command\Argument\Search\SchemaFields;
14+
15+
use PHPUnit\Framework\TestCase;
16+
17+
class GeoShapeFieldTest extends TestCase
18+
{
19+
/**
20+
* @dataProvider geoFieldsProvider
21+
* @param array $arguments
22+
* @param array $expectedSchema
23+
* @return void
24+
*/
25+
public function testReturnsCorrectFieldArgumentsArray(
26+
array $arguments,
27+
array $expectedSchema
28+
): void {
29+
$this->assertSame($expectedSchema, (new GeoShapeField(...$arguments))->toArray());
30+
}
31+
32+
public function geoFieldsProvider(): array
33+
{
34+
return [
35+
'with default arguments' => [
36+
['field_name'],
37+
['field_name', 'GEOSHAPE'],
38+
],
39+
'with alias' => [
40+
['field_name', 'fn'],
41+
['field_name', 'AS', 'fn', 'GEOSHAPE'],
42+
],
43+
'with sortable - no UNF' => [
44+
['field_name', '', AbstractField::SORTABLE],
45+
['field_name', 'GEOSHAPE', 'SORTABLE'],
46+
],
47+
'with sortable - with UNF' => [
48+
['field_name', '', AbstractField::SORTABLE_UNF],
49+
['field_name', 'GEOSHAPE', 'SORTABLE', 'UNF'],
50+
],
51+
'with NOINDEX modifier' => [
52+
['field_name', '', AbstractField::NOT_SORTABLE, true],
53+
['field_name', 'GEOSHAPE', 'NOINDEX'],
54+
],
55+
'with FLAT modifier' => [
56+
['field_name', '', AbstractField::NOT_SORTABLE, false, GeoShapeField::COORD_FLAT],
57+
['field_name', 'GEOSHAPE', 'FLAT'],
58+
],
59+
];
60+
}
61+
}

‎tests/Predis/Command/Redis/Search/FTSEARCH_Test.php

+119
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
namespace Predis\Command\Redis\Search;
1414

1515
use Predis\Command\Argument\Search\CreateArguments;
16+
use Predis\Command\Argument\Search\SchemaFields\AbstractField;
17+
use Predis\Command\Argument\Search\SchemaFields\GeoShapeField;
1618
use Predis\Command\Argument\Search\SchemaFields\NumericField;
1719
use Predis\Command\Argument\Search\SchemaFields\TextField;
1820
use Predis\Command\Argument\Search\SearchArguments;
@@ -224,6 +226,123 @@ public function testSearchJsonEmptyValues(): void
224226
$redis->ftsearch('idx', '@text_not_empty:("")', $searchArgs);
225227
}
226228

229+
/**
230+
* @group connected
231+
* @group relay-resp3
232+
* @return void
233+
* @requiresRediSearchVersion >= 2.9.0
234+
*/
235+
public function testGeoSearchQueriesIntersectsAndDisjoint(): void
236+
{
237+
$redis = $this->getClient();
238+
239+
$redis->hset('geo:doc_point1', 'g', 'POINT (10 10)');
240+
$redis->hset('geo:doc_point2', 'g', 'POINT (50 50)');
241+
$redis->hset('geo:doc_polygon1', 'g', 'POLYGON ((20 20, 25 35, 35 25, 20 20))');
242+
$redis->hset('geo:doc_polygon2', 'g', 'POLYGON ((60 60, 65 75, 70 70, 65 55, 60 60))');
243+
244+
$ftCreateArguments = new CreateArguments();
245+
$ftCreateArguments->prefix(['geo:']);
246+
247+
$schema = [
248+
new GeoShapeField('g', '', AbstractField::NOT_SORTABLE, false, GeoShapeField::COORD_FLAT),
249+
];
250+
251+
$ftCreateResponse = $redis->ftcreate('idx_geo', $schema, $ftCreateArguments);
252+
$this->assertEquals('OK', $ftCreateResponse);
253+
254+
$ftSearchArguments = new SearchArguments();
255+
$ftSearchArguments->params(['shape', 'POLYGON ((15 15, 75 15, 50 70, 20 40, 15 15))']);
256+
$ftSearchArguments->noContent();
257+
$ftSearchArguments->dialect(3);
258+
259+
$actualResponse = $redis->ftsearch('idx_geo', '@g:[intersects $shape]', $ftSearchArguments);
260+
$this->assertSameValues(
261+
[
262+
2,
263+
'geo:doc_polygon1',
264+
'geo:doc_point2',
265+
], $actualResponse
266+
);
267+
268+
$actualResponse = $redis->ftsearch('idx_geo', '@g:[disjoint $shape]', $ftSearchArguments);
269+
$this->assertSameValues(
270+
[
271+
2,
272+
'geo:doc_polygon2',
273+
'geo:doc_point1',
274+
], $actualResponse
275+
);
276+
}
277+
278+
/**
279+
* @group connected
280+
* @group relay-resp3
281+
* @return void
282+
* @requiresRediSearchVersion >= 2.9.0
283+
*/
284+
public function testGeoSearchQueriesContainsAndWithin(): void
285+
{
286+
$redis = $this->getClient();
287+
288+
$redis->hset('geo:doc_point1', 'g', 'POINT (10 10)');
289+
$redis->hset('geo:doc_point2', 'g', 'POINT (50 50)');
290+
$redis->hset('geo:doc_polygon1', 'g', 'POLYGON ((20 20, 25 35, 35 25, 20 20))');
291+
$redis->hset('geo:doc_polygon2', 'g', 'POLYGON ((60 60, 65 75, 70 70, 65 55, 60 60))');
292+
293+
$ftCreateArguments = new CreateArguments();
294+
$ftCreateArguments->prefix(['geo:']);
295+
296+
$schema = [
297+
new GeoShapeField('g', '',
298+
AbstractField::NOT_SORTABLE, false, GeoShapeField::COORD_FLAT
299+
),
300+
];
301+
302+
$ftCreateResponse = $redis->ftcreate('idx_geo', $schema, $ftCreateArguments);
303+
$this->assertEquals('OK', $ftCreateResponse);
304+
305+
$ftSearchArguments = new SearchArguments();
306+
$ftSearchArguments->params(['shape', 'POINT(25 25)']);
307+
$ftSearchArguments->noContent();
308+
$ftSearchArguments->dialect(3);
309+
310+
$actualResponse = $redis->ftsearch('idx_geo', '@g:[contains $shape]', $ftSearchArguments);
311+
$this->assertSameValues(
312+
[
313+
1,
314+
'geo:doc_polygon1',
315+
], $actualResponse
316+
);
317+
318+
$ftSearchArguments = new SearchArguments();
319+
$ftSearchArguments->params(['shape', 'POLYGON((24 24, 24 26, 25 25, 24 24))']);
320+
$ftSearchArguments->noContent();
321+
$ftSearchArguments->dialect(3);
322+
323+
$actualResponse = $redis->ftsearch('idx_geo', '@g:[contains $shape]', $ftSearchArguments);
324+
$this->assertSameValues(
325+
[
326+
1,
327+
'geo:doc_polygon1',
328+
], $actualResponse
329+
);
330+
331+
$ftSearchArguments = new SearchArguments();
332+
$ftSearchArguments->params(['shape', 'POLYGON((15 15, 75 15, 50 70, 20 40, 15 15))']);
333+
$ftSearchArguments->noContent();
334+
$ftSearchArguments->dialect(3);
335+
336+
$actualResponse = $redis->ftsearch('idx_geo', '@g:[within $shape]', $ftSearchArguments);
337+
$this->assertSameValues(
338+
[
339+
2,
340+
'geo:doc_polygon1',
341+
'geo:doc_point2',
342+
], $actualResponse
343+
);
344+
}
345+
227346
public function argumentsProvider(): array
228347
{
229348
return [

0 commit comments

Comments
 (0)