This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support Elasticsearch geo_point and ip data type (#719)
- Loading branch information
Showing
24 changed files
with
434 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
...endistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprGeoPointValue.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * | ||
| * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.sql.elasticsearch.data.value; | ||
|
|
||
| import static com.amazon.opendistroforelasticsearch.sql.elasticsearch.data.type.ElasticsearchDataType.ES_GEO_POINT; | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.sql.data.model.AbstractExprValue; | ||
| import com.amazon.opendistroforelasticsearch.sql.data.model.ExprValue; | ||
| import com.amazon.opendistroforelasticsearch.sql.data.type.ExprType; | ||
| import java.util.Objects; | ||
| import lombok.Data; | ||
|
|
||
| /** | ||
| * Elasticsearch GeoPointValue. | ||
| * Todo, add this to avoid the unknown value type exception, the implementation will be changed. | ||
| */ | ||
| public class ElasticsearchExprGeoPointValue extends AbstractExprValue { | ||
|
|
||
| private final GeoPoint geoPoint; | ||
|
|
||
| public ElasticsearchExprGeoPointValue(Double lat, Double lon) { | ||
| this.geoPoint = new GeoPoint(lat, lon); | ||
| } | ||
|
|
||
| @Override | ||
| public Object value() { | ||
| return geoPoint; | ||
| } | ||
|
|
||
| @Override | ||
| public ExprType type() { | ||
| return ES_GEO_POINT; | ||
| } | ||
|
|
||
| @Override | ||
| public int compare(ExprValue other) { | ||
| return geoPoint.toString() | ||
| .compareTo((((ElasticsearchExprGeoPointValue) other).geoPoint).toString()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equal(ExprValue other) { | ||
| return geoPoint.equals(((ElasticsearchExprGeoPointValue) other).geoPoint); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hashCode(geoPoint); | ||
| } | ||
|
|
||
| @Data | ||
| public static class GeoPoint { | ||
|
|
||
| private final Double lat; | ||
|
|
||
| private final Double lon; | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
...zon/opendistroforelasticsearch/sql/elasticsearch/data/value/ElasticsearchExprIpValue.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * | ||
| * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.sql.elasticsearch.data.value; | ||
|
|
||
| import static com.amazon.opendistroforelasticsearch.sql.elasticsearch.data.type.ElasticsearchDataType.ES_IP; | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.sql.data.model.AbstractExprValue; | ||
| import com.amazon.opendistroforelasticsearch.sql.data.model.ExprValue; | ||
| import com.amazon.opendistroforelasticsearch.sql.data.type.ExprType; | ||
| import java.util.Objects; | ||
| import lombok.RequiredArgsConstructor; | ||
|
|
||
| /** | ||
| * Elasticsearch IP ExprValue. | ||
| * Todo, add this to avoid the unknown value type exception, the implementation will be changed. | ||
| */ | ||
| @RequiredArgsConstructor | ||
| public class ElasticsearchExprIpValue extends AbstractExprValue { | ||
|
|
||
| private final String ip; | ||
|
|
||
| @Override | ||
| public Object value() { | ||
| return ip; | ||
| } | ||
|
|
||
| @Override | ||
| public ExprType type() { | ||
| return ES_IP; | ||
| } | ||
|
|
||
| @Override | ||
| public int compare(ExprValue other) { | ||
| return ip.compareTo(((ElasticsearchExprIpValue) other).ip); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equal(ExprValue other) { | ||
| return ip.equals(((ElasticsearchExprIpValue) other).ip); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hashCode(ip); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.