Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON Module rewrite with custom JSONPath implementation #974

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
+6,601 −407
Open

JSON Module rewrite with custom JSONPath implementation #974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2463f3a
Initial commit of Json Module rewrite
Vijay-Nirmal Jan 27, 2025
71617ee
Changed Test to use JsonNode directly
Vijay-Nirmal Jan 27, 2025
c3b0ad1
Implementation of JSON.GET and SET commands
Vijay-Nirmal Jan 29, 2025
7b534a6
Moved other moduels from Json BDN
Vijay-Nirmal Jan 29, 2025
7650f5f
Added more benchmark
Vijay-Nirmal Jan 29, 2025
6c9c347
Moved json modulke to root location
Vijay-Nirmal Feb 1, 2025
50633a0
Updated Licenses
Vijay-Nirmal Feb 1, 2025
e2eaa0a
Added documentation
Vijay-Nirmal Feb 1, 2025
dce580f
Code cleanup and code comments
Vijay-Nirmal Feb 1, 2025
005e98d
Merge branch 'main' into new/json-module-rewrite
Vijay-Nirmal Feb 1, 2025
0265708
Fixed code format
Vijay-Nirmal Feb 1, 2025
ebb4f25
Fixed build issue
Vijay-Nirmal Feb 1, 2025
46d27b3
Added more test cases
Vijay-Nirmal Feb 1, 2025
84c0aca
Added more test cases
Vijay-Nirmal Feb 1, 2025
02b6077
Fix formating
Vijay-Nirmal Feb 14, 2025
a32bd7e
Merged latest
Vijay-Nirmal Feb 14, 2025
919e2b4
Add expected values for ACL and AOF operations in benchmark config
Vijay-Nirmal Feb 14, 2025
bc6483d
Merge branch 'main' into new/json-module-rewrite
Vijay-Nirmal Feb 14, 2025
a12baba
Fixed test case failure
Vijay-Nirmal Feb 14, 2025
23d4ca3
Merge branch 'main' into new/json-module-rewrite
Vijay-Nirmal Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved json modulke to root location
  • Loading branch information
