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.

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

Support allow_duplicates on append processor #5208

Merged
merged 2 commits into from
Jan 7, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 8 additions & 0 deletions src/Nest/Ingest/Processors/AppendProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,17 @@ public interface IAppendProcessor : IProcessor

[DataMember(Name ="value")]
IEnumerable<object> Value { get; set; }

[DataMember(Name = "allow_duplicates")]
bool? AllowDuplicates { get; set; }
}

public class AppendProcessor : ProcessorBase, IAppendProcessor
{
public Field Field { get; set; }
public IEnumerable<object> Value { get; set; }
public bool? AllowDuplicates { get; set; }

protected override string Name => "append";
}

Expand All @@ -35,6 +40,7 @@ public class AppendProcessorDescriptor<T> : ProcessorDescriptorBase<AppendProces
protected override string Name => "append";
Field IAppendProcessor.Field { get; set; }
IEnumerable<object> IAppendProcessor.Value { get; set; }
bool? IAppendProcessor.AllowDuplicates { get; set; }

public AppendProcessorDescriptor<T> Field(Field field) => Assign(field, (a, v) => a.Field = v);

Expand All @@ -49,5 +55,7 @@ public AppendProcessorDescriptor<T> Value<TValue>(params TValue[] values) => Ass
a.Value = (v.First() as IEnumerable)?.Cast<object>();
else a.Value = v?.Cast<object>();
});

public AppendProcessorDescriptor<T> AllowDuplicates(bool allowDuplicates = true) => Assign(allowDuplicates, (a, v) => a.AllowDuplicates = v);
}
}
43 changes: 33 additions & 10 deletions tests/Tests/Ingest/ProcessorAssertions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using Elastic.Elasticsearch.Xunit.XunitPlumbing;
using Nest;
using Tests.Core.Client;
using Tests.Core.Extensions;
using Tests.Core.Xunit;
using Tests.Domain;

Expand Down Expand Up @@ -59,19 +60,41 @@ public static IPromise<IList<IProcessor>> Fluent(ProcessorsDescriptor d)

public class Append : ProcessorAssertion
{
public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent => d => d
.Append<Project>(a => a
.Field(p => p.State)
.Value(StateOfBeing.Stable, StateOfBeing.VeryActive)
);
public override Func<ProcessorsDescriptor, IPromise<IList<IProcessor>>> Fluent =>
d => d.Append<Project>(a =>
{
var apd = a.Field(p => p.State).Value(StateOfBeing.Stable, StateOfBeing.VeryActive);

public override IProcessor Initializer => new AppendProcessor
if (TestClient.Configuration.InRange(">=7.11.0"))
apd.AllowDuplicates(false);

return apd;
});

public override IProcessor Initializer
{
Field = "state",
Value = new object[] { StateOfBeing.Stable, StateOfBeing.VeryActive }
};
get
{
var ap = new AppendProcessor { Field = "state", Value = new object[] { StateOfBeing.Stable, StateOfBeing.VeryActive } };

if (TestClient.Configuration.InRange(">=7.11.0"))
stevejgordon marked this conversation as resolved.
Show resolved Hide resolved
ap.AllowDuplicates = false;

return ap;
}
}

public override object Json
{
get
{
if (TestClient.Configuration.InRange(">=7.11.0"))
return new { field = "state", value = new[] { "Stable", "VeryActive" }, allow_duplicates = false };

return new { field = "state", value = new[] { "Stable", "VeryActive" } };
}
}

public override object Json => new { field = "state", value = new[] { "Stable", "VeryActive" } };
public override string Key => "append";
}

Expand Down