Sense: updated range filter/query to use gt(e)/lt(e)

also removed numeric_range filter (replace by execution mode of the rang filter. Closes elastic#306
spalger · Nov 14, 2014 · ec104a1 · ec104a1
1 parent c269273
commit ec104a1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 48 deletions.
diff --git a/sense/app/kb/api_1_0/filter.js b/sense/app/kb/api_1_0/filter.js
@@ -300,23 +300,25 @@ define(function () {
  };
 
 
- filters.numeric_range = {
+ filters.range = {
  __template: {
  'FIELD': {
- from: 10,
- to: 20
+ gte: 10,
+ lte: 20
  }
  },
  "{field}": {
- from: 1,
- to: 20,
- include_lower: {
- __one_of: [true, false]
- },
- include_upper: {
- __one_of: [true, false]
- }
- }
+ gte: 1,
+ gt: 1,
+ lte: 20,
+ lt: 20,
+ time_zone: "+1:00",
+ execution: { __one_of: ["index", "fielddata"]}
+ },
+ _cache: {
+ __one_of: [false, true]
+ },
+ _cache_key: ""
  };
 
 
@@ -366,30 +368,6 @@ define(function () {
  }
  };
 
-
- filters.range = {
- __template: {
- 'FIELD': {
- from: 10,
- to: 20
- }
- },
- "{field}": {
- from: 1,
- to: 20,
- include_lower: {
- __one_of: [true, false]
- },
- include_upper: {
- __one_of: [true, false]
- },
- _cache: {
- __one_of: [false, true]
- }
- }
- };
-
-
  filters.script = {
  __template: {
  script: 'SCRIPT',

diff --git a/sense/app/kb/api_1_0/query.js b/sense/app/kb/api_1_0/query.js
@@ -343,23 +343,20 @@ define(["_"], function (_) {
  range: {
  __template: {
  'FIELD': {
- from: 10,
- to: 20
+ gte: 10,
+ lte: 20
  }
  },
  '{field}': {
  __template: {
- from: 10,
- to: 20
- },
- from: 1,
- to: 20,
- include_lower: {
- __one_of: [true, false]
- },
- include_upper: {
- __one_of: [true, false]
+ gte: 10,
+ lte: 20
  },
+ gte: 10,
+ gt: 10,
+ lte: 20,
+ lt: 20,
+ time_zone: "+1:00",
  boost: 1.0
  }
  },