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

[es] scripts.inline -> scripts.source #30457

Merged
merged 2 commits into from
Feb 25, 2019
Merged

[es] scripts.inline -> scripts.source #30457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc71768
[es] scripts.inline -> scripts.source
jbudz Feb 8, 2019
627f270
Merge branch 'master' into deprecations/scripts
jbudz Feb 25, 2019
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
2 changes: 1 addition & 1 deletion packages/kbn-es-query/src/filters/__tests__/phrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('Filter Manager', function () {
const field = getField(indexPattern, 'script number');
expected.meta.field = 'script number';
_.set(expected, 'script.script', {
inline: '(' + field.script + ') == value',
source: '(' + field.script + ') == value',
lang: 'expression',
params: {
value: 5,
Expand Down
8 changes: 4 additions & 4 deletions packages/kbn-es-query/src/filters/__tests__/range.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Filter Manager', function () {
expected.meta.field = 'script number';
_.set(expected, 'script.script', {
lang: 'expression',
inline: '(' + field.script + ')>=gte && (' + field.script + ')<=lte',
source: '(' + field.script + ')>=gte && (' + field.script + ')<=lte',
params: {
value: '>=1 <=3',
gte: 1,
Expand All @@ -68,7 +68,7 @@ describe('Filter Manager', function () {
`gte(() -> { ${field.script} }, params.gte) && ` +
`lte(() -> { ${field.script} }, params.lte)`;

const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.inline;
const inlineScript = buildRangeFilter(field, { gte: 1, lte: 3 }, indexPattern).script.script.source;
expect(inlineScript).to.be(expected);
});

Expand All @@ -89,7 +89,7 @@ describe('Filter Manager', function () {
params[key] = 5;
const filter = buildRangeFilter(field, params, indexPattern);

expect(filter.script.script.inline).to.be(
expect(filter.script.script.source).to.be(
'(' + field.script + ')' + operator + key);
expect(filter.script.script.params[key]).to.be(5);
expect(filter.script.script.params.value).to.be(operator + 5);
Expand Down Expand Up @@ -120,7 +120,7 @@ describe('Filter Manager', function () {
it('does not contain a script condition for the infinite side', function () {
const field = getField(indexPattern, 'script number');
const script = field.script;
expect(filter.script.script.inline).to.equal(`(${script})>=gte`);
expect(filter.script.script.source).to.equal(`(${script})>=gte`);
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es-query/src/filters/phrase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function getPhraseScript(field, value) {

return {
script: {
inline: script,
source: script,
lang: field.lang,
params: {
value: convertedValue
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es-query/src/filters/range.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export function getRangeScript(field, params) {

return {
script: {
inline: script,
source: script,
params: knownParams,
lang: field.lang
}
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/console/api_server/es_6_0/globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ export default function (api) {

api.addGlobalAutocompleteRules('script', {
__template: {
inline: 'SCRIPT'
source: 'SCRIPT'
},
inline: 'SCRIPT',
source: 'SCRIPT',
file: 'FILE_SCRIPT_NAME',
id: 'SCRIPT_ID',
lang: '',
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/console/api_server/es_6_0/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ export default function (api) {
api.addEndpointDescription('render_search_template', {
data_autocomplete_rules: {
__one_of: [
{ inline: { __scope_link: 'search' } },
{ source: { __scope_link: 'search' } },
{ __scope_link: 'GLOBAL.script' },
],
params: {},
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/console/public/tests/src/input_tokenization.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ describe('Input Tokenization', () => {
['start', 'json', 'json', 'start'],
'POST _search\n' +
'{\n' +
' "script": { "inline": "" }\n' +
' "script": { "source": "" }\n' +
'}'
);

Expand Down
4 changes: 2 additions & 2 deletions src/legacy/core_plugins/console/public/tests/src/utils_string_expanding.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
Scripts in requests
-------------------------------------
{
"f": { "script" : { "inline": "test\ntest\\2" } },
"f": { "script" : { "source": "test\ntest\\2" } },
"g": { "script" : "second + \"\\\";" },
"f": "short with \\",
"h": 1,
"script": "a + 2"
}
-------------------------------------
{
"f": { "script" : { "inline": """
"f": { "script" : { "source": """
test
test\2
""" } },
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const termsAgg = ({ field, size, direction, query }) => {

if (field.scripted) {
terms.script = {
inline: field.script,
source: field.script,
lang: field.lang
};
terms.valueType = field.type === 'number' ? 'float' : field.type;
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const minMaxAgg = (field) => {
const aggBody = {};
if (field.scripted) {
aggBody.script = {
inline: field.script,
source: field.script,
lang: field.lang
};
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/legacy/core_plugins/timelion/server/series_functions/__tests__/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe(filename, () => {
expect(agg.time_buckets.aggs['avg(scriptedBytes)']).to.eql({
avg: {
script: {
inline: 'doc["bytes"].value',
source: 'doc["bytes"].value',
lang: 'painless'
}
}
Expand Down Expand Up @@ -338,14 +338,14 @@ describe(filename, () => {

expect(aggs.scriptedBeer.meta.type).to.eql('split');
expect(aggs.scriptedBeer.terms.script).to.eql({
inline: 'doc["beer"].value',
source: 'doc["beer"].value',
lang: 'painless'
});
expect(aggs.scriptedBeer.terms.size).to.eql(5);

expect(aggs.scriptedBeer.aggs.scriptedWine.meta.type).to.eql('split');
expect(aggs.scriptedBeer.aggs.scriptedWine.terms.script).to.eql({
inline: 'doc["wine"].value',
source: 'doc["wine"].value',
lang: 'painless'
});
expect(aggs.scriptedBeer.aggs.scriptedWine.terms.size).to.eql(10);
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/timelion/server/series_functions/es/lib/agg_body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function buildAggBody(fieldName, scriptedFields) {
if (scriptedField) {
return {
script: {
inline: scriptedField.script,
source: scriptedField.script,
lang: scriptedField.lang
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/timelion/server/series_functions/es/lib/create_date_agg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function createDateAgg(config, tlConfig, scriptedFields) {
dateAgg.time_buckets.aggs[metric] = {
bucket_script: {
buckets_path: '_count',
script: { inline: '_value', lang: 'expression' }
script: { source: '_value', lang: 'expression' }
}
};
} else if (metric[0] && metric[1]) {
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/agg_types/buckets/histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const histogramBucketAgg = new BucketAggType({
modifyAggConfigOnSearchRequestStart(aggConfig, searchSource) {
const field = aggConfig.getField();
const aggBody = field.scripted
? { script: { inline: field.script, lang: field.lang } }
? { script: { source: field.script, lang: field.lang } }
: { field: field.name };

return searchSource
Expand Down
4 changes: 2 additions & 2 deletions src/legacy/ui/public/agg_types/metrics/top_hit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const topHitMetricAgg = new MetricAggType({
output.params.script_fields = {
[ field.name ]: {
script: {
inline: field.script,
source: field.script,
lang: field.lang
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ export const topHitMetricAgg = new MetricAggType({
{
_script: {
script: {
inline: sortField.script,
source: sortField.script,
lang: sortField.lang
},
type: sortField.type,
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/agg_types/param_types/field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ FieldParamType.prototype.write = function (aggConfig, output) {

if (field.scripted) {
output.params.script = {
inline: field.script,
source: field.script,
lang: field.lang,
};
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/courier/search_source/__tests__/normalize_sort_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('SearchSource#normalizeSortRequest', function () {
normalizedSort = {
_script: {
script: {
inline: indexField.script,
source: indexField.script,
lang: indexField.lang
},
type: indexField.type,
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/courier/search_source/_normalize_sort_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function NormalizeSortRequestProvider(config) {
sortField = '_script';
sortValue = {
script: {
inline: indexField.script,
source: indexField.script,
lang: indexField.lang
},
type: castSortType(indexField.type),
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/ui/public/index_patterns/_get_computed_fields.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function getComputedFields() {
_.each(self.getScriptedFields(), function (field) {
scriptFields[field.name] = {
script: {
inline: field.script,
source: field.script,
lang: field.lang
}
};
Expand Down
14 changes: 7 additions & 7 deletions x-pack/plugins/ml/public/jobs/new_job/simple/components/watcher/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const watch = {
start: {
script: {
lang: 'painless',
inline: `LocalDateTime.ofEpochSecond((doc["timestamp"].date.getMillis()-((doc["bucket_span"].value * 1000)
source: `LocalDateTime.ofEpochSecond((doc["timestamp"].date.getMillis()-((doc["bucket_span"].value * 1000)
* params.padding)) / 1000, 0, ZoneOffset.UTC).toString()+\":00.000Z\"`,
params: {
'padding': 10
Expand All @@ -91,7 +91,7 @@ export const watch = {
end: {
script: {
lang: 'painless',
inline: `LocalDateTime.ofEpochSecond((doc["timestamp"].date.getMillis()+((doc["bucket_span"].value * 1000)
source: `LocalDateTime.ofEpochSecond((doc["timestamp"].date.getMillis()+((doc["bucket_span"].value * 1000)
* params.padding)) / 1000, 0, ZoneOffset.UTC).toString()+\":00.000Z\"`,
params: {
'padding': 10
Expand All @@ -101,19 +101,19 @@ export const watch = {
timestamp_epoch: {
script: {
lang: 'painless',
inline: 'doc["timestamp"].date.getMillis()/1000'
source: 'doc["timestamp"].date.getMillis()/1000'
}
},
timestamp_iso8601: {
script: {
lang: 'painless',
inline: 'doc["timestamp"].date'
source: 'doc["timestamp"].date'
}
},
score: {
script: {
lang: 'painless',
inline: 'Math.round(doc["anomaly_score"].value)'
source: 'Math.round(doc["anomaly_score"].value)'
}
}
}
Expand Down Expand Up @@ -154,7 +154,7 @@ export const watch = {
score: {
script: {
lang: 'painless',
inline: 'Math.round(doc["influencer_score"].value)'
source: 'Math.round(doc["influencer_score"].value)'
}
}
}
Expand Down Expand Up @@ -198,7 +198,7 @@ export const watch = {
score: {
script: {
lang: 'painless',
inline: 'Math.round(doc["record_score"].value)'
source: 'Math.round(doc["record_score"].value)'
}
}
}
Expand Down