@@ -60,7 +60,7 @@ func (s *dbserver) Query(ctx context.Context, query *server.DataQuery) (result *
6060
6161 var dataResult * server.DataQueryResult
6262 now := time .Now ()
63- if dataResult , err = sqlQuery (ctx , [] string { query . Key }, query . Sql , db ); err == nil {
63+ if dataResult , err = sqlQuery (ctx , query , db ); err == nil {
6464 result .Items = dataResult .Items
6565 result .Meta .Duration = time .Since (now ).String ()
6666 }
@@ -161,16 +161,19 @@ func createCountRequests(ctx context.Context, db *elasticsearch.Client, index []
161161 return searchRequests
162162}
163163
164- func createSearchRequests (ctx context.Context , db * elasticsearch.Client , index [] string , sql string ) []func (* esapi.SearchRequest ) {
164+ func createSearchRequests (ctx context.Context , db * elasticsearch.Client , query * server. DataQuery ) []func (* esapi.SearchRequest ) {
165165 searchRequests := []func (* esapi.SearchRequest ){
166166 db .Search .WithContext (ctx ),
167167 db .Search .WithSize (100 ),
168168 db .Search .WithTrackTotalHits (true ),
169- db .Search .WithIndex (index ... ),
169+ db .Search .WithIndex (query .Key ),
170+ db .Search .WithFrom (int (query .Offset )),
171+ db .Search .WithSize (int (query .Limit )),
170172 db .Search .WithPretty (),
171173 }
174+
172175 // https://www.elastic.co/guide/en/kibana/current/lucene-query.html
173- if ! isLuceneQuery (sql ) {
176+ if ! isLuceneQuery (query . Sql ) {
174177 searchRequests = append (searchRequests , db .Search .WithBody (strings .NewReader (fmt .Sprintf (`{
175178 "query": {
176179 "wildcard": {
@@ -179,9 +182,9 @@ func createSearchRequests(ctx context.Context, db *elasticsearch.Client, index [
179182 }
180183 }
181184 }
182- }` , sql ))))
185+ }` , query . Sql ))))
183186 } else {
184- searchRequests = append (searchRequests , db .Search .WithQuery (sql ))
187+ searchRequests = append (searchRequests , db .Search .WithQuery (query . Sql ))
185188 }
186189 return searchRequests
187190}
@@ -192,15 +195,15 @@ func isLuceneQuery(query string) bool {
192195 return matched
193196}
194197
195- func sqlQuery (ctx context.Context , index [] string , sql string , db * elasticsearch.Client ) (result * server.DataQueryResult , err error ) {
198+ func sqlQuery (ctx context.Context , query * server. DataQuery , db * elasticsearch.Client ) (result * server.DataQueryResult , err error ) {
196199 result = & server.DataQueryResult {
197200 Data : []* server.Pair {},
198201 Items : make ([]* server.Pairs , 0 ),
199202 Meta : & server.DataMeta {},
200203 }
201204
202- fmt .Printf ("query from index [%v], sql [%s]\n " , index , sql )
203- searchRequests := createSearchRequests (ctx , db , index , sql )
205+ fmt .Printf ("query from index [%v], sql [%s]\n " , query . Key , query . Sql )
206+ searchRequests := createSearchRequests (ctx , db , query )
204207
205208 var res * esapi.Response
206209 if res , err = db .Search (searchRequests ... ); err != nil {
0 commit comments