Skip to content

Commit

Permalink
[ML] Removing last traces of system_annotations_retention_days
Browse files Browse the repository at this point in the history
Remove the last bits of code after the backport PR (elastic#76113)
is merged.

Followup to elastic#76096
  • Loading branch information
droberts195 committed Aug 4, 2021
1 parent 7ac5ea3 commit b9ec864
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 25 deletions.
7 changes: 0 additions & 7 deletions x-pack/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,6 @@ def v7compatibilityNotSupportedTests = {
'rollup/start_job/Test start job twice',
'service_accounts/10_basic/Test service account tokens', // https://github.com/elastic/elasticsearch/pull/75200

// temporarily muted awaiting backport of https://github.com/elastic/elasticsearch/pull/76097
'ml/delete_expired_data/Test delete expired data with body parameters',
'ml/delete_expired_data/Test delete expired data with no body',
'ml/delete_expired_data/Test delete expired data with path parameters',
'ml/delete_expired_data/Test delete expired data with unknown job id',
'ml/jobs_crud/Test update job',

// a type field was added to cat.ml_trained_models #73660, this is a backwards compatible change.
// still this is a cat api, and we don't support them with rest api compatibility. (the test would be very hard to transform too)
'ml/trained_model_cat_apis/Test cat trained models'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,6 @@ public Job(StreamInput in) throws IOException {
modelSnapshotRetentionDays = in.readOptionalLong();
dailyModelSnapshotRetentionAfterDays = in.readOptionalLong();
resultsRetentionDays = in.readOptionalLong();
if (in.getVersion().onOrAfter(Version.V_7_15_0) && in.getVersion().before(Version.V_8_0_0)) {
/* systemAnnotationsRetentionDays = */ in.readOptionalLong();
}
Map<String, Object> readCustomSettings = in.readMap();
customSettings = readCustomSettings == null ? null : Collections.unmodifiableMap(readCustomSettings);
modelSnapshotId = in.readOptionalString();
Expand Down Expand Up @@ -529,9 +526,6 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalLong(modelSnapshotRetentionDays);
out.writeOptionalLong(dailyModelSnapshotRetentionAfterDays);
out.writeOptionalLong(resultsRetentionDays);
if (out.getVersion().onOrAfter(Version.V_7_15_0) && out.getVersion().before(Version.V_8_0_0)) {
out.writeOptionalLong(resultsRetentionDays);
}
out.writeMap(customSettings);
out.writeOptionalString(modelSnapshotId);
if (modelSnapshotMinVersion != null) {
Expand Down Expand Up @@ -779,9 +773,6 @@ public Builder(StreamInput in) throws IOException {
modelSnapshotRetentionDays = in.readOptionalLong();
dailyModelSnapshotRetentionAfterDays = in.readOptionalLong();
resultsRetentionDays = in.readOptionalLong();
if (in.getVersion().onOrAfter(Version.V_7_15_0) && in.getVersion().before(Version.V_8_0_0)) {
/* systemAnnotationsRetentionDays = */ in.readOptionalLong();
}
customSettings = in.readMap();
modelSnapshotId = in.readOptionalString();
if (in.readBoolean()) {
Expand Down Expand Up @@ -1009,9 +1000,6 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalLong(modelSnapshotRetentionDays);
out.writeOptionalLong(dailyModelSnapshotRetentionAfterDays);
out.writeOptionalLong(resultsRetentionDays);
if (out.getVersion().onOrAfter(Version.V_7_15_0) && out.getVersion().before(Version.V_8_0_0)) {
out.writeOptionalLong(resultsRetentionDays);
}
out.writeMap(customSettings);
out.writeOptionalString(modelSnapshotId);
if (modelSnapshotMinVersion != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ public JobUpdate(StreamInput in) throws IOException {
modelSnapshotRetentionDays = in.readOptionalLong();
dailyModelSnapshotRetentionAfterDays = in.readOptionalLong();
resultsRetentionDays = in.readOptionalLong();
if (in.getVersion().onOrAfter(Version.V_7_15_0) && in.getVersion().before(Version.V_8_0_0)) {
/* systemAnnotationsRetentionDays = */ in.readOptionalLong();
}
if (in.readBoolean()) {
categorizationFilters = in.readStringList();
} else {
Expand Down Expand Up @@ -192,9 +189,6 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalLong(modelSnapshotRetentionDays);
out.writeOptionalLong(dailyModelSnapshotRetentionAfterDays);
out.writeOptionalLong(resultsRetentionDays);
if (out.getVersion().onOrAfter(Version.V_7_15_0) && out.getVersion().before(Version.V_8_0_0)) {
out.writeOptionalLong(resultsRetentionDays);
}
out.writeBoolean(categorizationFilters != null);
if (categorizationFilters != null) {
out.writeStringCollection(categorizationFilters);
Expand Down

0 comments on commit b9ec864

Please sign in to comment.