x

elasticsearch-query-core/pom.xml

@@ -1,59 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-		<groupId>org.elasticsearch</groupId>
-		<artifactId>elasticsearch-query</artifactId>
-		<version>2.4.4</version>
-	</parent>
-	
-    <artifactId>elasticsearch-query-core</artifactId>
-	<packaging>jar</packaging>
-	<name>${project.artifactId}</name>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch</artifactId>
-		</dependency>
-	
-		<dependency>
-			 <groupId>com.alibaba</groupId>
-			 <artifactId>druid</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-	</dependencies>
-</project>

elasticsearch-query-jdbc/pom.xml

@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-		<groupId>org.elasticsearch</groupId>
-		<artifactId>elasticsearch-query</artifactId>
-		<version>2.4.4</version>
-	</parent>
-	
-    <artifactId>elasticsearch-query-jdbc</artifactId>
-	<packaging>jar</packaging>
-	<name>${project.artifactId}</name>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch-query-core</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

elasticsearch-query-jdbc/src/test/java/org/es/test/jdbc/BaseJdbcTest.java

@@ -1,6 +0,0 @@
-package org.es.test.jdbc;
-
-public class BaseJdbcTest {
-    protected static final String driver = "org.es.jdbc.api.ElasticDriver";
-    protected static final String url = "jdbc:elastic:192.168.0.108:9300/lu-search-cluster";
-}

elasticsearch-query-jdbc/src/test/java/org/es/test/jdbc/ElasticDriverTest.java

@@ -1,85 +0,0 @@
-package org.es.test.jdbc;
-
-
-import org.es.jdbc.api.ElasticConnection;
-import org.es.jdbc.api.ElasticSingleConnectionDataSource;
-import org.es.jdbc.es.JdbcSearchResponse;
-import org.es.jdbc.es.JdbcSearchResponseResolver;
-import org.es.test.jdbc.bean.Product;
-import org.junit.Test;
-
-import java.sql.*;
-import java.util.Enumeration;
-
-public class ElasticDriverTest extends BaseJdbcTest{
-
-    @Test
-    public void testLoadDriver() throws Exception {
-        Class.forName(driver);
-        Enumeration<Driver> driverEnumeration = DriverManager.getDrivers();
-
-        while (driverEnumeration.hasMoreElements()) {
-            Driver driver = driverEnumeration.nextElement();
-            System.out.println(driver.toString());
-        }
-    }
-
-    @Test
-    public void testGetConnection() throws Exception {
-        Class.forName(driver);
-        Connection connection = DriverManager.getConnection(url);
-        org.junit.Assert.assertTrue(connection instanceof ElasticConnection);
-    }
-
-    @Test
-    public void testDataSource() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, false);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-        org.junit.Assert.assertTrue(connection instanceof ElasticConnection);
-
-        dataSource.destroy();
-        org.junit.Assert.assertTrue(connection.isClosed());
-    }
-
-    @Test
-    public void testQuery() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, true);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-        ResultSet resultSet = connection.createStatement().executeQuery("select * from index.product where productCode='IP_6S'");
-
-        String responseGson = resultSet.getString(1);
-        JdbcSearchResponseResolver jdbcSearchResponseResolver = new JdbcSearchResponseResolver(responseGson);
-        JdbcSearchResponse<Product> jdbcSearchResponse = jdbcSearchResponseResolver.resolveSearchResponse(Product.class);
-
-        for (Product product : jdbcSearchResponse.getResultList()) {
-            System.out.println(product.getProductName());
-        }
-    }
-
-    @Test
-    public void testQuery2() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, true);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-        String sql = "select * from index.product where productCode=? and provider.providerLevel > ?";
-
-        PreparedStatement preparedStatement = connection.prepareStatement(sql);
-        preparedStatement.setString(1, "AW_OS2");
-        preparedStatement.setInt(2, 0);
-
-        ResultSet resultSet = preparedStatement.executeQuery();
-
-        String responseGson = resultSet.getString(1);
-        JdbcSearchResponseResolver jdbcSearchResponseResolver = new JdbcSearchResponseResolver(responseGson);
-        JdbcSearchResponse<Product> jdbcSearchResponse = jdbcSearchResponseResolver.resolveSearchResponse(Product.class);
-
-        for (Product product : jdbcSearchResponse.getResultList()) {
-            System.out.println(product.getProductName());
-        }
-    }
-}

