Skip to content

Commit 8298d4c

Browse files
NickCraverNickCraver
authored
NRediSearch split (StackExchange#1890)
PR to complete split of NRediSearch library into a sibling repo, now located at StackExchange/NRediSearch
1 parent f0e485d commit 8298d4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3
-6561
lines changed

‎.devcontainer/TestConfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"SecureServer": "redis",
55
"FailoverMasterServer": "redis",
66
"FailoverReplicaServer": "redis",
7-
"RediSearchServer": "redisearch",
87
"IPv4Server": "redis",
98
"RemoteServer": "redis",
109
"SentinelServer": "redis",

‎.devcontainer/docker-compose.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@ services:
1212
- ./TestConfig.json:/workspace/tests/StackExchange.Redis.Tests/TestConfig.json:ro
1313
depends_on:
1414
- redis
15-
- redisearch
1615
links:
1716
- "redis:redis"
18-
- "redisearch:redisearch"
1917
command: /bin/sh -c "while sleep 1000; do :; done"
2018
redis:
2119
build:
2220
context: ../tests/RedisConfigs
2321
dockerfile: Dockerfile
2422
sysctls :
25-
net.core.somaxconn: '511'
26-
redisearch:
27-
image: redislabs/redisearch:latest
23+
net.core.somaxconn: '511'

‎.github/workflows/CI.yml

-33
Original file line numberDiff line numberDiff line change
@@ -41,39 +41,6 @@ jobs:
4141
- name: .NET Lib Pack
4242
run: dotnet pack src/StackExchange.Redis/StackExchange.Redis.csproj --no-build -c Release /p:Packing=true /p:PackageOutputPath=%CD%\.nupkgs /p:CI=true
4343

44-
nredisearch:
45-
name: NRediSearch (Ubuntu)
46-
runs-on: ubuntu-latest
47-
services:
48-
redisearch:
49-
image: redislabs/redisearch:latest
50-
ports:
51-
- 6385:6379
52-
steps:
53-
- name: Checkout code
54-
uses: actions/checkout@v1
55-
- name: Setup .NET Core 3.x
56-
uses: actions/setup-dotnet@v1
57-
with:
58-
dotnet-version: '3.1.x'
59-
- name: Setup .NET 5.x
60-
uses: actions/setup-dotnet@v1
61-
with:
62-
dotnet-version: '5.0.x'
63-
- name: .NET Build
64-
run: dotnet build Build.csproj -c Release /p:CI=true
65-
- name: NRedisSearch.Tests
66-
run: dotnet test tests/NRediSearch.Test/NRediSearch.Test.csproj -c Release --logger trx --results-directory ./test-results/ /p:CI=true
67-
- uses: dorny/test-reporter@v1
68-
continue-on-error: true
69-
if: success() || failure()
70-
with:
71-
name: NRedisSearch.Tests - Results
72-
path: 'test-results/*.trx'
73-
reporter: dotnet-trx
74-
- name: .NET Lib Pack
75-
run: dotnet pack src/NRediSearch/NRediSearch.csproj --no-build -c Release /p:Packing=true /p:PackageOutputPath=%CD%\.nupkgs /p:CI=true
76-
7744
windows:
7845
name: StackExchange.Redis (Windows Server 2019)
7946
runs-on: windows-2019

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@ MyGet Pre-release feed: https://www.myget.org/gallery/stackoverflow
1414
| Package | NuGet Stable | NuGet Pre-release | Downloads | MyGet |
1515
| ------- | ------------ | ----------------- | --------- | ----- |
1616
| [StackExchange.Redis](https://www.nuget.org/packages/StackExchange.Redis/) | [![StackExchange.Redis](https://img.shields.io/nuget/v/StackExchange.Redis.svg)](https://www.nuget.org/packages/StackExchange.Redis/) | [![StackExchange.Redis](https://img.shields.io/nuget/vpre/StackExchange.Redis.svg)](https://www.nuget.org/packages/StackExchange.Redis/) | [![StackExchange.Redis](https://img.shields.io/nuget/dt/StackExchange.Redis.svg)](https://www.nuget.org/packages/StackExchange.Redis/) | [![StackExchange.Redis MyGet](https://img.shields.io/myget/stackoverflow/vpre/StackExchange.Redis.svg)](https://www.myget.org/feed/stackoverflow/package/nuget/StackExchange.Redis) |
17-
| [NRediSearch](https://www.nuget.org/packages/NRediSearch/) | [![NRediSearch](https://img.shields.io/nuget/v/NRediSearch.svg)](https://www.nuget.org/packages/NRediSearch/) | [![NRediSearch](https://img.shields.io/nuget/vpre/NRediSearch.svg)](https://www.nuget.org/packages/NRediSearch/) | [![NRediSearch](https://img.shields.io/nuget/dt/NRediSearch.svg)](https://www.nuget.org/packages/NRediSearch/) | [![NRediSearch MyGet](https://img.shields.io/myget/stackoverflow/vpre/NRediSearch.svg)](https://www.myget.org/feed/stackoverflow/package/nuget/NRediSearch) |

‎StackExchange.Redis.sln

+2-22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.28531.58
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.0.31808.319
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3AD17044-6BFF-4750-9AC2-2CA466375F2A}"
66
ProjectSection(SolutionItems) = preProject
@@ -41,10 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackExchange.Redis.Tests",
4141
EndProject
4242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicTest", "tests\BasicTest\BasicTest.csproj", "{939FA5F7-16AA-4847-812B-6EBC3748A86D}"
4343
EndProject
44-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRediSearch", "src\NRediSearch\NRediSearch.csproj", "{71455B07-E628-4F3A-9FFF-9EC63071F78E}"
45-
EndProject
46-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NRediSearch.Test", "tests\NRediSearch.Test\NRediSearch.Test.csproj", "{94D233F5-2400-4542-98B9-BA72005C57DC}"
47-
EndProject
4844
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sentinel", "Sentinel", "{36255A0A-89EC-43C8-A642-F4C1ACAEF5BC}"
4945
ProjectSection(SolutionItems) = preProject
5046
tests\RedisConfigs\Sentinel\redis-7010.conf = tests\RedisConfigs\Sentinel\redis-7010.conf
@@ -137,12 +133,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{A9F81D
137133
tests\RedisConfigs\Docker\supervisord.conf = tests\RedisConfigs\Docker\supervisord.conf
138134
EndProjectSection
139135
EndProject
140-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RediSearch", "RediSearch", "{3FA2A7C6-DA16-4DEF-ACE0-34573A4AD430}"
141-
ProjectSection(SolutionItems) = preProject
142-
tests\RedisConfigs\RediSearch\redisearch-6385.conf = tests\RedisConfigs\RediSearch\redisearch-6385.conf
143-
tests\RedisConfigs\RediSearch\redisearch.md = tests\RedisConfigs\RediSearch\redisearch.md
144-
EndProjectSection
145-
EndProject
146136
Global
147137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
148138
Debug|Any CPU = Debug|Any CPU
@@ -161,14 +151,6 @@ Global
161151
{939FA5F7-16AA-4847-812B-6EBC3748A86D}.Debug|Any CPU.Build.0 = Debug|Any CPU
162152
{939FA5F7-16AA-4847-812B-6EBC3748A86D}.Release|Any CPU.ActiveCfg = Release|Any CPU
163153
{939FA5F7-16AA-4847-812B-6EBC3748A86D}.Release|Any CPU.Build.0 = Release|Any CPU
164-
{71455B07-E628-4F3A-9FFF-9EC63071F78E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165-
{71455B07-E628-4F3A-9FFF-9EC63071F78E}.Debug|Any CPU.Build.0 = Debug|Any CPU
166-
{71455B07-E628-4F3A-9FFF-9EC63071F78E}.Release|Any CPU.ActiveCfg = Release|Any CPU
167-
{71455B07-E628-4F3A-9FFF-9EC63071F78E}.Release|Any CPU.Build.0 = Release|Any CPU
168-
{94D233F5-2400-4542-98B9-BA72005C57DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169-
{94D233F5-2400-4542-98B9-BA72005C57DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
170-
{94D233F5-2400-4542-98B9-BA72005C57DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
171-
{94D233F5-2400-4542-98B9-BA72005C57DC}.Release|Any CPU.Build.0 = Release|Any CPU
172154
{8FDB623D-779B-4A84-BC6B-75106E41D8A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173155
{8FDB623D-779B-4A84-BC6B-75106E41D8A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
174156
{8FDB623D-779B-4A84-BC6B-75106E41D8A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -202,8 +184,6 @@ Global
202184
{EF84877F-59BE-41BE-9013-E765AF0BB72E} = {00CA0876-DA9F-44E8-B0DC-A88716BF347A}
203185
{3B8BD8F1-8BFC-4D8C-B4DA-25FFAF3D1DBE} = {73A5C363-CA1F-44C4-9A9B-EF791A76BA6A}
204186
{939FA5F7-16AA-4847-812B-6EBC3748A86D} = {73A5C363-CA1F-44C4-9A9B-EF791A76BA6A}
205-
{71455B07-E628-4F3A-9FFF-9EC63071F78E} = {00CA0876-DA9F-44E8-B0DC-A88716BF347A}
206-
{94D233F5-2400-4542-98B9-BA72005C57DC} = {73A5C363-CA1F-44C4-9A9B-EF791A76BA6A}
207187
{36255A0A-89EC-43C8-A642-F4C1ACAEF5BC} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
208188
{A3B4B972-5BD2-4D90-981F-7E51E350E628} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}
209189
{38BDEEED-7BEB-4B1F-9CE0-256D63F9C502} = {96E891CD-2ED7-4293-A7AB-4C6F5D8D2B05}

‎src/NRediSearch/AddOptions.cs

-66
This file was deleted.

‎src/NRediSearch/Aggregation/AggregationBuilder.cs

-150
This file was deleted.

0 commit comments

Comments
 (0)