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

Implement first stages of the ZDT migration algorithm #152219

Merged
merged 32 commits into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1a5cc56
add model version compare base utils
pgayvallet Feb 27, 2023
e5c341a
add compare function
pgayvallet Feb 27, 2023
087bc30
work in progress
pgayvallet Feb 28, 2023
b647ac7
update unit tests for init stage
pgayvallet Feb 28, 2023
8951569
build mappings for initial index creation
pgayvallet Feb 28, 2023
d2e9a4f
continue the implementation
pgayvallet Feb 28, 2023
e891e15
adding first integration test
pgayvallet Mar 1, 2023
6fd0bb3
implement update mapping part - untested
pgayvallet Mar 1, 2023
78efa7d
remove dead code
pgayvallet Mar 1, 2023
4dc5d87
adding mapping test
pgayvallet Mar 1, 2023
361c8e3
Merge remote-tracking branch 'upstream/main' into kbn-150309-base-zdt…
pgayvallet Mar 1, 2023
7822670
update the meta too
pgayvallet Mar 1, 2023
f0e394d
fix tests
pgayvallet Mar 1, 2023
c5b51e8
remove unused stage
pgayvallet Mar 1, 2023
affe313
fix ts errors
pgayvallet Mar 1, 2023
8a05ba2
update doc
pgayvallet Mar 1, 2023
0d0d51e
more doc
pgayvallet Mar 1, 2023
ecb4535
self review / nits
pgayvallet Mar 1, 2023
c424058
review nits
pgayvallet Mar 2, 2023
4c1fce6
add some unit tests
pgayvallet Mar 2, 2023
6d0b3f0
extract createDelayFn
pgayvallet Mar 6, 2023
7bfb926
tsdoc
pgayvallet Mar 6, 2023
d615419
add more unit tests on stages
pgayvallet Mar 6, 2023
ae22351
last stage unit tests
pgayvallet Mar 6, 2023
a70b1f3
just some doc
pgayvallet Mar 6, 2023
0cd232e
some utils unit tests
pgayvallet Mar 6, 2023
19a82b1
more unit tests
pgayvallet Mar 6, 2023
5bb6732
add integration test on mapping version mismatch
pgayvallet Mar 6, 2023
97f8de0
Merge remote-tracking branch 'upstream/main' into kbn-150309-base-zdt…
pgayvallet Mar 6, 2023
c033770
more utility unit tests
pgayvallet Mar 6, 2023
1d244db
review nits
pgayvallet Mar 8, 2023
33a9d5e
Merge remote-tracking branch 'upstream/main' into kbn-150309-base-zdt…
pgayvallet Mar 8, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,15 @@ export {
isVirtualModelVersion,
virtualVersionToModelVersion,
modelVersionToVirtualVersion,
getModelVersionMapForTypes,
getLatestModelVersion,
type ModelVersionMap,
compareModelVersions,
type CompareModelVersionMapParams,
type CompareModelVersionStatus,
type CompareModelVersionDetails,
type CompareModelVersionResult,
getModelVersionsFromMappings,
getModelVersionsFromMappingMeta,
getModelVersionDelta,
} from './src/model_version';
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,24 @@ export interface IndexMapping {

/** @internal */
export interface IndexMappingMeta {
// A dictionary of key -> md5 hash (e.g. 'dashboard': '24234qdfa3aefa3wa')
// with each key being a root-level mapping property, and each value being
// the md5 hash of that mapping's value when the index was created.
/**
* A dictionary of key -> md5 hash (e.g. 'dashboard': '24234qdfa3aefa3wa')
* with each key being a root-level mapping property, and each value being
* the md5 hash of that mapping's value when the index was created.
*
* @remark: Only defined for indices using the v2 migration algorithm.
*/
migrationMappingPropertyHashes?: { [k: string]: string };
/**
* The current model versions of the mapping of the index.
*
* @remark: Only defined for indices using the zdt migration algorithm.
*/
mappingVersions?: { [k: string]: number };
Comment on lines +68 to +73
Copy link
Contributor Author

Choose a reason for hiding this comment

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

IndexMapping / IndexMappingMeta are used in a lot of places, and it was going to be hard to have distinct types for each algo without entering the Generic loop of hell. Using the same type for both algo's meta felt like the most pragmatic approach by a very large margin.

/**
* The current model versions of the documents of the index.
*
* @remark: Only defined for indices using the zdt migration algorithm.
*/
docVersions?: { [k: string]: number };
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import { getModelVersionDelta } from './get_version_delta';

describe('getModelVersionDelta', () => {
it('generates an upward delta', () => {
const result = getModelVersionDelta({
currentVersions: {
a: 1,
b: 1,
},
targetVersions: {
a: 2,
b: 3,
},
deletedTypes: [],
});

expect(result.status).toEqual('upward');
expect(result.diff).toEqual([
{
name: 'a',
current: 1,
target: 2,
},
{
name: 'b',
current: 1,
target: 3,
},
]);
});

it('generates a downward delta', () => {
const result = getModelVersionDelta({
currentVersions: {
a: 4,
b: 2,
},
targetVersions: {
a: 1,
b: 1,
},
deletedTypes: [],
});

expect(result.status).toEqual('downward');
expect(result.diff).toEqual([
{
name: 'a',
current: 4,
target: 1,
},
{
name: 'b',
current: 2,
target: 1,
},
]);
});

it('generates a noop delta', () => {
const result = getModelVersionDelta({
currentVersions: {
a: 4,
b: 2,
},
targetVersions: {
a: 4,
b: 2,
},
deletedTypes: [],
});

expect(result.status).toEqual('noop');
expect(result.diff).toEqual([]);
});

it('ignores deleted types', () => {
const result = getModelVersionDelta({
currentVersions: {
a: 1,
b: 3,
},
targetVersions: {
a: 2,
},
deletedTypes: ['b'],
});

expect(result.status).toEqual('upward');
expect(result.diff).toEqual([
{
name: 'a',
current: 1,
target: 2,
},
]);
});

it('throws if the provided version maps are in conflict', () => {
expect(() =>
getModelVersionDelta({
currentVersions: {
a: 1,
b: 2,
},
targetVersions: {
a: 2,
b: 1,
},
deletedTypes: [],
})
).toThrow();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import type { ModelVersionMap } from './version_map';
import { compareModelVersions } from './version_compare';

interface GetModelVersionDeltaOpts {
currentVersions: ModelVersionMap;
targetVersions: ModelVersionMap;
deletedTypes: string[];
}

type ModelVersionDeltaResultStatus = 'upward' | 'downward' | 'noop';

interface ModelVersionDeltaResult {
status: ModelVersionDeltaResultStatus;
diff: ModelVersionDeltaTypeResult[];
}

interface ModelVersionDeltaTypeResult {
/** the name of the type */
name: string;
/** the current version the type is at */
current: number;
/** the target version the type should go to */
target: number;
}

/**
* Will generate the difference to go from `currentVersions` to `targetVersions`.
*
* @remarks: will throw if the version maps are in conflict
*/
export const getModelVersionDelta = ({
currentVersions,
targetVersions,
deletedTypes,
}: GetModelVersionDeltaOpts): ModelVersionDeltaResult => {
const compared = compareModelVersions({
indexVersions: currentVersions,
appVersions: targetVersions,
deletedTypes,
});

if (compared.status === 'conflict') {
throw new Error('Cannot generate model version difference: conflict between versions');
}

const status: ModelVersionDeltaResultStatus =
compared.status === 'lesser' ? 'downward' : compared.status === 'greater' ? 'upward' : 'noop';

const result: ModelVersionDeltaResult = {
status,
diff: [],
};

if (compared.status === 'greater') {
compared.details.greater.forEach((type) => {
result.diff.push(getTypeDelta({ type, currentVersions, targetVersions }));
});
} else if (compared.status === 'lesser') {
compared.details.lesser.forEach((type) => {
result.diff.push(getTypeDelta({ type, currentVersions, targetVersions }));
});
}

return result;
};

const getTypeDelta = ({
type,
currentVersions,
targetVersions,
}: {
type: string;
currentVersions: ModelVersionMap;
targetVersions: ModelVersionMap;
}): ModelVersionDeltaTypeResult => {
const currentVersion = currentVersions[type];
const targetVersion = targetVersions[type];
if (currentVersion === undefined || targetVersion === undefined) {
// should never occur given we've been checking consistency numerous times before getting there
// but better safe than sorry.
throw new Error(
`Consistency error: trying to generate delta with missing entry for type ${type}`
);
}
return {
name: type,
current: currentVersion,
target: targetVersion,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,20 @@ export {
modelVersionToVirtualVersion,
virtualVersionToModelVersion,
} from './conversion';
export {
getModelVersionMapForTypes,
getLatestModelVersion,
type ModelVersionMap,
} from './version_map';
export {
compareModelVersions,
type CompareModelVersionMapParams,
type CompareModelVersionStatus,
type CompareModelVersionDetails,
type CompareModelVersionResult,
} from './version_compare';
export {
getModelVersionsFromMappings,
getModelVersionsFromMappingMeta,
} from './model_version_from_mappings';
export { getModelVersionDelta } from './get_version_delta';
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

import type { IndexMapping, IndexMappingMeta } from '../mappings';
import { getModelVersionsFromMappings } from './model_version_from_mappings';

describe('getModelVersionsFromMappings', () => {
const createIndexMapping = (parts: Partial<IndexMappingMeta> = {}): IndexMapping => ({
properties: {},
_meta: {
...parts,
},
});

it('retrieves the version map from docVersions', () => {
const mappings = createIndexMapping({
docVersions: {
foo: 3,
bar: 5,
},
});
const versionMap = getModelVersionsFromMappings({ mappings, source: 'docVersions' });

expect(versionMap).toEqual({
foo: 3,
bar: 5,
});
});

it('retrieves the version map from mappingVersions', () => {
const mappings = createIndexMapping({
mappingVersions: {
foo: 2,
bar: 7,
},
});
const versionMap = getModelVersionsFromMappings({ mappings, source: 'mappingVersions' });

expect(versionMap).toEqual({
foo: 2,
bar: 7,
});
});

it('returns undefined for docVersions if meta field is not present', () => {
const mappings = createIndexMapping({
mappingVersions: {
foo: 3,
bar: 5,
},
});
const versionMap = getModelVersionsFromMappings({ mappings, source: 'docVersions' });

expect(versionMap).toBeUndefined();
});

it('returns undefined for mappingVersions if meta field is not present', () => {
const mappings = createIndexMapping({
docVersions: {
foo: 3,
bar: 5,
},
});
const versionMap = getModelVersionsFromMappings({ mappings, source: 'mappingVersions' });
Copy link
Contributor

Choose a reason for hiding this comment

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

We are not testing the scenario where types don't have a valid model version.


expect(versionMap).toBeUndefined();
});
});
Loading