elasticsearch-query-jdbc/src/test/java/org/es/test/jdbc/GroupByTest.java

@@ -1,38 +0,0 @@
-package org.es.test.jdbc;
-
-
-import org.es.jdbc.api.ElasticSingleConnectionDataSource;
-import org.es.jdbc.es.JdbcSearchResponse;
-import org.es.jdbc.es.JdbcSearchResponseResolver;
-import org.es.test.jdbc.bean.ProductAggResult;
-import org.junit.Test;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-public class GroupByTest extends BaseJdbcTest {
-
-    @Test
-    public void testGroupBy() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, true);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-        String sql = "select min(advicePrice),max(provider.providerLevel) from index.product group by terms(productCode, 200)";
-
-        PreparedStatement preparedStatement = connection.prepareStatement(sql);
-        ResultSet resultSet = preparedStatement.executeQuery();
-
-        String responseGson = resultSet.getString(1);
-
-        JdbcSearchResponseResolver jdbcSearchResponseResolver = new JdbcSearchResponseResolver(responseGson);
-        JdbcSearchResponse<ProductAggResult> jdbcSearchResponse = jdbcSearchResponseResolver.resolveSearchResponse(ProductAggResult.class);
-
-        System.out.println("resp total count: " + jdbcSearchResponse.getTotalCount());
-        for (ProductAggResult aggItem : jdbcSearchResponse.getResultList()) {
-            System.out.println(String.format("code:%s, count:%s, minPrice:%s, providerLevel:%s",
-                    aggItem.getProductCode(), aggItem.getDocCount(), aggItem.getMinAdvicePrice(), aggItem.getProviderLevel()));
-        }
-    }
-}

elasticsearch-query-jdbc/src/test/java/org/es/test/jdbc/MethodQueryTest.java

@@ -1,34 +0,0 @@
-package org.es.test.jdbc;
-
-
-import org.es.jdbc.api.ElasticSingleConnectionDataSource;
-import org.es.jdbc.es.JdbcSearchResponse;
-import org.es.jdbc.es.JdbcSearchResponseResolver;
-import org.es.test.jdbc.bean.Product;
-import org.junit.Test;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-public class MethodQueryTest extends BaseJdbcTest {
-    @Test
-    public void testPrefixAndNestedQuery() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, true);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-        String sql = "select * from index.product where prefix(productName, 'iphone') and $buyers.productPrice > 1000";
-
-        PreparedStatement preparedStatement = connection.prepareStatement(sql);
-        ResultSet resultSet = preparedStatement.executeQuery();
-
-        String responseGson = resultSet.getString(1);
-        JdbcSearchResponseResolver jdbcSearchResponseResolver = new JdbcSearchResponseResolver(responseGson);
-        JdbcSearchResponse<Product> jdbcSearchResponse = jdbcSearchResponseResolver.resolveSearchResponse(Product.class);
-
-        for (Product product : jdbcSearchResponse.getResultList()) {
-            System.out.println(product.getProductName());
-        }
-    }
-}

elasticsearch-query-jdbc/src/test/java/org/es/test/jdbc/ScriptQueryTest.java

@@ -1,36 +0,0 @@
-package org.es.test.jdbc;
-
-
-import org.es.jdbc.api.ElasticSingleConnectionDataSource;
-import org.es.jdbc.es.JdbcSearchResponse;
-import org.es.jdbc.es.JdbcSearchResponseResolver;
-import org.es.test.jdbc.bean.Product;
-import org.junit.Test;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-
-public class ScriptQueryTest extends BaseJdbcTest {
-    @Test
-    public void testScriptQuery() throws Exception {
-        ElasticSingleConnectionDataSource dataSource = new ElasticSingleConnectionDataSource(url, true);
-        dataSource.setDriverClassName(driver);
-
-        Connection connection = dataSource.getConnection();
-
-        String script = "if(doc[\"advicePrice\"].empty) return false; if(my_var * doc[\"minPrice\"].value/doc[\"advicePrice\"].value > 0.363) return true; else return false;";
-        String sql = String.format("select * from index.product where script_query('%s', 'my_var:2.1f')", script);
-
-        PreparedStatement preparedStatement = connection.prepareStatement(sql);
-        ResultSet resultSet = preparedStatement.executeQuery();
-
-        String responseGson = resultSet.getString(1);
-        JdbcSearchResponseResolver jdbcSearchResponseResolver = new JdbcSearchResponseResolver(responseGson);
-        JdbcSearchResponse<Product> jdbcSearchResponse = jdbcSearchResponseResolver.resolveSearchResponse(Product.class);
-
-        for (Product product : jdbcSearchResponse.getResultList()) {
-            System.out.println(String.format("productName:%s, minPrice:%s, advicePrice:%s", product.getProductName(), product.getMinPrice(), product.getAdvicePrice()));
-        }
-    }
-}

