Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
694 commits
Select commit Hold shift + click to select a range
63412b1
one result returned on es5.0
eliranmoyal Dec 2, 2016
aeac457
split is not working on painless (worked on groovy) . waiting for a w…
eliranmoyal Dec 2, 2016
b8bd3e5
no java7 support (travis)
eliranmoyal Dec 2, 2016
7020e0c
check java version. getting bad minor version error
eliranmoyal Dec 2, 2016
659ac33
java version of sudo was 1.7 , trying to start elastic service withou…
eliranmoyal Dec 2, 2016
b970965
can't run elasticsearch service without sudo. trying to install java8…
eliranmoyal Dec 2, 2016
7207ad2
put java8 install at first
eliranmoyal Dec 2, 2016
4ff3ccb
still getting java7 on sudo , trying different approach
eliranmoyal Dec 2, 2016
4c66869
getting java8 to sudo different approach
eliranmoyal Dec 2, 2016
81ada18
travis - try and make sure elasticsearch is up
eliranmoyal Dec 2, 2016
13231d2
new config for es5.0 yml
eliranmoyal Dec 2, 2016
f88880c
add finalName elasticsearch so base folder should be elasticsearch (d…
eliranmoyal Dec 2, 2016
eadeb0f
fix plugin and make csv rest to work
eliranmoyal Dec 2, 2016
36fb74f
fix to plugin-description properties
eliranmoyal Dec 2, 2016
ca441ed
fix all math functions
eliranmoyal Dec 3, 2016
aa5d759
update README.md
shi-yuan Dec 6, 2016
76b06e0
add delete tests again
eliranmoyal Dec 10, 2016
147fe9d
site with node server
eliranmoyal Dec 10, 2016
1da85f2
Merge pull request #344 from NLPchina/elastic5.0.1
eliranmoyal Dec 10, 2016
148f3f5
elasticsearch 5.0.1 release
eliranmoyal Dec 10, 2016
fe51932
es 5.1.1 support
eliranmoyal Dec 10, 2016
f7193cf
Merge branch 'master' of https://github.com/NLPchina/elasticsearch-sql
eliranmoyal Dec 10, 2016
242de9f
travis - download es 5.1.1
eliranmoyal Dec 10, 2016
437cdcf
5.1.1 support
eliranmoyal Dec 10, 2016
5fc0bfd
regex support
shi-yuan Dec 17, 2016
86f64f2
add auth for #364
shi-yuan Jan 11, 2017
781124d
update README.md
shi-yuan Jan 14, 2017
f314469
#364 support base_uri,usename,password url parameters
shi-yuan Jan 14, 2017
5d19ee3
localStorage set item auth
shi-yuan Jan 14, 2017
8d29586
es 5.1.2 support
shi-yuan Jan 15, 2017
3e4df83
update README.md
shi-yuan Jan 15, 2017
8e132e9
README: Fix build status heading [ci skip]
olleolleolle Mar 24, 2017
6223090
README: Fix markdown
olleolleolle Mar 24, 2017
4cb4c0b
Merge pull request #398 from olleolleolle/patch-1
ansjsun Mar 24, 2017
cab7f65
es 5.2.0 support for #402
shi-yuan Apr 9, 2017
3d3e6b5
update README.md
shi-yuan Apr 9, 2017
55b59d4
es 5.2.1 support
shi-yuan Apr 9, 2017
f220abd
update README.md
shi-yuan Apr 9, 2017
fe2d234
es 5.2.2 support
shi-yuan Apr 9, 2017
894f3fc
update README.md
shi-yuan Apr 9, 2017
e3a1b60
es 5.3.0 support for #405
shi-yuan Apr 9, 2017
73ec408
update .travis.yml
shi-yuan Apr 9, 2017
a3446d4
update README.md
shi-yuan Apr 9, 2017
00c842c
es 5.3.1 support for #416
shi-yuan May 4, 2017
03c96b5
update README.md
shi-yuan May 4, 2017
a136565
es 5.3.2 support
shi-yuan May 4, 2017
637a8f1
update README.md
shi-yuan May 4, 2017
0ea8ff9
update README.md
shi-yuan May 4, 2017
3a9a70c
Fix Beyond SQL Heading Format
mtdavidson May 9, 2017
9b139bb
fix bug
xbkaishui May 20, 2017
87094f7
es 5.4.0 support
shi-yuan May 23, 2017
29f4503
fix test issue
shi-yuan May 23, 2017
7d1e23f
update README.md
shi-yuan May 24, 2017
56c1764
Merge pull request #1 from NLPchina/master
TerryJayChan May 25, 2017
749de7c
Fix header
anton-johansson May 26, 2017
563bc2e
Merge pull request #434 from anton-johansson/patch-1
shi-yuan May 29, 2017
7c1a548
Merge pull request #430 from xbkaishui/master
shi-yuan May 29, 2017
541a436
Merge branch 'master' into patch-1
shi-yuan May 29, 2017
959c5e1
Merge pull request #425 from mtdavidson/patch-1
shi-yuan May 29, 2017
4e19663
Merge pull request #399 from olleolleolle/fix/document-python-startup
shi-yuan May 29, 2017
6ae2658
Merge branch 'master' of https://github.com/NLPchina/elasticsearch-sql
TerryJayChan Jun 1, 2017
86ab223
es 5.4.1 support
shi-yuan Jun 13, 2017
8ed2891
update README.md
Jun 14, 2017
8feb1c1
update README.md
Jun 15, 2017
a38c0e1
#439 add property ‘min_doc_count’
shi-yuan Jun 18, 2017
431841b
#457 es 5.4.2 support
shi-yuan Jun 26, 2017
e2e61c5
update README.md
shi-yuan Jun 26, 2017
cd3fb24
es 5.4.3 support
shi-yuan Jul 16, 2017
246ad0c
es 5.5.0 support
shi-yuan Jul 16, 2017
32f0462
update README.md
shi-yuan Jul 16, 2017
7342775
fix bug #469
shi-yuan Jul 17, 2017
593948a
update README.md
shi-yuan Jul 17, 2017
aef2912
fix bug #480
shi-yuan Aug 4, 2017
2f412fe
让ElasticSearchResultSetMetaDataBase可以获取到列的metadata信息
Aug 5, 2017
07c2b29
#485 es 5.5.1 support
shi-yuan Aug 9, 2017
eb0903f
update README.md
shi-yuan Aug 9, 2017
bf3dd32
Merge pull request #481 from shadon178/master
shi-yuan Aug 10, 2017
5fe2b36
Fixbug #479
zhaolihe Aug 10, 2017
b5c4836
修复聚合函数对查询字段不包含在include单元测试不通过问题
zhaolihe Aug 11, 2017
7e02cc7
Merge pull request #491 from NLPchina/fixbug
shi-yuan Aug 12, 2017
864442c
fix bug #494
shi-yuan Aug 19, 2017
f8c0ec8
#503 es 5.5.2 support
shi-yuan Sep 4, 2017
c009155
update README.md
shi-yuan Sep 4, 2017
49a08a5
Merge pull request #2 from NLPchina/master
TerryJayChan Sep 28, 2017
976f614
new feature: cast, almost same sa SQL cast, cast field type to int/lo…
Sep 29, 2017
f55f153
Merge pull request #514 from leonlu001/master
shi-yuan Oct 4, 2017
b84eb83
fix issue #510
shi-yuan Oct 4, 2017
9b074da
es 5.5.3 support
shi-yuan Oct 4, 2017
9e93b17
es 5.6.0 support
shi-yuan Oct 4, 2017
ac0a60a
es 5.6.1 support
shi-yuan Oct 4, 2017
510d8b3
es 5.6.2 support
shi-yuan Oct 4, 2017
917b25e
update README.md
shi-yuan Oct 4, 2017
9648634
fix junit test
shi-yuan Oct 4, 2017
ea60ca2
update
shi-yuan Oct 4, 2017
b99b368
update
shi-yuan Oct 4, 2017
302a7fc
update
shi-yuan Oct 4, 2017
2132ec9
fix issue #515
shi-yuan Oct 5, 2017
edde780
Merge pull request #3 from NLPchina/master
TerryJayChan Oct 6, 2017
4784865
Correct syntax 'sql' to 'SQL'
xumeng Oct 20, 2017
8f14b73
Merge pull request #530 from xumeng/patch-1
shi-yuan Oct 20, 2017
a032227
#529 es 5.6.3 support
shi-yuan Oct 22, 2017
32ad692
update README.md
shi-yuan Oct 22, 2017
a4ec221
fix issue 聚合字段为内嵌类型,聚合查询不正确#527
shi-yuan Oct 22, 2017
0aafeb0
test
Oct 23, 2017
e6e4fd6
add param order#536 How to change the order in date_histogram
Oct 24, 2017
11b3fa7
Merge pull request #534 from yanghongwu/master
shi-yuan Oct 24, 2017
6080d0a
Merge pull request #4 from NLPchina/master
TerryJayChan Oct 28, 2017
674d5b0
#538 support extended_bounds in date_histogram
shi-yuan Oct 29, 2017
23e8379
Merge pull request #5 from NLPchina/master
TerryJayChan Oct 30, 2017
09ea2f5
fix issues 541
shi-yuan Nov 5, 2017
b1095dd
#540 fix NullPointerException
Nov 6, 2017
ea764cc
Merge pull request #6 from NLPchina/master
TerryJayChan Nov 8, 2017
b595c93
Add support for Elasticsearch 5.6.4
juanpaulo Nov 13, 2017
c6dd406
Update README to include 5.6.4 changes
juanpaulo Nov 14, 2017
12b84a3
Add missing newline to README
juanpaulo Nov 14, 2017
931a5ef
Merge pull request #546 from juanpaulo/master
shi-yuan Nov 20, 2017
fb5b5d8
Merge pull request #7 from NLPchina/master
TerryJayChan Nov 22, 2017
a53e319
fix issue 在match_phrase中设置slop #550
shi-yuan Nov 26, 2017
c190d7a
fix issue #563 scripted_metric almost cannot be used
shi-yuan Dec 9, 2017
9c87db9
es 5.6.5 support
Dec 12, 2017
1aa0b83
update README.md
Dec 13, 2017
82505fc
Merge pull request #8 from NLPchina/master
TerryJayChan Dec 15, 2017
6b1c3a7
commit for 6.0.0 - compiling but not working, most tests are broken
Dec 12, 2017
f86b894
fix tests #553
Jan 3, 2018
c111342
update README.md
Jan 3, 2018
cd0ad97
update elasticsearch.yml
Jan 3, 2018
e17e288
es 6.0.1 support
shi-yuan Jan 3, 2018
0315109
es 6.1.0 support
shi-yuan Jan 3, 2018
a2a6610
es 6.1.1 support
shi-yuan Jan 3, 2018
79dd361
update README.md
shi-yuan Jan 3, 2018
9126e8d
Merge pull request #9 from NLPchina/master
TerryJayChan Jan 3, 2018
1b6b9e1
regex support
shi-yuan Jan 4, 2018
0bb5b49
fix delete by query #347
shi-yuan Jan 7, 2018
73bb2e0
Support Field Collapsing
shi-yuan Jan 13, 2018
18eeb5e
Merge pull request #436 from TerryJayChan/master
shi-yuan Jan 13, 2018
4ea11d3
support post_filter hint #586
shi-yuan Jan 15, 2018
311bb04
fix nested order have bug #438
shi-yuan Jan 16, 2018
fbd8e8c
es 6.1.2 support
shi-yuan Jan 27, 2018
33d5df5
Update controllers.js
pilere Jan 29, 2018
800c0bd
Merge pull request #596 from pilere/patch-2
shi-yuan Jan 29, 2018
480eb86
Update README.md
ansjsun Jan 27, 2018
e62f52a
update README.md
shi-yuan Jan 27, 2018
266c7b9
terms agg add execution_hint #598
shi-yuan Jan 30, 2018
8a8ab5f
fix Got error when filter with boolean field #603
Feb 1, 2018
f3c24f1
fix CSV option giving -Infinity and Nan #597
shi-yuan Feb 3, 2018
733bda3
es 6.1.3 support
shi-yuan Feb 3, 2018
e02a1dd
update README.md
shi-yuan Feb 3, 2018
c29524e
es 6.2.0 support
shi-yuan Feb 10, 2018
d567496
es 6.2.1 support
shi-yuan Feb 10, 2018
b3ae903
update README.md
shi-yuan Feb 10, 2018
343f2be
fix 6.2.1 Error on installation #610
shi-yuan Feb 20, 2018
dba17fc
upgrade version
shi-yuan Feb 21, 2018
edf2f21
es 6.2.2 support
shi-yuan Mar 3, 2018
0989627
update README.md
shi-yuan Mar 3, 2018
89b1343
fix issue RANGE COUNT PROBLEAM #619
shi-yuan Mar 3, 2018
ae34a7b
fix issue [Feature request]Provide option to get query as locally on …
shi-yuan Mar 3, 2018
bf4e416
fix nested类型字段不存在的情况下,用elasticsearch-sql无法查询到 #628
shi-yuan Mar 16, 2018
5b79e77
es 6.1.4 support
shi-yuan Mar 25, 2018
1f05c8c
es 6.2.3 support
shi-yuan Mar 25, 2018
5d2d732
update README.md
shi-yuan Mar 25, 2018
f0016fa
support multi_match query #638
Mar 27, 2018
122d72e
#640 date math support in index names
Mar 30, 2018
7af652c
support time zone in date format function
shi-yuan Apr 5, 2018
569cc6b
#531 add include and exclude
shi-yuan Apr 23, 2018
75a42dd
#648 es 6.2.4 support
Apr 24, 2018
640a5fa
update README.md
Apr 24, 2018
d51a681
fix #653 复杂运算查询会报错
May 3, 2018
c16b8ff
support scroll_id in sql #575
shi-yuan May 13, 2018
81be150
fix #657 last(),IsLast()这类方法以后也不打算支持吗
shi-yuan May 20, 2018
01f6d3c
support connectionProperties for JDBC
May 30, 2018
5600da3
support multiple type of logs function
Jun 1, 2018
bef138a
fix power function parameter error
detongz Jun 1, 2018
908f6c4
Merge pull request #672 from tbbrave/master
shi-yuan Jun 1, 2018
e377e5a
fix #638 bug
Jun 5, 2018
1fff861
fix #678 range aggregation how to spec alias?
shi-yuan Jun 18, 2018
256bf23
es 6.3.0 support
shi-yuan Jun 18, 2018
a1a6af8
update README.md
shi-yuan Jun 18, 2018
9564152
fix #686
shi-yuan Jun 18, 2018
acc2d97
support date_histogram,histogram and terms aggregations with scripts
detongz Jul 20, 2018
34c9c34
Merge pull request #709 from tbbrave/master
shi-yuan Jul 21, 2018
e1341f7
es 6.3.1 support
shi-yuan Jul 21, 2018
6a14820
update README.md
shi-yuan Jul 21, 2018
bbc412d
fix #714 SQL parse error when where condition contains 'join' keyword
shi-yuan Jul 22, 2018
08f8a3a
Update README.md
shi-yuan Jul 27, 2018
d63c130
es 6.3.2 support
shi-yuan Aug 10, 2018
38ad264
update README.md
shi-yuan Aug 10, 2018
7a11f6c
#736 fix testcase selectFieldWithSpace
shi-yuan Aug 17, 2018
c69f4d2
fix #742
shi-yuan Aug 22, 2018
651ffa2
fix 使用jdbc调用metaData.getColumnCount()函数无法获取正常列数信息的问题 #751
stopit Aug 31, 2018
22ff099
Merge branch 'master' into elasticsearch-sql-jdbc
shi-yuan Sep 5, 2018
52b6eee
Merge pull request #752 from stopit/elasticsearch-sql-jdbc
shi-yuan Sep 5, 2018
0b8ab80
fix bug#connection in druid infinitely increased
Sep 6, 2018
0a333b8
Merge pull request #756 from zzcoding/master
shi-yuan Sep 12, 2018
b6c1220
es 6.4.0 support
shi-yuan Sep 14, 2018
aa612e5
update README.md
shi-yuan Sep 15, 2018
84071e7
fix #734
shi-yuan Sep 18, 2018
5d370f1
es 6.4.1 support
shi-yuan Sep 24, 2018
7f8fd69
update README.md
shi-yuan Sep 24, 2018
7cd4da9
fix #688 How to use the feature 'inner_hits' when filed is the array …
shi-yuan Oct 1, 2018
3ca7dfc
es 6.4.2 support
shi-yuan Oct 14, 2018
dc64055
update README.md
shi-yuan Oct 14, 2018
4bdd754
fix #781 中文查询无结果
Oct 19, 2018
90485dd
fix bug in floor(cast(var as int) and sum(cast(var as int))
Oct 29, 2018
0d9916f
Merge pull request #786 from chineseabacus/master
shi-yuan Oct 30, 2018
44d3727
fix #779 How to use SpanNearQuery in SQL Plugin
shi-yuan Nov 3, 2018
9a584fe
update testcase testSpanNearQueryExplain
Nov 5, 2018
898ebc1
fix #791 字段运算后聚合结果为0
Dec 3, 2018
33570f7
es 6.4.3 support
Dec 3, 2018
346ebaa
es 6.5.0 support
Dec 3, 2018
366d6e5
fix #800 nested parser
shi-yuan Dec 3, 2018
e9ed2cd
fix #807 时区问题
Dec 4, 2018
f61f174
update .travis.yml
Dec 4, 2018
5b58e2e
es 6.5.1 support
Dec 4, 2018
8a110ce
update README.md
Dec 4, 2018
2ed7e98
update README.md
Dec 4, 2018
b64ad03
fix #821 date_histogram offset
Dec 7, 2018
ddddb9e
es 6.5.2 support
shi-yuan Dec 16, 2018
fb82fd1
update README.md
shi-yuan Dec 16, 2018
7e9c44f
fix #826 es 6.5.3 support
shi-yuan Dec 16, 2018
5dc5866
update README.md
shi-yuan Dec 16, 2018
21a4047
close resultset when closing preparedstatement
shi-yuan Dec 16, 2018
f1e076f
update README.md
Jan 2, 2019
619bc2d
Merge pull request #793 from LongLonger/elastic6.1.1_zhongshu_dev_01
Jun 4, 2018
8c1d61d
es 6.5.4 support
shi-yuan Jan 13, 2019
766874e
update README.md
shi-yuan Jan 13, 2019
d096b72
fix #853
Jan 15, 2019
78c2afc
fix #847
shi-yuan Jan 15, 2019
4b80add
support json to extended_bounds config of dateHistogram
Jan 16, 2019
a1bf9f9
check agg is an instance of termsagg before set size or shardsize
Jan 18, 2019
3ace721
count(distinct a) 排序问题
Jan 18, 2019
30fb22f
Merge pull request #862 from flame9012/master
shi-yuan Jan 20, 2019
f6d0f47
add testcase for #862
shi-yuan Jan 20, 2019
a66b7c9
fix #838 sql返回结果按照字段顺序返回
shi-yuan Jan 20, 2019
b95862c
fix #839 support stats-groups
shi-yuan Jan 20, 2019
f8ee5b6
es 6.6.0 support
Feb 11, 2019
1c44587
fix #877 Cast not used in the where condition
Feb 11, 2019
28bc5e4
update README.md
Feb 11, 2019
e5a362e
Update README.md
shi-yuan Feb 13, 2019
c430207
fix #884 delete sql support CONFLICTS hint
Feb 15, 2019
818335d
Merge pull request #1 from NLPchina/master
mrfsong Mar 19, 2019
84e5ea5
Merge pull request #903 from mrfsong/master
shi-yuan Mar 26, 2019
ec39291
fix #904 es 6.6.1 support
Mar 26, 2019
9c2f44a
es 6.6.2 support
Mar 26, 2019
7211819
update README.md
Mar 26, 2019
fb243ce
es 6.7.0 support
Mar 28, 2019
f53ff57
update README.md
Mar 28, 2019
d02f812
update .travis.yml
Mar 29, 2019
eaab70b
fix #917 check search response
shi-yuan Apr 6, 2019
e7f7d80
es 6.7.1 support
shi-yuan May 11, 2019
3492422
update README.md
shi-yuan May 12, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ elasticsearch-sql.iml
.idea
src/_site/vendor/codemirror/mode/jinja2/.goutputstream-*
src/_site/node_modules
src/site-server/node_modules
*~
.DS_Store
19 changes: 12 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@ language: java

jdk:
- oraclejdk8
- oraclejdk7
- openjdk7


before_install:
- wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.1.deb && sudo dpkg -i --force-confnew elasticsearch-1.4.1.deb

services:
- elasticsearch
# update to java 8
- sudo update-java-alternatives -s java-8-oracle
- export JAVA_HOME=/usr/lib/jvm/java-8-oracle
- wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.7.1.deb && sudo dpkg -i --force-confnew elasticsearch-6.7.1.deb
- sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
- sudo cat /etc/elasticsearch/elasticsearch.yml
- sudo java -version
- sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
- sudo service elasticsearch start
- sleep 30

install:
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true

script:
- ulimit -a
Expand Down
26 changes: 26 additions & 0 deletions BUILDING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## Building

To build zip release of the plugin, run this command:


````
mvn clean package assembly:single -DskipTests
````

Running this command will create zip release named elasticsearch-sql-{version}.zip under 'target' directory. which can be installed from the file system using elasticsearch plugin bash script:

````
./bin/plugin -u file:///home/omershelef/IdeaProjects/elasticsearch-sql/target/elasticsearch-sql-1.3.2.zip --install sql

````


## Tests

To run the tests, you will need elasticsearch instance running on your local machine. Alternatively you can set the environment variables ES_TEST_HOST and ES_TEST_PORT to point the tests to some other elasticsearch instance instead local machine on default port 9200.
To run the test all you need is running:

````
mvn test

````
669 changes: 653 additions & 16 deletions README.md

Large diffs are not rendered by default.

82 changes: 82 additions & 0 deletions doc/features.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
## Elasticsearch-SQL

[Elasticsearch-SQL](https://github.com/allwefantasy/elasticsearch-sql/) fork from [https://github.com/NLPchina/elasticsearch-sql](https://github.com/NLPchina/elasticsearch-sql)

visit [interactive web](http://www.nlpcn.org:9999/web/) to feel.

## features

All features following require ES with groovy script enabled.

* Distinct precision_threshold depends on ES or you can specify by second parameters.
When you have lot of shards, 40000 consume too much memory.
* select,groupBy now support functions and field alias
* nested function is also available,eg. `split(substring('newtype',0,3),'c')[0]`
* Binary operation support now, eg. `floor(substring(newtype,0,14)/100)/5)*5`


## functions support

* floor
* split
* trim
* log
* log10
* substring
* round
* sqrt
* concat_ws
* +
* -
* *
* /
* %

## Example

check Example file:

```
org.nlpcn.es4sql.Test
```

SQLs:

```sql

SELECT newtype as nt from twitter2

SELECT sum(num) as num2,newtype as nt
from twitter2
group by nt order by num2

SELECT sum(num_d) as num2,split(newtype,',') as nt
from twitter2
group by nt
order by num2

SELECT sum(num_d) as num2,floor(num) as nt
from twitter2
group by floor(num),newtype
order by num2

SELECT split('newtype','b')[1] as nt,sum(num_d) as num2
from twitter2
group by nt

SELECT split(substring('newtype',0,3),'c')[0] as nt,num_d
from twitter2
group by nt

SELECT trim(newtype) as nt
from twitter2


SELECT floor(floor(substring(time,0,14)/100)/5)*5 as nt,
count(distinct(mid)) as cvalue
FROM twitter2
where ty='buffer' and day='20160815' and domain='baidu.com'
group by nt
order by cvalue

```
Loading