@Vijay-Nirmal
Vijay-Nirmal committed Feb 1, 2025
commit 6c9c34793204f41753ece6b82c0ba940505cfbb3
25 changes: 14 additions & 11 deletions Garnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommandInfoUpdater", "playg
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleModule", "playground\SampleModule\SampleModule.csproj", "{A8CA619E-8F13-4EF8-943F-2D5E3FEBFB3F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GarnetJSON", "playground\GarnetJSON\GarnetJSON.csproj", "{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MigrateBench", "playground\MigrateBench\MigrateBench.csproj", "{6B66B394-E410-4B61-9A5A-1595FF6F5E08}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosting", "hosting", "{01823EA4-4446-4D66-B268-DFEE55951964}"
Expand All @@ -111,6 +109,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Garnet.resources", "libs\re
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoOpModule", "playground\NoOpModule\NoOpModule.csproj", "{D4C9A1A0-7053-F072-21F5-4E0C5827136D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{D8A9CE6E-91B9-4B84-B44A-2BCF1161A793}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GarnetJSON", "modules\GarnetJSON\GarnetJSON.csproj", "{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -295,14 +297,6 @@ Global
{A8CA619E-8F13-4EF8-943F-2D5E3FEBFB3F}.Release|Any CPU.Build.0 = Release|Any CPU
{A8CA619E-8F13-4EF8-943F-2D5E3FEBFB3F}.Release|x64.ActiveCfg = Release|Any CPU
{A8CA619E-8F13-4EF8-943F-2D5E3FEBFB3F}.Release|x64.Build.0 = Release|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Debug|x64.ActiveCfg = Debug|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Debug|x64.Build.0 = Debug|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Release|Any CPU.Build.0 = Release|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Release|x64.ActiveCfg = Release|Any CPU
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F}.Release|x64.Build.0 = Release|Any CPU
{6B66B394-E410-4B61-9A5A-1595FF6F5E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6B66B394-E410-4B61-9A5A-1595FF6F5E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B66B394-E410-4B61-9A5A-1595FF6F5E08}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -335,6 +329,14 @@ Global
{D4C9A1A0-7053-F072-21F5-4E0C5827136D}.Release|Any CPU.Build.0 = Release|Any CPU
{D4C9A1A0-7053-F072-21F5-4E0C5827136D}.Release|x64.ActiveCfg = Release|Any CPU
{D4C9A1A0-7053-F072-21F5-4E0C5827136D}.Release|x64.Build.0 = Release|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Debug|x64.ActiveCfg = Debug|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Debug|x64.Build.0 = Debug|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Release|Any CPU.Build.0 = Release|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Release|x64.ActiveCfg = Release|Any CPU
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -364,14 +366,15 @@ Global
{9F6E4734-6341-4A9C-A7FF-636A39D8BEAD} = {346A5A53-51E4-4A75-B7E6-491D950382CE}
{9BE474A2-1547-43AC-B4F2-FB48A01FA995} = {69A71E2C-00E3-42F3-854E-BE157A24834E}
{A8CA619E-8F13-4EF8-943F-2D5E3FEBFB3F} = {69A71E2C-00E3-42F3-854E-BE157A24834E}
{2C8F1F5D-31E5-4D00-A46E-F3B1D9BC098F} = {69A71E2C-00E3-42F3-854E-BE157A24834E}
{6B66B394-E410-4B61-9A5A-1595FF6F5E08} = {69A71E2C-00E3-42F3-854E-BE157A24834E}
{697766CD-2046-46D9-958A-0FD3B46C98D4} = {01823EA4-4446-4D66-B268-DFEE55951964}
{DF2DD03E-87EE-482A-9FBA-6C8FBC23BDC5} = {697766CD-2046-46D9-958A-0FD3B46C98D4}
{A48412B4-FD60-467E-A5D9-F155CAB4F907} = {147FCE31-EC09-4C90-8E4D-37CA87ED18C3}
{D4C9A1A0-7053-F072-21F5-4E0C5827136D} = {69A71E2C-00E3-42F3-854E-BE157A24834E}
{1A5DF817-D0DD-4F0B-AE3A-C9CD0E03C9D5} = {D8A9CE6E-91B9-4B84-B44A-2BCF1161A793}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
FileExplorer =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks weird, should this be here?

SolutionGuid = {2C02C405-4798-41CA-AF98-61EDFEF6772E}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion benchmark/BDN.benchmark/BDN.benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ProjectReference Include="..\..\libs\host\Garnet.host.csproj" />
<ProjectReference Include="..\..\libs\common\Garnet.common.csproj" />
<ProjectReference Include="..\..\libs\server\Garnet.server.csproj" />
<ProjectReference Include="..\..\playground\GarnetJSON\GarnetJSON.csproj" />
<ProjectReference Include="..\..\modules\GarnetJSON\GarnetJSON.csproj" />
<ProjectReference Include="..\..\playground\NoOpModule\NoOpModule.csproj" />
</ItemGroup>

Expand Down
0 playground/GarnetJSON/GarnetJSON.csproj → modules/GarnetJSON/GarnetJSON.csproj
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/GarnetJsonObject.cs → modules/GarnetJSON/GarnetJsonObject.cs
View file
Open in desktop
File renamed without changes.
0 ...d/GarnetJSON/JSONPath/ArrayIndexFilter.cs → ...s/GarnetJSON/JSONPath/ArrayIndexFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...JSON/JSONPath/ArrayMultipleIndexFilter.cs → ...JSON/JSONPath/ArrayMultipleIndexFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...d/GarnetJSON/JSONPath/ArraySliceFilter.cs → ...s/GarnetJSON/JSONPath/ArraySliceFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...ground/GarnetJSON/JSONPath/FieldFilter.cs → modules/GarnetJSON/JSONPath/FieldFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...arnetJSON/JSONPath/FieldMultipleFilter.cs → ...arnetJSON/JSONPath/FieldMultipleFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...und/GarnetJSON/JSONPath/JsonExtensions.cs → ...les/GarnetJSON/JSONPath/JsonExtensions.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JSONPath/JsonPath.cs → modules/GarnetJSON/JSONPath/JsonPath.cs
View file
Open in desktop
File renamed without changes.
0 ...GarnetJSON/JSONPath/JsonSelectSettings.cs → ...GarnetJSON/JSONPath/JsonSelectSettings.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JSONPath/PathFilter.cs → modules/GarnetJSON/JSONPath/PathFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...nd/GarnetJSON/JSONPath/QueryExpression.cs → ...es/GarnetJSON/JSONPath/QueryExpression.cs
View file
Open in desktop
File renamed without changes.
0 ...ground/GarnetJSON/JSONPath/QueryFilter.cs → modules/GarnetJSON/JSONPath/QueryFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...nd/GarnetJSON/JSONPath/QueryScanFilter.cs → ...es/GarnetJSON/JSONPath/QueryScanFilter.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JSONPath/RootFilter.cs → modules/GarnetJSON/JSONPath/RootFilter.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JSONPath/ScanFilter.cs → modules/GarnetJSON/JSONPath/ScanFilter.cs
View file
Open in desktop
File renamed without changes.
0 ...GarnetJSON/JSONPath/ScanMultipleFilter.cs → ...GarnetJSON/JSONPath/ScanMultipleFilter.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JsonCmdStrings.cs → modules/GarnetJSON/JsonCmdStrings.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/JsonCommands.cs → modules/GarnetJSON/JsonCommands.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/Module.cs → modules/GarnetJSON/Module.cs
View file
Open in desktop
File renamed without changes.
0 playground/GarnetJSON/RespJsonEnums.cs → modules/GarnetJSON/RespJsonEnums.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/Garnet.test/Garnet.test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<ProjectReference Include="..\..\libs\host\Garnet.host.csproj" />
<ProjectReference Include="..\..\libs\server\Garnet.server.csproj" />
<ProjectReference Include="..\..\libs\storage\Tsavorite\cs\src\devices\AzureStorageDevice\Tsavorite.devices.AzureStorageDevice.csproj" />
<ProjectReference Include="..\..\playground\GarnetJSON\GarnetJSON.csproj" />
<ProjectReference Include="..\..\modules\GarnetJSON\GarnetJSON.csproj" />
<ProjectReference Include="..\..\playground\NoOpModule\NoOpModule.csproj" />
</ItemGroup>

Expand Down
Loading