Skip to content

DEVEXP-563 Added geohashSubhashes to Optic plan builder #1613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2023
Merged

DEVEXP-563 Added geohashSubhashes to Optic plan builder #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -3240,7 +3240,7 @@ public interface CtsExpr {
* @return a CtsCircleSeqExpr sequence
*/
public CtsCircleSeqExpr circleSeq(CtsCircleExpr... items);

/**
* Constructs a sequence of CtsPeriodExpr items.
* @param items the CtsPeriodExpr items collected by the sequence
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
16 changes: 12 additions & 4 deletions marklogic-client-api/src/main/java/com/marklogic/client/expression/GeoExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -767,6 +767,17 @@ public interface GeoExpr {
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_double.html">xs:double</a> server data type
*/
public ServerExpression geohashPrecisionDimensions(ServerExpression precision);
/**
* Given a geohash string, return the 32 subhashes.
*
* <a name="ml-server-type-geohash-subhashes"></a>

* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/geo:geohash-subhashes" target="mlserverdoc">geo:geohash-subhashes</a> server function.
* @param hash The geohash string, as produced from the function geo:geohash-encode. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a> server data type
*/
public ServerExpression geohashSubhashes(ServerExpression hash);
/**
* Given a geohash string, return the 32 subhashes.
* <p>
Expand All @@ -778,9 +789,6 @@ public interface GeoExpr {
public ServerExpression geohashSubhashes(ServerExpression hash, String which);
/**
* Given a geohash string, return the 32 subhashes.
*
* <a name="ml-server-type-geohash-subhashes"></a>

* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/geo:geohash-subhashes" target="mlserverdoc">geo:geohash-subhashes</a> server function.
* @param hash The geohash string, as produced from the function geo:geohash-encode. (of <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a>)
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/JsonExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/MapExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
70 changes: 34 additions & 36 deletions marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/SemExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/SpellExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/SqlExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions marklogic-client-api/src/main/java/com/marklogic/client/expression/XdmpExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -177,7 +177,7 @@ public interface XdmpExpr {
* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/xdmp:describe" target="mlserverdoc">xdmp:describe</a> server function.
* @param item The item sequence whose description is returned. (of <a href="{@docRoot}/doc-files/types/item.html">item</a>)
* @param maxSequenceLength Represents the maximum number of items per sequence to print. The default is 3. () means no maximum. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param maxSequenceLength Represents the maximum number of items per sequence to print. The default is 3. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a> server data type
*/
public ServerExpression describe(ServerExpression item, ServerExpression maxSequenceLength);
Expand All @@ -186,8 +186,8 @@ public interface XdmpExpr {
* <p>
* Provides a client interface to the <a href="http://docs.marklogic.com/xdmp:describe" target="mlserverdoc">xdmp:describe</a> server function.
* @param item The item sequence whose description is returned. (of <a href="{@docRoot}/doc-files/types/item.html">item</a>)
* @param maxSequenceLength Represents the maximum number of items per sequence to print. The default is 3. () means no maximum. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param maxItemLength Represents the maximum number of characters per item to print. The default is 64. The minimum is 8. () means no limit. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param maxSequenceLength Represents the maximum number of items per sequence to print. The default is 3. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @param maxItemLength Represents the maximum number of characters per item to print. The default is 64. The minimum is 8. (of <a href="{@docRoot}/doc-files/types/xs_unsignedInt.html">xs:unsignedInt</a>)
* @return a server expression with the <a href="{@docRoot}/doc-files/types/xs_string.html">xs:string</a> server data type
*/
public ServerExpression describe(ServerExpression item, ServerExpression maxSequenceLength, ServerExpression maxItemLength);
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/expression/XsExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -184,7 +184,7 @@ public ServerExpression boxWest(ServerExpression box) {
return new XsExprImpl.NumericCallImpl("cts", "box-west", new Object[]{ box });
}


@Override
public CtsCircleExpr circle(double radius, ServerExpression center) {
return circle(xs.doubleVal(radius), center);
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/FnExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
11 changes: 10 additions & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/GeoExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -686,6 +686,15 @@ public ServerExpression geohashPrecisionDimensions(ServerExpression precision) {
}


@Override
public ServerExpression geohashSubhashes(ServerExpression hash) {
if (hash == null) {
throw new IllegalArgumentException("hash parameter for geohashSubhashes() cannot be null");
}
return new XsExprImpl.StringSeqCallImpl("geo", "geohash-subhashes", new Object[]{ hash });
}


@Override
public ServerExpression geohashSubhashes(ServerExpression hash, String which) {
return geohashSubhashes(hash, (which == null) ? (ServerExpression) null : xs.string(which));
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/JsonExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/MapExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/MathExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/SemExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/SpellExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/SqlExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/XdmpExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion marklogic-client-api/src/main/java/com/marklogic/client/impl/XsExprImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 MarkLogic Corporation
* Copyright (c) 2023 MarkLogic Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading