chennan %!s(int64=8) %!d(string=hai) anos
pai
achega
390eadd5db
Modificáronse 100 ficheiros con 163 adicións e 624 borrados
  1. 0 59
      elasticsearch-query-core/pom.xml
  2. 0 27
      elasticsearch-query-jdbc/pom.xml
  3. 0 51
      elasticsearch-query-spring/pom.xml
  4. 0 330
      help-docs/help.md
  5. 155 152
      pom.xml
  6. 0 0
      src/main/java/org/es/jdbc/api/AbstractConnection.java
  7. 0 0
      src/main/java/org/es/jdbc/api/AbstractDataSource.java
  8. 0 0
      src/main/java/org/es/jdbc/api/AbstractDriverBasedDataSource.java
  9. 0 0
      src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedConnection.java
  10. 0 0
      src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedPreparedStatement.java
  11. 0 0
      src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedResultSet.java
  12. 0 0
      src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedStatement.java
  13. 0 0
      src/main/java/org/es/jdbc/api/AbstractResultSet.java
  14. 0 0
      src/main/java/org/es/jdbc/api/AbstractStatement.java
  15. 0 0
      src/main/java/org/es/jdbc/api/ConnectionProxy.java
  16. 0 0
      src/main/java/org/es/jdbc/api/DriverManagerDataSource.java
  17. 0 0
      src/main/java/org/es/jdbc/api/ElasticConnection.java
  18. 0 0
      src/main/java/org/es/jdbc/api/ElasticDatabaseMetaData.java
  19. 0 0
      src/main/java/org/es/jdbc/api/ElasticDriver.java
  20. 0 0
      src/main/java/org/es/jdbc/api/ElasticPreparedStatement.java
  21. 0 0
      src/main/java/org/es/jdbc/api/ElasticResultSet.java
  22. 0 0
      src/main/java/org/es/jdbc/api/ElasticResultSetMetaData.java
  23. 0 0
      src/main/java/org/es/jdbc/api/ElasticSingleConnectionDataSource.java
  24. 0 0
      src/main/java/org/es/jdbc/api/ElasticStatement.java
  25. 0 0
      src/main/java/org/es/jdbc/api/SmartDataSource.java
  26. 0 0
      src/main/java/org/es/jdbc/es/ElasticClientProvider.java
  27. 0 0
      src/main/java/org/es/jdbc/es/ElasticClientProxy.java
  28. 0 0
      src/main/java/org/es/jdbc/es/ElasticClientProxyProviderImpl.java
  29. 8 5
      elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/JdbcSearchActionExecutor.java
  30. 0 0
      src/main/java/org/es/jdbc/es/JdbcSearchResponse.java
  31. 0 0
      src/main/java/org/es/jdbc/es/JdbcSearchResponseExtractor.java
  32. 0 0
      src/main/java/org/es/jdbc/es/JdbcSearchResponseResolver.java
  33. 0 0
      src/main/java/org/es/jdbc/exception/BuildElasticClientException.java
  34. 0 0
      src/main/java/org/es/jdbc/exception/ResolveSearchResponseException.java
  35. 0 0
      src/main/java/org/es/spring/ElasticSqlMapClientTemplate.java
  36. 0 0
      src/main/java/org/es/spring/ElasticSqlMapExecutor.java
  37. 0 0
      src/main/java/org/es/sql/druid/ElasticSqlExprParser.java
  38. 0 0
      src/main/java/org/es/sql/druid/ElasticSqlLexer.java
  39. 0 0
      src/main/java/org/es/sql/druid/ElasticSqlSelectParser.java
  40. 0 0
      src/main/java/org/es/sql/druid/ElasticSqlSelectQueryBlock.java
  41. 0 0
      src/main/java/org/es/sql/dsl/bean/AtomQuery.java
  42. 0 0
      src/main/java/org/es/sql/dsl/bean/ElasticDslContext.java
  43. 0 0
      src/main/java/org/es/sql/dsl/bean/ElasticSqlParseResult.java
  44. 0 0
      src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryField.java
  45. 0 0
      src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryFields.java
  46. 0 0
      src/main/java/org/es/sql/dsl/bean/QueryFieldReferenceNode.java
  47. 0 0
      src/main/java/org/es/sql/dsl/bean/QueryFieldReferencePath.java
  48. 0 0
      src/main/java/org/es/sql/dsl/bean/RangeSegment.java
  49. 0 0
      src/main/java/org/es/sql/dsl/bean/SQLCondition.java
  50. 0 0
      src/main/java/org/es/sql/dsl/enums/QueryFieldType.java
  51. 0 0
      src/main/java/org/es/sql/dsl/enums/SQLBoolOperator.java
  52. 0 0
      src/main/java/org/es/sql/dsl/enums/SQLConditionOperator.java
  53. 0 0
      src/main/java/org/es/sql/dsl/enums/SQLConditionType.java
  54. 0 0
      src/main/java/org/es/sql/dsl/enums/SortOption.java
  55. 0 0
      src/main/java/org/es/sql/dsl/exception/ElasticSql2DslException.java
  56. 0 0
      src/main/java/org/es/sql/dsl/helper/ElasticSqlArgTransferHelper.java
  57. 0 0
      src/main/java/org/es/sql/dsl/helper/ElasticSqlDateParseHelper.java
  58. 0 0
      src/main/java/org/es/sql/dsl/helper/ElasticSqlMethodInvokeHelper.java
  59. 0 0
      src/main/java/org/es/sql/dsl/listener/ParseActionListener.java
  60. 0 0
      src/main/java/org/es/sql/dsl/listener/ParseActionListenerAdapter.java
  61. 0 0
      src/main/java/org/es/sql/dsl/parser/ElasticSql2DslParser.java
  62. 0 0
      src/main/java/org/es/sql/dsl/parser/query/exact/AbstractAtomExactQueryParser.java
  63. 0 0
      src/main/java/org/es/sql/dsl/parser/query/exact/BetweenAndAtomQueryParser.java
  64. 0 0
      src/main/java/org/es/sql/dsl/parser/query/exact/BinaryAtomQueryParser.java
  65. 0 0
      src/main/java/org/es/sql/dsl/parser/query/exact/IConditionExactQueryBuilder.java
  66. 0 0
      src/main/java/org/es/sql/dsl/parser/query/exact/InListAtomQueryParser.java
  67. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/AbstractFieldSpecificMethodQueryParser.java
  68. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/MethodInvocation.java
  69. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/MethodQueryParser.java
  70. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/ParameterizedMethodQueryParser.java
  71. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/expr/AbstractParameterizedMethodExpression.java
  72. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/expr/FieldSpecificMethodExpression.java
  73. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/expr/MethodExpression.java
  74. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/expr/ParameterizedMethodExpression.java
  75. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/fulltext/FullTextAtomQueryParser.java
  76. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MatchAtomQueryParser.java
  77. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MultiMatchAtomQueryParser.java
  78. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/fulltext/QueryStringAtomQueryParser.java
  79. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/fulltext/SimpleQueryStringAtomQueryParser.java
  80. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/script/ScriptAtomQueryParser.java
  81. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/FuzzyAtomQueryParser.java
  82. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/PrefixAtomQueryParser.java
  83. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/RegexpAtomQueryParser.java
  84. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/TermAtomQueryParser.java
  85. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/TermLevelAtomQueryParser.java
  86. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/TermsAtomQueryParser.java
  87. 0 0
      src/main/java/org/es/sql/dsl/parser/query/method/term/WildcardAtomQueryParser.java
  88. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/AbstractQueryConditionParser.java
  89. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryFieldParser.java
  90. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryFromParser.java
  91. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryGroupByParser.java
  92. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryLimitSizeParser.java
  93. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryMatchConditionParser.java
  94. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryOrderConditionParser.java
  95. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryParser.java
  96. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryRoutingValParser.java
  97. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QuerySelectFieldListParser.java
  98. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/QueryWhereConditionParser.java
  99. 0 0
      src/main/java/org/es/sql/dsl/parser/sql/sort/AbstractMethodSortParser.java
  100. 0 0
      elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/sort/ConditionSortBuilder.java

+ 0 - 59
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>

+ 0 - 27
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>

+ 0 - 51
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>

+ 0 - 330
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
-```

+ 155 - 152
pom.xml

@@ -1,141 +1,15 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <name>elasticsearch-query-toolkit</name>
     <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>
-	
-	<properties>
-		<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>
-		<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>
-	
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.ibatis</groupId>
-				<artifactId>ibatis-sqlmap</artifactId>
-				<version>${ibatis.version}</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.google.guava</groupId>
-				<artifactId>guava</artifactId>
-				<version>${guava.version}</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>commons-collections</groupId>
-				<artifactId>commons-collections</artifactId>
-				<version>${common.colletion.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>commons-lang</groupId>
-				<artifactId>commons-lang</artifactId>
-				<version>${common.lang.version}</version>
-			</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>
-	</dependencyManagement>
-
-    <build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.2</version>
-					<configuration>
-						<encoding>utf-8</encoding>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.11</version>
-					<configuration>
-						<includes>
-							<include>**/*Test.java</include>
-							<include>**/Test*.java</include>
-						</includes>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-    </build>
-	
+    <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>
@@ -144,6 +18,12 @@
         </license>
     </licenses>
 
+    <properties>
+        <elasticsearch.version>5.4.1</elasticsearch.version>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <skip.unit.tests>false</skip.unit.tests>
+    </properties>
+	
     <repositories>
         <repository>
             <id>uk.maven.org</id>
@@ -158,19 +38,142 @@
         </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>
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>3.0.5.RELEASE</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.ibatis</groupId>
+			<artifactId>ibatis-sqlmap</artifactId>
+			<version>2.3.4.726</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>18.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>${elasticsearch.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.3</version>
+        </dependency>
+
+		<dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <encoding>utf-8</encoding>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.11</version>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                        <include>**/Test*.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.1.2</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <outputDirectory>${project.build.directory}/releases/</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractConnection.java → src/main/java/org/es/jdbc/api/AbstractConnection.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractDataSource.java → src/main/java/org/es/jdbc/api/AbstractDataSource.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractDriverBasedDataSource.java → src/main/java/org/es/jdbc/api/AbstractDriverBasedDataSource.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedConnection.java → src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedConnection.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedPreparedStatement.java → src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedPreparedStatement.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedResultSet.java → src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedResultSet.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedStatement.java → src/main/java/org/es/jdbc/api/AbstractFeatureNotSupportedStatement.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractResultSet.java → src/main/java/org/es/jdbc/api/AbstractResultSet.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/AbstractStatement.java → src/main/java/org/es/jdbc/api/AbstractStatement.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ConnectionProxy.java → src/main/java/org/es/jdbc/api/ConnectionProxy.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/DriverManagerDataSource.java → src/main/java/org/es/jdbc/api/DriverManagerDataSource.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticConnection.java → src/main/java/org/es/jdbc/api/ElasticConnection.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticDatabaseMetaData.java → src/main/java/org/es/jdbc/api/ElasticDatabaseMetaData.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticDriver.java → src/main/java/org/es/jdbc/api/ElasticDriver.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticPreparedStatement.java → src/main/java/org/es/jdbc/api/ElasticPreparedStatement.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticResultSet.java → src/main/java/org/es/jdbc/api/ElasticResultSet.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticResultSetMetaData.java → src/main/java/org/es/jdbc/api/ElasticResultSetMetaData.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticSingleConnectionDataSource.java → src/main/java/org/es/jdbc/api/ElasticSingleConnectionDataSource.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/ElasticStatement.java → src/main/java/org/es/jdbc/api/ElasticStatement.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/api/SmartDataSource.java → src/main/java/org/es/jdbc/api/SmartDataSource.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/ElasticClientProvider.java → src/main/java/org/es/jdbc/es/ElasticClientProvider.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/ElasticClientProxy.java → src/main/java/org/es/jdbc/es/ElasticClientProxy.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/ElasticClientProxyProviderImpl.java → src/main/java/org/es/jdbc/es/ElasticClientProxyProviderImpl.java


+ 8 - 5
elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/JdbcSearchActionExecutor.java

@@ -15,13 +15,15 @@ public class JdbcSearchActionExecutor {
         return JDBC_SEARCH_ACTION_EXECUTOR;
     }
 
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> Response syncExecuteWithException(RequestBuilder requestBuilder) {
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
+    Response syncExecuteWithException(RequestBuilder requestBuilder) {
         ListenableActionFuture<Response> searchActionFuture = requestBuilder.execute();
         searchActionFuture.addListener(defaultActionListener(requestBuilder));
         return searchActionFuture.actionGet();
     }
 
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> Response syncExecute(RequestBuilder requestBuilder) {
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
+    Response syncExecute(RequestBuilder requestBuilder) {
         try {
             ListenableActionFuture<Response> searchActionFuture = requestBuilder.execute();
             searchActionFuture.addListener(defaultActionListener(requestBuilder));
@@ -32,7 +34,8 @@ public class JdbcSearchActionExecutor {
         }
     }
 
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void asyncExecute(RequestBuilder requestBuilder) {
+    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>>
+    void asyncExecute(RequestBuilder requestBuilder) {
         ListenableActionFuture<Response> searchActionFuture = requestBuilder.execute();
         searchActionFuture.addListener(defaultActionListener(requestBuilder));
     }
@@ -46,8 +49,8 @@ public class JdbcSearchActionExecutor {
             }
 
             @Override
-            public void onFailure(Throwable throwable) {
-                Logger.error(this, "Execute es req error!", throwable);
+            public void onFailure(Exception ex) {
+                Logger.error(this, "Execute es req error!", ex);
             }
         };
     }

elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/JdbcSearchResponse.java → src/main/java/org/es/jdbc/es/JdbcSearchResponse.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/JdbcSearchResponseExtractor.java → src/main/java/org/es/jdbc/es/JdbcSearchResponseExtractor.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/es/JdbcSearchResponseResolver.java → src/main/java/org/es/jdbc/es/JdbcSearchResponseResolver.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/exception/BuildElasticClientException.java → src/main/java/org/es/jdbc/exception/BuildElasticClientException.java


elasticsearch-query-jdbc/src/main/java/org/es/jdbc/exception/ResolveSearchResponseException.java → src/main/java/org/es/jdbc/exception/ResolveSearchResponseException.java


elasticsearch-query-spring/src/main/java/org/es/spring/ElasticSqlMapClientTemplate.java → src/main/java/org/es/spring/ElasticSqlMapClientTemplate.java


elasticsearch-query-spring/src/main/java/org/es/spring/ElasticSqlMapExecutor.java → src/main/java/org/es/spring/ElasticSqlMapExecutor.java


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


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


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


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


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/AtomQuery.java → src/main/java/org/es/sql/dsl/bean/AtomQuery.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/ElasticDslContext.java → src/main/java/org/es/sql/dsl/bean/ElasticDslContext.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/ElasticSqlParseResult.java → src/main/java/org/es/sql/dsl/bean/ElasticSqlParseResult.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryField.java → src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryField.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryFields.java → src/main/java/org/es/sql/dsl/bean/ElasticSqlQueryFields.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/QueryFieldReferenceNode.java → src/main/java/org/es/sql/dsl/bean/QueryFieldReferenceNode.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/QueryFieldReferencePath.java → src/main/java/org/es/sql/dsl/bean/QueryFieldReferencePath.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/RangeSegment.java → src/main/java/org/es/sql/dsl/bean/RangeSegment.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/bean/SQLCondition.java → src/main/java/org/es/sql/dsl/bean/SQLCondition.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/enums/QueryFieldType.java → src/main/java/org/es/sql/dsl/enums/QueryFieldType.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/enums/SQLBoolOperator.java → src/main/java/org/es/sql/dsl/enums/SQLBoolOperator.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/enums/SQLConditionOperator.java → src/main/java/org/es/sql/dsl/enums/SQLConditionOperator.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/enums/SQLConditionType.java → src/main/java/org/es/sql/dsl/enums/SQLConditionType.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/enums/SortOption.java → src/main/java/org/es/sql/dsl/enums/SortOption.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/exception/ElasticSql2DslException.java → src/main/java/org/es/sql/dsl/exception/ElasticSql2DslException.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/helper/ElasticSqlArgTransferHelper.java → src/main/java/org/es/sql/dsl/helper/ElasticSqlArgTransferHelper.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/helper/ElasticSqlDateParseHelper.java → src/main/java/org/es/sql/dsl/helper/ElasticSqlDateParseHelper.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/helper/ElasticSqlMethodInvokeHelper.java → src/main/java/org/es/sql/dsl/helper/ElasticSqlMethodInvokeHelper.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/listener/ParseActionListener.java → src/main/java/org/es/sql/dsl/listener/ParseActionListener.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/listener/ParseActionListenerAdapter.java → src/main/java/org/es/sql/dsl/listener/ParseActionListenerAdapter.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/ElasticSql2DslParser.java → src/main/java/org/es/sql/dsl/parser/ElasticSql2DslParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/exact/AbstractAtomExactQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/exact/AbstractAtomExactQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/exact/BetweenAndAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/exact/BetweenAndAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/exact/BinaryAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/exact/BinaryAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/exact/IConditionExactQueryBuilder.java → src/main/java/org/es/sql/dsl/parser/query/exact/IConditionExactQueryBuilder.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/exact/InListAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/exact/InListAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/AbstractFieldSpecificMethodQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/AbstractFieldSpecificMethodQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/MethodInvocation.java → src/main/java/org/es/sql/dsl/parser/query/method/MethodInvocation.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/MethodQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/MethodQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/ParameterizedMethodQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/ParameterizedMethodQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/expr/AbstractParameterizedMethodExpression.java → src/main/java/org/es/sql/dsl/parser/query/method/expr/AbstractParameterizedMethodExpression.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/expr/FieldSpecificMethodExpression.java → src/main/java/org/es/sql/dsl/parser/query/method/expr/FieldSpecificMethodExpression.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/expr/MethodExpression.java → src/main/java/org/es/sql/dsl/parser/query/method/expr/MethodExpression.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/expr/ParameterizedMethodExpression.java → src/main/java/org/es/sql/dsl/parser/query/method/expr/ParameterizedMethodExpression.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/fulltext/FullTextAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/fulltext/FullTextAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MatchAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MatchAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MultiMatchAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/fulltext/MultiMatchAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/fulltext/QueryStringAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/fulltext/QueryStringAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/fulltext/SimpleQueryStringAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/fulltext/SimpleQueryStringAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/script/ScriptAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/script/ScriptAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/FuzzyAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/FuzzyAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/PrefixAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/PrefixAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/RegexpAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/RegexpAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/TermAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/TermAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/TermLevelAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/TermLevelAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/TermsAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/TermsAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/query/method/term/WildcardAtomQueryParser.java → src/main/java/org/es/sql/dsl/parser/query/method/term/WildcardAtomQueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/AbstractQueryConditionParser.java → src/main/java/org/es/sql/dsl/parser/sql/AbstractQueryConditionParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryFieldParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryFieldParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryFromParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryFromParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryGroupByParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryGroupByParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryLimitSizeParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryLimitSizeParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryMatchConditionParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryMatchConditionParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryOrderConditionParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryOrderConditionParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryRoutingValParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryRoutingValParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QuerySelectFieldListParser.java → src/main/java/org/es/sql/dsl/parser/sql/QuerySelectFieldListParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/QueryWhereConditionParser.java → src/main/java/org/es/sql/dsl/parser/sql/QueryWhereConditionParser.java


elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/sort/AbstractMethodSortParser.java → src/main/java/org/es/sql/dsl/parser/sql/sort/AbstractMethodSortParser.java


+ 0 - 0
elasticsearch-query-core/src/main/java/org/es/sql/dsl/parser/sql/sort/ConditionSortBuilder.java


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio