You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ra...@apache.org on 2015/10/09 06:17:11 UTC
[06/50] [abbrv] lens git commit: Merge with current-release-line
Merge with current-release-line
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/2901b4b3
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/2901b4b3
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/2901b4b3
Branch: refs/heads/current-release-line
Commit: 2901b4b33677f694b68adb22eee7994307bd77d4
Parents: fe44e69 1237842
Author: Rajat Khandelwal <ra...@gmail.com>
Authored: Fri Aug 28 20:15:16 2015 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Fri Aug 28 20:15:16 2015 +0530
----------------------------------------------------------------------
lens-driver-es/pom.xml | 3 +--
.../src/test/resources/valid-queries.data | 2 +-
lens-driver-jdbc/pom.xml | 15 +++++++--------
lens-server/pom.xml | 17 ++++++++---------
pom.xml | 5 ++---
5 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/2901b4b3/lens-driver-es/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/2901b4b3/lens-driver-es/src/test/resources/valid-queries.data
----------------------------------------------------------------------
diff --cc lens-driver-es/src/test/resources/valid-queries.data
index f4ad15b,46de030..ff3074e
--- a/lens-driver-es/src/test/resources/valid-queries.data
+++ b/lens-driver-es/src/test/resources/valid-queries.data
@@@ -82,20 -82,5 +82,20 @@@
"name" : "Group by with multiple aggregation and complex criteria, select order jumbled",
"hql" : "select count(col1), col2, max(col3) from index.type where !(col1=5 and col2='p' and col3='wer' or (col4='9')) group by col2",
"expectedJson" : {"size":0,"timeout":10000,"aggs":{"filter_wrapper":{"aggs":{"col2":{"terms":{"field":"col2","size":100},"aggs":{"col1":{"value_count":{"field":"col1"}},"col3":{"max":{"field":"col3"}}}}},"filter":{"not":{"or":[{"and":[{"and":[{"term":{"col1":"5"}},{"term":{"col2":"p"}}]},{"term":{"col3":"wer"}}]},{"term":{"col4":"9"}}]}}}}}
+ },
+ {
+ "name" : "Check in predicate",
+ "hql" : "select col1 from index.type where col2 in ('val1', 'val2')",
+ "expectedJson" : {"from":0,"size":10000,"fields":["col1"],"sort":[],"timeout":10000,"filter":{"terms":{"col2":["val1","val2"]}}}
+ },
+ {
+ "name" : "Check not in predicate",
+ "hql" : "select col1 from index.type where col2 not in ('val1', 'val2')",
+ "expectedJson" : {"from":0,"size":10000,"fields":["col1"],"sort":[],"timeout":10000,"filter":{"not":{"terms":{"col2":["val1","val2"]}}}}
+ },
+ {
+ "name" : "Check not equals predicate",
+ "hql" : "select col1 from index.type where col2 != 'val1'",
+ "expectedJson" : {"from":0,"size":10000,"fields":["col1"],"sort":[],"timeout":10000,"filter":{"not":{"term":{"col2":"val1"}}}}
}
- ]
+ ]
http://git-wip-us.apache.org/repos/asf/lens/blob/2901b4b3/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/2901b4b3/lens-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/2901b4b3/pom.xml
----------------------------------------------------------------------