elasticsearch-query-spring/pom.xml

@@ -1,51 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-		<groupId>org.elasticsearch</groupId>
-		<artifactId>elasticsearch-query</artifactId>
-		<version>2.4.4</version>
-	</parent>
-	
-    <artifactId>elasticsearch-query-spring</artifactId>
-	<packaging>jar</packaging>
-	<name>${project.artifactId}</name>
-	
-	<dependencies>
-		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch-query-core</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.elasticsearch</groupId>
-			<artifactId>elasticsearch-query-jdbc</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.ibatis</groupId>
-			<artifactId>ibatis-sqlmap</artifactId>
-			<version>${ibatis.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

elasticsearch-query-spring/src/test/java/org/es/test/ProductIndexQueryTest.java

@@ -1,56 +0,0 @@
-package org.es.test;
-
-import com.google.common.collect.Maps;
-import org.es.spring.ElasticSqlMapClientTemplate;
-import org.es.test.bean.Product;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.sql.SQLException;
-import java.util.List;
-import java.util.Map;
-
-public class ProductIndexQueryTest {
-
-    private ElasticSqlMapClientTemplate sqlMapClientTemplate;
-
-    @Before
-    public void initSpringContext() {
-        BeanFactory factory = new ClassPathXmlApplicationContext("application-context.xml");
-        sqlMapClientTemplate = factory.getBean(ElasticSqlMapClientTemplate.class);
-    }
-
-    public List<Product> getProductByCodeAndMatchWord(String matchWord, String productCode) throws SQLException {
-        Map<String, Object> paramMap = Maps.newHashMap();
-        paramMap.put("productCode", productCode);
-        paramMap.put("advicePrice", 1000);
-        paramMap.put("routingVal", "A");
-        paramMap.put("matchWord", matchWord);
-        paramMap.put("prefixWord", matchWord);
-        return sqlMapClientTemplate.queryForList("PRODUCT.getProductByCodeAndMatchWord", paramMap, Product.class);
-
-    }
-
-    public List<Product> getAllProduct() {
-        return sqlMapClientTemplate.queryForList("PRODUCT.getAllProduct", Product.class);
-    }
-
-
-
-    @Test
-    public void testProductQuery() throws Exception {
-        List<Product> productList = getProductByCodeAndMatchWord("iphone 6s", "IP_6S");
-        for (Product product : productList) {
-            System.out.println(product.getProductName());
-        }
-
-        System.out.println("============================>");
-
-        productList = getAllProduct();
-        for (Product product : productList) {
-            System.out.println(product.getProductName());
-        }
-    }
-}

elasticsearch-query-spring/src/test/resources/application-context.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-     http://www.springframework.org/schema/tx
-     http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-
-
-     http://www.springframework.org/schema/context
-     http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
-
-    <context:component-scan base-package="org.es" />
-
-    <bean id="elasticDataSource" class="org.es.jdbc.api.ElasticSingleConnectionDataSource" destroy-method="destroy">
-        <property name="driverClassName" value="org.es.jdbc.api.ElasticDriver" />
-        <property name="url" value="jdbc:elastic:192.168.0.108:9300/lu-search-cluster" />
-        <property name="suppressClose" value="true" />
-    </bean>
-
-
-    <bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">
-        <property name="dataSource" ref="elasticDataSource" />
-        <property name="configLocation" value="classpath:sqlMapConfig.xml"/>
-    </bean>
-
-    <bean id="sqlMapClientTemplate" class="org.es.spring.ElasticSqlMapClientTemplate">
-        <property name="sqlMapClient" ref="sqlMapClient"/>
-    </bean>
-</beans>

elasticsearch-query-spring/src/test/resources/log4j.properties

@@ -1,30 +0,0 @@
-LOG_HOME=/tmp/logs/elasticsearch-query-spring
-
-log4j.appender.reporterAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.reporterAppender.Threshold=DEBUG
-log4j.appender.reporterAppender.File=${LOG_HOME}/elasticsearch-query-spring.log
-log4j.appender.reporterAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.reporterAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.reporterAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.warnAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.warnAppender.Threshold=WARN
-log4j.appender.warnAppender.File=${LOG_HOME}/warn.log
-log4j.appender.warnAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.warnAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.3rdPartyAppender=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.3rdPartyAppender.Threshold=INFO
-log4j.appender.3rdPartyAppender.File=${LOG_HOME}/3rd-party.log
-log4j.appender.3rdPartyAppender.DatePattern='.'yyyy-MM-dd'.log'
-log4j.appender.3rdPartyAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.3rdPartyAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss SSS} [%-3p] [%t] %c{3} - %m%n
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Target=System.out
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss}[%c]-[%p]%m%n
-
-log4j.rootLogger=INFO,reporterAppender,console
-#log4j.logger.org.elasticsearch.jdbc.search=DEBUG,remoteAppender

