Skip to content

Fix #2690: NRE in IndexSettingsConverter when merge policy isn't set #2692

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

Merged
merged 1 commit into from
Mar 28, 2017
Merged

Fix #2690: NRE in IndexSettingsConverter when merge policy isn't set #2692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/Nest/IndexModules/IndexSettings/Settings/IndexSettingsConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
d[UpdatableIndexSettings.TranslogFlushThresholdSize] = flush?.ThresholdSize;
d[UpdatableIndexSettings.TranslogFlushThresholdPeriod] = flush?.ThresholdPeriod;

d[UpdatableIndexSettings.MergePolicyExpungeDeletesAllowed] = ds.Merge?.Policy.ExpungeDeletesAllowed;
d[UpdatableIndexSettings.MergePolicyFloorSegment] = ds.Merge?.Policy.FloorSegment;
d[UpdatableIndexSettings.MergePolicyMaxMergeAtOnce] = ds.Merge?.Policy.MaxMergeAtOnce;
d[UpdatableIndexSettings.MergePolicyMaxMergeAtOnceExplicit] = ds.Merge?.Policy.MaxMergeAtOnceExplicit;
d[UpdatableIndexSettings.MergePolicyMaxMergedSegment] = ds.Merge?.Policy.MaxMergedSegment;
d[UpdatableIndexSettings.MergePolicySegmentsPerTier] = ds.Merge?.Policy.SegmentsPerTier;
d[UpdatableIndexSettings.MergePolicyReclaimDeletesWeight] = ds.Merge?.Policy.ReclaimDeletesWeight;
d[UpdatableIndexSettings.MergePolicyExpungeDeletesAllowed] = ds.Merge?.Policy?.ExpungeDeletesAllowed;
d[UpdatableIndexSettings.MergePolicyFloorSegment] = ds.Merge?.Policy?.FloorSegment;
d[UpdatableIndexSettings.MergePolicyMaxMergeAtOnce] = ds.Merge?.Policy?.MaxMergeAtOnce;
d[UpdatableIndexSettings.MergePolicyMaxMergeAtOnceExplicit] = ds.Merge?.Policy?.MaxMergeAtOnceExplicit;
d[UpdatableIndexSettings.MergePolicyMaxMergedSegment] = ds.Merge?.Policy?.MaxMergedSegment;
d[UpdatableIndexSettings.MergePolicySegmentsPerTier] = ds.Merge?.Policy?.SegmentsPerTier;
d[UpdatableIndexSettings.MergePolicyReclaimDeletesWeight] = ds.Merge?.Policy?.ReclaimDeletesWeight;

d[UpdatableIndexSettings.MergeSchedulerMaxThreadCount] = ds.Merge?.Scheduler?.MaxThreadCount;
d[UpdatableIndexSettings.MergeSchedulerAutoThrottle] = ds.Merge?.Scheduler?.AutoThrottle;
Expand Down
21 changes: 21 additions & 0 deletions src/Tests/Reproduce/GithubIssue2690.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
using FluentAssertions;
using Tests.Framework;

namespace Tests.Reproduce
{
public class GithubIssue2690
{
[U] public void EmptyPolicyCausesNullReferenceException()
{
var client = TestClient.GetInMemoryClient();
var response = client.CreateIndex("foo", c => c
.Settings(s => s
.Merge(m => m
.Scheduler(sch => sch.MaxThreadCount(1))
)
)
);
response.IsValid.Should().BeTrue();
}
}
}
1 change: 1 addition & 0 deletions src/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@
<Compile Include="Reproduce\GithubIssue2323.cs" />
<Compile Include="Reproduce\GithubIssue2409.cs" />
<Compile Include="Reproduce\GithubIssue2503.cs" />
<Compile Include="Reproduce\GithubIssue2690.cs" />
<Compile Include="Search\Hits\HitsSerializationTests.cs" />
<Compile Include="Search\MultiSearch\MultiSearchApiTests.cs" />
<Compile Include="Search\MultiSearch\MultiSearchInvalidApiTests.cs" />
Expand Down