elasticsearch-query-spring/src/test/resources/sqlMapConfig.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sqlMapConfig PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
-        "http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
-
-<sqlMapConfig>
-    <settings
-            cacheModelsEnabled="true"
-            lazyLoadingEnabled="true"
-            enhancementEnabled="true"
-            maxSessions="64"
-            maxTransactions="20"
-            maxRequests="128"
-            useStatementNamespaces="true"/>
-
-    <sqlMap resource="sqlmap/PRODUCT.xml"/>
-
-</sqlMapConfig>

elasticsearch-query-spring/src/test/resources/sqlmap/PRODUCT.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE sqlMap
-        PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
-        "http://ibatis.apache.org/dtd/sql-map-2.dtd">
-<sqlMap namespace="PRODUCT">
-    <select id="getProductByCodeAndMatchWord" parameterClass="java.util.Map" resultClass="java.lang.String">
-        SELECT *
-        FROM index.product
-        QUERY match(productName, #matchWord#) or prefix(productName, #prefixWord#, 'boost:2.0f')
-        WHERE productCode = #productCode#
-        AND advicePrice > #advicePrice#
-        AND $$buyers.buyerName IN ('china', 'usa')
-        ROUTING BY #routingVal#
-    </select>
-
-    <select id="getAllProduct" resultClass="java.lang.String">
-        SELECT * FROM index.product
-    </select>
-</sqlMap>

help-docs/help.md

@@ -1,330 +0,0 @@
-# elasticsearch-query-toolkit 使用手册
-
----
-### 一、SQL基本结构
-```bash
-## 搜索请求SQL结构
-SELECT [fields] FROM [index.type] QUERY [score query condition] WHERE [bool query condition] ORDER BY [sort field] LIMIT [0, 10]
-
-## 聚合查询SQL结构
-SELECT [MIN(field),MAX(field),SUM(field),AVG(field)] from [index.type] QUERY [score query condition] WHERE [bool query condition] GROUP BY [agg methods]
-```
-
-以上两种SQL结构分别对应ES的搜索请求和聚合请求，下面大概看看这两种结构，后续会详细介绍。
-1、搜索请求SQL
-
- - SELECT项，可以是通配符`*` 也可以是具体指定需要返回的字段（针对inner/nested文档直接通过`.`引用）
- - FROM项，后面跟的是索引名和文档类型如：product.car 表示查询product这个索引下的car类型
- - QUERY项，关键字QUERY和WHERE是同级的，不同之处是QUERY后面跟的查询条件会进行`打分`
- - WHERE项，和QUERY同级，后面跟的查询条件不会参与打分，只是进行简单的`bool匹配`
- - ORDER BY项，跟SQL一样后面跟排序条件
- - LIMIT 项，指定分页参数对应ES的from，size参数
-
-2、 聚合请求SQL
-
- - SELECT/FROM/QUERY/WHERE 项同上
- - GROUP BY项，后面跟的是需要分组查询的条件，如前支持只支持：terms、range
-
---------
-
-为了能更好的说明SQL语法的使用，我们假设已经存在一个名叫`product`的索引，索引下有一个`apple`的类型，具体的mapping像下面这样，其中provider是一个inner doc表示供应商，buyers是一个nested doc表示购买者。
-```bash
-"mappings": {
-	"apple": {
-		"properties": {
-			"productName": {
-				"type": "string",
-				"index": "not_analyzed"
-			},
-			"productCode": {
-				"type": "string",
-				"index": "not_analyzed"
-			},
-			"minPrice": {
-				"type": "double"
-			},
-			"advicePrice": {
-				"type": "double"
-			},
-			"provider": {
-				"type": "object",
-				"properties": {
-					"providerName": {
-						"type": "string",
-						"index": "not_analyzed"
-					},
-					"providerLevel" : {
-						"type": "integer"
-					}
-				}
-			},
-			"buyers": {
-				"type": "nested",
-				"properties": {
-					"buyerName": {
-						"type": "string",
-						"index": "not_analyzed"
-					},
-					"productPrice": {
-						"type": "double"
-					}
-				}
-			}
-		}
-	}
-}
-```
-
-### 二、搜索请求SQL查询语法
-**注意：由于Inner Doc和Root Doc的对应关系是一对一，Nested Doc和Root Doc的对应关系是多对一，所以为了区分这种关系在引用Nesetd Doc时需要在类型前加上 \$ 符号，如：\$buyers.buyerName(Nested Doc引用需要加 \$ 符号)，provider.privideName(Inner Doc直接引用)**
-
-#### 1. SELECT的使用
-```bash
-# 支持通配符
-SELECT * FROM product.apple
-
-# 指定具体返回的字段
-SELECT productName，productCode FROM product.apple
-
-# 对Inner Doc字段的引用直接通过 “.”
-SELECT provider.providerName FROM product.apple
-# 当然也可对Inner Doc字段通配
-SELECT productName，provider.* FROM product.apple
-
-# 对于Nested Doc的引用需要需要在类型名前加上 “$”
-SELECT $buyers.buyerName FROM product.apple
-```
-
-#### 2. WHERE条件的使用
-在SQL中WHERE项后面指定的是bool条件，不会参与打分，这些条件最终会被放到`bool query`中的`filter`中提交给ES指定
-
-##### 1) 基本条件支持 <、>、<=、>=、between...and、in、not in、is null、not null
-```bash
-SELECT * FROM product.apple WHERE minPrice >= 100 and minPrice <= 200
-SELECT * FROM product.apple WHERE minPrice BETWEEN 100 AND 200
-
-SELECT * FROM product.apple WHERE provider.providerLevel in (1, 2, 3) and provider.providerLevel not in (4, 5)
-
-SELECT * FROM product.apple WHERE productName is not null and productCode is null
-```
-
-**注意：上面SQL中`WHERE`可以完全替换成`QUERY`返回的结果一模一样，唯一不同的是`QUERY`会计算得分，`WHERE`只是单纯的bool匹配**
-
-
-##### 2) 内嵌查询patch_context自动识别
-我们都知道在针对nested doc做查询时有专门的nest查询语法，且必须指定一个nested_path才能将多个子查询放到同一个nested query context中，在使用SQL对nested doc查询时不需要显示指定某个或多个条件是存在同一个context中，程序会自动识别，看下面例子:
-
-两个条件同级都是针对内嵌文档的，会被识别存在于同一个neste context里
-```bash
-SELECT * FROM product.apple WHERE $buyers.buyerName = 'usa' and $buyers.productPrice < 200
-{
-  "query" : {
-    "bool" : {
-      "filter" : {
-        "bool" : {
-          "must" : {
-            "nested" : {
-              "query" : {
-                "bool" : {
-                  "must" : [ {
-                    "term" : {
-                      "buyers.buyerName" : "usa"
-                    }
-                  }, {
-                    "range" : {
-                      "buyers.productPrice" : {
-                        "from" : null,
-                        "to" : 200,
-                        "include_lower" : true,
-                        "include_upper" : false
-                      }
-                    }
-                  } ]
-                }
-              },
-              "path" : "buyers"
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-两个内嵌条件不同级放到不同nested context里面 
-
-```bash
-SELECT * FROM product.apple WHERE ($buyers.buyerName = 'usa' or minPrice > 100)  and $buyers.productPrice < 200
-
-{
-  "query" : {
-    "bool" : {
-      "filter" : {
-        "bool" : {
-          "must" : [ {
-            "bool" : {
-              "should" : [ {
-                "range" : {
-                  "minPrice" : {
-                    "from" : 100,
-                    "to" : null,
-                    "include_lower" : false,
-                    "include_upper" : true
-                  }
-                }
-              }, {
-                "nested" : {
-                  "query" : {
-                    "term" : {
-                      "buyers.buyerName" : "usa"
-                    }
-                  },
-                  "path" : "buyers"
-                }
-              } ]
-            }
-          }, {
-            "nested" : {
-              "query" : {
-                "range" : {
-                  "buyers.productPrice" : {
-                    "from" : null,
-                    "to" : 200,
-                    "include_lower" : true,
-                    "include_upper" : false
-                  }
-                }
-              },
-              "path" : "buyers"
-            }
-          } ]
-        }
-      }
-    }
-  }
-}
-
-```
-##### 3) Inner Doc查询直接引用即可
-```bash
-SELECT * FROM product.apple WHERE provider.providerLevel in (1, 2, 3)
-SELECT * FROM product.apple WHERE provider.providerName = 'usa'
-```
-##### 4) term 查询
-```bash
-# 在WHERE条件中指定仅仅作为bool查询
-SELECT * FROM product.apple WHERE term(productName, 'iphone6s')
-
-{
-  "query" : {
-    "bool" : {
-      "filter" : {
-        "bool" : {
-          "must" : {
-            "term" : {
-              "productName" : "iphone6s"
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-# 在QUERY条件中指定根据文档打分排序，并能指定可选参数， 指定权重
-SELECT * FROM product.apple QUERY term(productName, 'iphone6s', 'boost:2.0f')
-{
-  "query" : {
-    "bool" : {
-      "must" : {
-        "term" : {
-          "productName" : {
-            "value" : "iphone6s",
-            "boost" : 2.0
-          }
-        }
-      }
-    }
-  }
-}
-```
-**注意1：这里的可选参数是一个以key:value组成的键值对，多个键值对之间用逗号隔开**
-**注意2：terms查询和term类似，这里不再赘述**
-**注意3：term查询其实和SQL中的 “=” 操作一样**
-
-##### 5) match query使用
-```bash
-SELECT * FROM product.apple QUERY match(productName, 'iphone6s', 'boost:2.0f,type:boolean,operator:or,minimum_should_match:75%') WHERE minPrice > 100
-
-{
-  "query" : {
-    "bool" : {
-      "must" : {
-        "match" : {
-          "productName" : {
-            "query" : "iphone6s",
-            "type" : "boolean",
-            "operator" : "OR",
-            "boost" : 2.0,
-            "minimum_should_match" : "75%"
-          }
-        }
-      },
-      "filter" : {
-        "bool" : {
-          "must" : {
-            "range" : {
-              "minPrice" : {
-                "from" : 100,
-                "to" : null,
-                "include_lower" : false,
-                "include_upper" : true
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-**注意1：这里使用了QUERY和WHERE两种条件配合使用, WHERE达到过滤的效果, QUERY在过滤结果基础上再进行match匹配**
-**注意2： match查询所有的可选参数请参看官网的参数说明：https://www.elastic.co/guide/en/elasticsearch/reference/2.4/query-dsl-match-query.html**
-**注意3：match查询支持多个函数名：match、match_query、matchQuery**
-
-##### 6) multi match使用
-```bash
-SELECT * FROM product.apple QUERY multiMatch('productName^3, productCode', 'iphone6s') WHERE minPrice > 100
-
-{
-  "query" : {
-    "bool" : {
-      "must" : {
-        "multi_match" : {
-          "query" : "iphone6s",
-          "fields" : [ "productName^3", " productCode" ]
-        }
-      },
-      "filter" : {
-        "bool" : {
-          "must" : {
-            "range" : {
-              "minPrice" : {
-                "from" : 100,
-                "to" : null,
-                "include_lower" : false,
-                "include_upper" : true
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-##### 7) 
-```bash
-SELECT * FROM product.apple QUERY  WHERE minPrice > 100
-```

pom.xml

@@ -1,99 +1,116 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.elasticsearch</groupId>
-    <artifactId>elasticsearch-query</artifactId>
-    <version>2.4.4</version>
-    <packaging>pom</packaging>
-	<name>${project.artifactId}</name>
-	
-	<modules>
-        <module>elasticsearch-query-core</module>
-        <module>elasticsearch-query-jdbc</module>
-		<module>elasticsearch-query-spring</module>
-    </modules>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<name>elasticsearch-query-toolkit</name>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.es</groupId>
+	<artifactId>elasticsearch-query-toolkit</artifactId>
+	<version>${elasticsearch.version}</version>
+	<packaging>jar</packaging>
+	<description>elasticsearch-query-toolkit</description>
+	<inceptionYear>2017</inceptionYear>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
 	<properties>
+		<elasticsearch.version>2.4.4</elasticsearch.version>
 		<maven.compiler.target>1.8</maven.compiler.target>
-
-        <elasticsearch.version>2.4.4</elasticsearch.version>
-        <druid.version>1.0.24</druid.version>
-		<guava.version>18.0</guava.version>
-		<gson.version>2.3.1</gson.version>
-		<spring.version>3.0.5.RELEASE</spring.version>
-		<joda.time.version>2.3</joda.time.version>
-		<ibatis.version>2.3.4.726</ibatis.version>
+		<skip.unit.tests>false</skip.unit.tests>
 		<junit.version>4.12</junit.version>
 		<slf4j.version>1.6.1</slf4j.version>
 		<common.lang.version>2.6</common.lang.version>
 		<common.colletion.version>3.2.1</common.colletion.version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>uk.maven.org</id>
+			<name>UK MAVEN</name>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<url>http://uk.maven.org/maven2/</url>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>3.0.5.RELEASE</version>
+		</dependency>
 
-    </properties>
-	
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.ibatis</groupId>
-				<artifactId>ibatis-sqlmap</artifactId>
-				<version>${ibatis.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>org.apache.ibatis</groupId>
+			<artifactId>ibatis-sqlmap</artifactId>
+			<version>2.3.4.726</version>
+		</dependency>
 
-			<dependency>
-				<groupId>org.elasticsearch</groupId>
-				<artifactId>elasticsearch</artifactId>
-				<version>${elasticsearch.version}</version>
-				<scope>compile</scope>
-			</dependency>
-		
-			<dependency>
-				 <groupId>com.alibaba</groupId>
-				 <artifactId>druid</artifactId>
-				 <version>${druid.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.0.24</version>
+		</dependency>
 
-			<dependency>
-				<groupId>com.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>${guava.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>18.0</version>
+		</dependency>
 
-			<dependency>
-				<groupId>com.google.code.gson</groupId>
-				<artifactId>gson</artifactId>
-				<version>${gson.version}</version>
-			</dependency>
-			
-			<dependency>
-				<groupId>joda-time</groupId>
-				<artifactId>joda-time</artifactId>
-				<version>${joda.time.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.3</version>
+		</dependency>
 
-			<dependency>
-				<groupId>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>${common.colletion.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.3.1</version>
+		</dependency>
 
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>${common.lang.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+		</dependency>
 
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-log4j12</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
 
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>${elasticsearch.version}</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
     <build>
 		<pluginManagement>
@@ -135,42 +152,4 @@
 			</plugins>
 		</pluginManagement>
     </build>
-	
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <repositories>
-        <repository>
-            <id>uk.maven.org</id>
-            <name>UK MAVEN</name>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <url>http://uk.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
-	<mailingLists>
-        <mailingList>
-            <name>chennan</name>
-            <post>465360798@qq.com</post>
-        </mailingList>
-    </mailingLists>
-    
-    <developers>
-        <developer>
-            <id>chennan</id>
-            <name>chennan</name>
-            <email>465360798@qq.com</email>
-            <timezone>8</timezone>
-        </developer>
-    </developers>
 </project>

elasticsearch-query-core/src/main/java/org/es/sql/druid/ElasticSqlSelectQueryBlock.java

@@ -48,7 +48,7 @@ public class ElasticSqlSelectQueryBlock extends SQLSelectQueryBlock implements S
             this.routingValues = routingValues;
             if (CollectionUtils.isNotEmpty(routingValues)) {
                 for (SQLExpr sqlExpr : routingValues) {
-                    sqlExpr.setParent(ElasticSqlSelectQueryBlock.Routing.this);
+                    sqlExpr.setParent(Routing.this);
                 }
             }
         }