Skip to content
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.

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

Implement Support for GIS Queries #467

Merged
merged 555 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
555 commits
Select commit Hold shift + click to select a range
176bbeb
fixed a horizontal test, extracted parts of dml update
datomo Oct 28, 2023
4586802
adding additional phase for scans and modify
datomo Oct 29, 2023
78254d5
added tests for planner
datomo Oct 30, 2023
b950a71
adjusted toString to allow correct pushdown of operation of jdbc
datomo Oct 31, 2023
121e262
fixed parsing of certain binaries, filestore tests
datomo Oct 31, 2023
d217d5e
fixing vertical partitioning, partial fix horizontal
datomo Nov 1, 2023
f45dba0
fixing HorizontalPartitioningTest
datomo Nov 2, 2023
b4bdba1
fixed horizontal temperature tests
datomo Nov 3, 2023
45f13b4
fixed horizontal partition tests
datomo Nov 3, 2023
675cfeb
fixed graph representation, replaced runtimeException,AvaticaExceptio…
datomo Nov 4, 2023
36dba7e
fixing statistics, runtimeExceptions, reformatting of new parts, adju…
datomo Nov 5, 2023
4ab2191
fixed duration display
datomo Nov 6, 2023
77d6560
minor renaming, some clean-up of router, fixed result transmision
datomo Nov 6, 2023
76f68cd
adjustment for routing page and query routing
datomo Nov 7, 2023
f08a606
fixing parts of the query routing, adding version specific folders, n…
datomo Nov 7, 2023
ec1d154
adjustement to version file to work with build and during dev
datomo Nov 10, 2023
923d774
started fixing remaining core tests
datomo Nov 10, 2023
def0677
fixing rexBuilderTest
datomo Nov 12, 2023
75c76f4
logic for new planbuilder approach, default value handled correctly, …
datomo Nov 19, 2023
9eb9060
correctly used ids for routing plan caching
datomo Nov 20, 2023
52040cf
fixes for cross model queries
datomo Nov 21, 2023
0b22e1e
removing unused classes
datomo Nov 21, 2023
25c9682
fixed AlgDataTypeKey equals
datomo Nov 22, 2023
abe266f
adjustment for anyQuery methods - broken don't merge
datomo Nov 23, 2023
39947b1
streamlining query execution
datomo Nov 26, 2023
5f7cfa8
fixes for new anyQuery logic
datomo Nov 26, 2023
b57570b
removing old catalogReader inheritant classes and old tests
datomo Nov 26, 2023
0bb567e
reformatting and mongo adjustment
datomo Nov 26, 2023
ef69fde
renamed namespaceType to DataModel
datomo Nov 27, 2023
b5c21cc
fix for MonetdbStore
datomo Nov 27, 2023
6bc401a
multiple renamings, adjustment to mongodb store
datomo Nov 27, 2023
63cef21
fixes for mongo updates and additional fixes
datomo Nov 27, 2023
e1d3da3
fix for insert from other entity
datomo Nov 28, 2023
1eb7d3e
removing legacy code, fixes, for neo4j, file and cottontail adapters
datomo Nov 28, 2023
a310795
fix for splitting of sql, lots of error handling
datomo Nov 28, 2023
560131a
minor fixes for neo4j and mongodb, error handling
datomo Nov 29, 2023
bbaf695
fixes for ddls of document
datomo Nov 30, 2023
4ca57cc
adding Optional for unwrap function
datomo Dec 1, 2023
7357987
Merge branch 'refactor' of https://github.com/polypheny/Polypheny-DB …
datomo Dec 1, 2023
4c54dfd
correctly added foreign key constraint on table create
datomo Dec 2, 2023
bfdcd5e
Minor adjustments while reviewing
vogti Dec 2, 2023
0ce5d2b
fixes for result of http interface
datomo Dec 2, 2023
4888b60
Merge branch 'refactor' of https://github.com/polypheny/Polypheny-DB …
datomo Dec 2, 2023
8b0d5c3
fixes for mongodb, and result iteration
datomo Dec 3, 2023
970943b
simplification for document, dont merge
datomo Dec 4, 2023
ed350ca
don't merge, corrected default store
datomo Dec 4, 2023
bd6e849
don't merge, adjustment to mongo handling of document model
datomo Dec 4, 2023
1c0e6b6
don't merge, fixes for documentagg
datomo Dec 4, 2023
ba54b2c
Fix typo and remove stray semicolons
gartens Dec 4, 2023
fb49c61
Use of ifPresent/map etc. for some operations on Optionals
gartens Dec 5, 2023
8554d47
don't merge, adjustment to rexToMongoTransformer
datomo Dec 5, 2023
59cc9de
Merge branch 'refactor' of https://github.com/polypheny/Polypheny-DB …
datomo Dec 5, 2023
f70a3f5
don't merge, fixes for mongodb $not and project
datomo Dec 6, 2023
1f87cb5
don't merge, streamline some MongoDB stuff and fixing some failing tests
datomo Dec 6, 2023
048f8e4
don't merge, fixed multiple complex queries and transformations
datomo Dec 6, 2023
a9928cd
don't merge, aggregate working again
datomo Dec 7, 2023
9230403
don't merge all document queries running on mongo again
datomo Dec 7, 2023
fd1ce57
don't merge, most stuff works for non-native, migration some issue
datomo Dec 8, 2023
64a08d5
don't merge, fixes most document for non-native
datomo Dec 9, 2023
fa20b7f
fixed parsing of mql queries, streamlined and fixed inconsistencies w…
datomo Dec 9, 2023
b1fcade
removed debug statement
datomo Dec 9, 2023
1b7f136
added StatusService for status routes used for benchmarking/monitorin…
datomo Dec 9, 2023
6f08977
adding multiple consistency ckecks to catalog and useful error msg on…
datomo Dec 10, 2023
125bf8f
created a base class for spatial data types and basic functions to qu…
danylokravchenko Nov 1, 2023
5cc8418
GIS #462: introduced new PolyGeomotryTypes enum to remove string valu…
danylokravchenko Nov 1, 2023
de702be
GIS #462: added LineString and LinearRing types with tests for them
danylokravchenko Nov 2, 2023
571c423
GIS #462: added Polygons and test for them
danylokravchenko Nov 2, 2023
c0beecd
GIS #462: added GeometryCollections and tests for them
danylokravchenko Nov 3, 2023
35abab3
GIS #462: added some basic function to query spatial relationships of…
danylokravchenko Nov 5, 2023
5c46f4e
GIS #462: added first basic function into SQL
danylokravchenko Nov 8, 2023
7605198
GIS #462: made 2nd argument optional for ST_GeoFromText; extended tes…
danylokravchenko Nov 9, 2023
4528689
GIS #462: added some functions on LineStrings
danylokravchenko Nov 9, 2023
abd2240
GIS #462: added some functions on Polygons
danylokravchenko Nov 9, 2023
b9c6a88
GIS #462: added functions to query geometry properties
danylokravchenko Nov 10, 2023
62fee09
GIS #462: added functions to calculate distances
danylokravchenko Nov 10, 2023
4d9f57a
GIS #462: added set functions; fixed problem with SRID not beeing ass…
danylokravchenko Nov 11, 2023
f9a9802
GIS #462: cleared unused imports
danylokravchenko Nov 12, 2023
a389260
GIS #462: moved default mapping from Geometry to Text to SqlDialect
danylokravchenko Nov 30, 2023
74040be
don't merge all document queries running on mongo again
datomo Dec 7, 2023
50947a4
GIS #462: fully rebased from refactor
danylokravchenko Dec 10, 2023
8c97b08
GIS #462: added $nearSphere
danylokravchenko Dec 10, 2023
bf81f43
GIS #462: added $geoWithin
danylokravchenko Dec 10, 2023
5649a83
added trx-total to status endpoint
datomo Dec 10, 2023
2be35a0
fixed no results for all tests and graph visuals in ui
datomo Dec 11, 2023
96d0f6f
minor fix to use the correct namespace
datomo Dec 11, 2023
ec21cda
GIS #462: added $geoIntersects
danylokravchenko Dec 11, 2023
fca97e9
GIS #462: fixed tests
danylokravchenko Dec 11, 2023
e981474
GIS #462: do not push $near & $nearSphere to MongoDB
danylokravchenko Dec 12, 2023
c45b7be
GIS #462: defined Geometry in Mongo
danylokravchenko Dec 12, 2023
4e2af0f
reset Polypheny folder; introduces global and version specific folder…
datomo Dec 11, 2023
87ddc79
minor adjustment, some error handling for polyvalue
datomo Dec 11, 2023
aec9807
added "fix" for complex binary values in monetdb, added log message f…
datomo Dec 12, 2023
0b755a5
minor adjustment to fix relational values frontend
datomo Dec 13, 2023
ed3e536
adjustment for dashboard information
datomo Dec 14, 2023
6424717
don't merge, bumped junit to 5
datomo Dec 15, 2023
7b34dd0
don't merge, fixed additional tests
datomo Dec 15, 2023
e675719
fixing testing setup, and polyvalue serialization
datomo Dec 16, 2023
e7ac655
adjustment for autodocker during development
datomo Dec 17, 2023
5edb677
started fixing cross model queries
datomo Dec 18, 2023
508c34d
GIS #462: upgraded Junit to v5 in geo tests
danylokravchenko Dec 18, 2023
f0cb46b
GIS #462: integrate PostGIS objects casting
danylokravchenko Dec 19, 2023
942ea7c
GIS #462: push execution of spatial functions to PostGIS
danylokravchenko Dec 20, 2023
0a4ee0e
GIS #462: push commits before rebase with refactor
danylokravchenko Dec 25, 2023
3eaaaf6
fixing docOnLpg tests
datomo Dec 18, 2023
353d386
mini fix for jar
datomo Dec 19, 2023
8290709
fixed last cross model test
datomo Dec 20, 2023
61b4eb3
Upgrade gradle and multiple depdendencies, clean-up dependcies and li…
vogti Dec 19, 2023
b953e04
Temporarily remove -resetPlugins from runDevReset
vogti Dec 20, 2023
58c0070
minor adjustment to to polyvalues
datomo Dec 20, 2023
4c624b0
adjustment of restore function of adapter entities, adjustment of git…
datomo Dec 20, 2023
d0a0e2f
fixed graph aggregation syntax
datomo Dec 22, 2023
5bb4056
added missing cache resets
datomo Dec 22, 2023
0015bdd
fixed all document tests, minor reformatting
datomo Dec 23, 2023
679708b
Upgrade to opencsv 5.9
vogti Dec 24, 2023
b9ddb48
Some minor changes and clean-up
vogti Dec 25, 2023
22d5191
GIS #462: push commits before rebase with refactor
danylokravchenko Dec 26, 2023
c1a5be6
renamed rowType->tupleType, rewrote parts of sql json substitution lo…
datomo Dec 20, 2023
bfcf4eb
fixed last cross model test
datomo Dec 20, 2023
70d3f7b
Upgrade gradle and multiple depdendencies, clean-up dependcies and li…
vogti Dec 19, 2023
6f32c83
minor adjustment to to polyvalues
datomo Dec 20, 2023
961ab20
adjustment of restore function of adapter entities, adjustment of git…
datomo Dec 20, 2023
e77676d
Upgrade gradle and multiple depdendencies, clean-up dependcies and li…
vogti Dec 19, 2023
4cd5b22
sync before rebase
danylokravchenko Jan 9, 2024
d765de2
fixed last cross model test
datomo Dec 20, 2023
e05d315
fixed all graph tests
datomo Dec 22, 2023
d54c7d8
Create license reports for all modules
vogti Dec 27, 2023
687b4d6
fixed core tests
datomo Jan 2, 2024
db412b4
fixing dateRangeRules
datomo Jan 2, 2024
98217b5
adjustment for InterpreterTests
datomo Jan 3, 2024
2e00ee6
fixed RexExecutorTest
datomo Jan 3, 2024
82730fb
Improve docker handling and host information pages (#458)
gartens Oct 8, 2023
f5a9493
rextranslation fixes
datomo Jan 4, 2024
dc2a5a1
Fixed RexImplicationCheckerTest and code generation
datomo Jan 4, 2024
9923ad0
fixing RexProgramTest
datomo Jan 5, 2024
b050203
Replace some hard-coded strings with constants
gartens Jan 4, 2024
bd21a30
Use a record class for holding host and port
gartens Jan 4, 2024
e9e8e81
Use Files instead of passing around Strings for certificates & keys
gartens Jan 4, 2024
16ae46d
Add private constructor to utility class
gartens Jan 4, 2024
46deeaf
Small improvements to DockerManager
gartens Jan 5, 2024
a7a279e
Small improvements to DockerSetupHelper
gartens Jan 5, 2024
173fa22
Put hostname, alias, registry and the ports into a record
gartens Jan 5, 2024
b6055f5
Use DockerHost a bit more and move normalizeHostname to a dedicated D…
gartens Jan 5, 2024
3253325
Move some constants and common methods into DockerUtils
gartens Jan 5, 2024
68cbb4f
Fixed RexProgramTest and casting between RexNodes
datomo Jan 6, 2024
61ed9a6
additional fixes for RexProgram
datomo Jan 7, 2024
f49a7c1
fixing core and RexProgramTest tests
datomo Jan 7, 2024
286227c
Update workflow definitions
vogti Jan 7, 2024
bf9ee0a
fixes to rex json
datomo Jan 8, 2024
1eccb70
rearranging and fixing of TemporalFunctions
datomo Jan 8, 2024
ddfb4c5
missing file
danylokravchenko Jan 9, 2024
9a83321
fixing some of the string representation
datomo Jan 9, 2024
8007aba
adjustment of json parsing for sql json extension
datomo Jan 11, 2024
7699188
minor fix for value json parsing
datomo Jan 11, 2024
7c72382
GIS #462: added ST_Equals
danylokravchenko Jan 16, 2024
9015dbc
GIS #462: updated logic for Distance calculations
danylokravchenko Jan 17, 2024
34b043d
GIS #462: exclude geo operations from being pushed down in sql filter
danylokravchenko Jan 17, 2024
117a351
GIS #462: updated postgis version
danylokravchenko Jan 22, 2024
ab24589
Annotate fields of SnapshotModel with @JsonProperty
gartens Jan 16, 2024
c77f4b6
fixed remaining functions
datomo Jan 17, 2024
acadc5f
some adjustment for timestamps, adding missing dep to plugin tests
datomo Jan 19, 2024
f95606d
fixed cql tests
datomo Jan 20, 2024
6508dd2
fixed remaining plugin tests
datomo Jan 20, 2024
0cf67bc
reducing retries to one, fixing parameterized tests, adding missing n…
datomo Jan 21, 2024
5c3fb29
fixing some cross model queries
datomo Jan 21, 2024
b0c0e66
fixing array substitution..., fixing catching logic
datomo Jan 22, 2024
559c9a6
mini adjustment for mongo
datomo Jan 22, 2024
721ee3b
GIS #462: updated PolyGeometry after rebase
danylokravchenko Jan 23, 2024
ab23d68
fix wrong cache usages of literals
danylokravchenko Jan 30, 2024
6631755
don't reformat Poject
danylokravchenko Jan 31, 2024
52bcf35
added missing parts for lpg avg and min/max aggregate
datomo Jan 23, 2024
3875250
reflection be gone (to an extent)
datomo Jan 23, 2024
61230de
mini fixies and adjustments to remove more of the reflections
datomo Jan 24, 2024
d00fca9
adjustment to fix some complex tests
datomo Jan 25, 2024
895b6f3
fixing remaining tests for hsqldb and cheating
datomo Jan 26, 2024
d64c1eb
additional test to fix partitioning error
datomo Jan 26, 2024
7ef4457
fixed all integration and matrix tests for hsqldb, added separate plu…
datomo Jan 26, 2024
af34ea8
rewrote partition rounting, fixed heisenbug with partitions and place…
datomo Jan 29, 2024
0754186
changed sqldialect to register, enabled PolyType.TEXT for substitutes
datomo Jan 30, 2024
53624f0
fixed parsing of store for integration tests
datomo Jan 30, 2024
9e00b2c
added req. constraints to fix tests for postgres, added handling for …
datomo Jan 30, 2024
e5a8184
GIS #462: increase CHAR size; extend geo tests; change costs of enume…
danylokravchenko Feb 2, 2024
d5f8088
GIS #462: introduced spatial operations to Cypher
danylokravchenko Feb 2, 2024
df5406c
GIS #462: adjust join rules to be able to join on a function
danylokravchenko Feb 4, 2024
d76207c
GIS #462: added PostGIS object conversion
danylokravchenko Feb 5, 2024
7ca7a5f
fix for logical/physical table id
danylokravchenko Feb 7, 2024
564eec3
GIS #462: don't push geo joins if datastore does not support it
danylokravchenko Feb 24, 2024
6de605d
fixed all tests for postgresql
datomo Jan 31, 2024
f37bb62
fixed all tests for monetdb
datomo Jan 31, 2024
e6b514f
fixes and added additional blocks for pushdowns for monetdb
datomo Feb 1, 2024
eec0f05
fixed all tests for monetdb
datomo Feb 1, 2024
8efb765
adjusted wrong default store
datomo Feb 1, 2024
aa4b146
fixes for primary keys and performance penalties
datomo Feb 3, 2024
40e92bb
fixes and added stuff for file store: fixed constraints, added batchi…
datomo Feb 4, 2024
2675da7
additional fixes for file store: null values, array handling, parsing…
datomo Feb 4, 2024
abc98a7
fixes for batched updates with streamer and adjustements to temporalF…
datomo Feb 6, 2024
c699549
rewrote fileadapter to full store and removed all file excludes excep…
datomo Feb 7, 2024
ff0c7bc
fixes to statistic and adjustment for time and timestamp
datomo Feb 7, 2024
c6d6e77
adjustment for locking, fixes for filestore
datomo Feb 8, 2024
5f0e77b
fixed locking, adjusted delayed tests
datomo Feb 8, 2024
e2c8168
minor fixes for cottontail
datomo Feb 8, 2024
405f01b
started with mongodb
datomo Feb 11, 2024
e8ea962
additional fix for aggregate in mongodb
datomo Feb 12, 2024
1f0db68
fixes for foreign kye and multiple additional tests in mongodb
datomo Feb 12, 2024
b4735fe
fix for file adapter and none deterministic result
datomo Feb 13, 2024
010ebea
additional fixes for filters in mongo
datomo Feb 13, 2024
7da35e5
fixing mongo prefixed schema names, time values
datomo Feb 13, 2024
ff6b91e
fixed all mongo tests
datomo Feb 14, 2024
c52802e
fixed missing test for mongodb, started with neo4j
datomo Feb 15, 2024
c67b173
fixing arrays and multiple PolyValue as well as PolyType errors and t…
datomo Feb 16, 2024
594e348
fixed all neo4j tests, only bunnies remain
datomo Feb 17, 2024
91ecd97
started with Cottontail, fixing deletes and join tests
datomo Feb 18, 2024
07693ed
Fixing cottontail arrays
datomo Feb 19, 2024
4ea1e57
fixed null value error and temporal types, as well as sort in cottontail
datomo Feb 22, 2024
080e1f6
fixing ordering problems and ordering problems in cottontail tests
datomo Feb 23, 2024
032344b
fixed array parsing and vector handout in cottontaildb
datomo Feb 24, 2024
8f85568
fixed most cottontail tests, materialized views to go
datomo Feb 26, 2024
e54d921
Some very minor clean-up
vogti Feb 26, 2024
4f71424
mostly fixed MaterializedViewTests
datomo Feb 27, 2024
2cd256c
fixed exclude statements
datomo Feb 27, 2024
b0fb515
GIS #462: minor fixes after rebase
danylokravchenko Feb 27, 2024
f340e9a
partially fixed conflicts with master
datomo Jul 29, 2024
b16dfc2
fixed merge conflicts, adjusted missing functionality from the origin…
datomo Aug 4, 2024
1becdc1
added missing function descriptions in buildinMethods
datomo Aug 5, 2024
ebcef9e
Merge branch 'master' of https://github.com/polypheny/Polypheny-DB in…
datomo Aug 5, 2024
9221174
added missing function mappings
datomo Aug 5, 2024
da38b97
added missing library
datomo Aug 13, 2024
2277e99
fixes for new proto interface and geo values, added missing handling …
datomo Aug 13, 2024
d23a005
fix for geo tests and serialization of PolyValues
datomo Aug 13, 2024
524bbfa
removed one test due to machine inaccuracy
datomo Aug 14, 2024
cca0ea6
excluded transform test for geoFunctions
datomo Aug 14, 2024
8ca1808
added geofunctionality for mongodb
datomo Aug 14, 2024
5c55c2d
implemented GeoFunction and logic for all adapters
datomo Aug 15, 2024
e735f37
checked and adjusted licensees, removed merge artifacts
datomo Aug 15, 2024
bc0c98d
fixed merge conflicts
datomo Aug 15, 2024
09f7bea
fixed resources errors
datomo Aug 15, 2024
c7c78e7
re-added header
datomo Aug 15, 2024
4319ca5
reformatted the code
datomo Aug 15, 2024
a43261d
adjuste year in headers
datomo Aug 15, 2024
267796b
minor adjustment to ignore order for geofunction without definite order
datomo Aug 15, 2024
77dc61e
Merge branch 'master' of github.com:polypheny/Polypheny-DB into gis
datomo Aug 16, 2024
281348f
Fix merge artifacts
vogti Aug 16, 2024
3914812
Delete unused class; merge artifact
vogti Aug 16, 2024
ab862f8
Cosmetic improvements
vogti Aug 16, 2024
7474d94
Remove duplicate licensee entry
vogti Aug 16, 2024
1948b4c
Small cosmetic improvement
vogti Aug 16, 2024
1828f5e
moved postgres geo handling from jdbc-adapter-framework into postgres…
datomo Aug 19, 2024
a3c5400
reverted default store to hsqldb
datomo Aug 19, 2024
7dc8bf2
changed licensee number for postgresql, renamed earth_km variable
datomo Aug 19, 2024
06502e6
removed code-smelly fallback
datomo Aug 19, 2024
efa3fc8
Minor rewording in licensee check
vogti Aug 19, 2024
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
7 changes: 7 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,14 @@ dependencies {

api group: "io.activej", name: "activej-serializer", version: activej_serializer_version

// GIS
api group: "org.locationtech.jts", name: "jts-core", version: jts_version // Eclipse Public License 2.0 && Eclipse Distribution License 1.0 (BSD-3 Clause)
api group: "org.locationtech.jts.io", name: "jts-io-common", version: jts_version // Eclipse Public License 2.0 && Eclipse Distribution License 1.0 (BSD-3 Clause)
api group: "org.locationtech.proj4j", name: "proj4j", version: proj4j_version // Apache 2.0
api group: "org.locationtech.proj4j", name: "proj4j-epsg", version: proj4j_version // Apache 2.0

// --- Test Compile ---
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: junit_jupiter_version
testRuntimeOnly(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junit_jupiter_version)
testImplementation group: "org.hamcrest", name: "hamcrest-core", version: hamcrest_core_version // BSD 3-clause
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 The Polypheny Project
* Copyright 2019-2024 The Polypheny Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,6 +18,7 @@

import static org.polypheny.db.algebra.constant.FunctionCategory.Property.DISTANCE_FUNCTION;
import static org.polypheny.db.algebra.constant.FunctionCategory.Property.FUNCTION;
import static org.polypheny.db.algebra.constant.FunctionCategory.Property.GEO_FUNCTION;
import static org.polypheny.db.algebra.constant.FunctionCategory.Property.MULTIMEDIA_FUNCTION;
import static org.polypheny.db.algebra.constant.FunctionCategory.Property.SPECIFIC;
import static org.polypheny.db.algebra.constant.FunctionCategory.Property.TABLE_FUNCTION;
Expand All @@ -44,7 +45,8 @@ public enum FunctionCategory {
USER_DEFINED_TABLE_SPECIFIC_FUNCTION( "TABLE_UDF_SPECIFIC", "User-defined table function with SPECIFIC name", USER_DEFINED, TABLE_FUNCTION, SPECIFIC ),
MATCH_RECOGNIZE( "MATCH_RECOGNIZE", "MATCH_RECOGNIZE function", TABLE_FUNCTION ),
DISTANCE( "DISTANCE", "distance function", DISTANCE_FUNCTION ),
MULTIMEDIA( "MULTIMEDIA", "Multimedia function", MULTIMEDIA_FUNCTION );
MULTIMEDIA( "MULTIMEDIA", "Multimedia function", MULTIMEDIA_FUNCTION ),
GEOMETRY( "GEOMETRY", "Geo function", GEO_FUNCTION );

private final EnumSet<Property> properties;

Expand All @@ -71,6 +73,11 @@ public boolean isMultimedia() {
}


public boolean isGeo() {
return properties.contains( GEO_FUNCTION );
}


public boolean isTableFunction() {
return properties.contains( TABLE_FUNCTION );
}
Expand All @@ -97,7 +104,7 @@ public boolean isUserDefinedNotSpecificFunction() {
* Property of a SqlFunctionCategory.
*/
enum Property {
USER_DEFINED, TABLE_FUNCTION, SPECIFIC, FUNCTION, DISTANCE_FUNCTION, MULTIMEDIA_FUNCTION
USER_DEFINED, TABLE_FUNCTION, SPECIFIC, FUNCTION, DISTANCE_FUNCTION, MULTIMEDIA_FUNCTION, GEO_FUNCTION
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ public enum Kind {
*/
DISTANCE,

/**
* GEO functions.
*/
GEO,

/**
* POSITION Function
*/
Expand Down Expand Up @@ -1233,7 +1238,6 @@ public enum Kind {

/**
* DDL statement not handled above.
*
*/
OTHER_DDL,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,6 @@
* 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.
*
* This file incorporates code covered by the following terms:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to you under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License 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.
datomo marked this conversation as resolved.
Show resolved Hide resolved
*/

package org.polypheny.db.algebra.enumerable;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ private EnumerableRules() {

public static final EnumerableScanRule ENUMERABLE_TABLE_SCAN_RULE = new EnumerableScanRule( AlgFactories.LOGICAL_BUILDER );

public static final EnumerableTableFunctionScanRule ENUMERABLE_TABLE_FUNCTION_SCAN_RULE = new EnumerableTableFunctionScanRule( AlgFactories.LOGICAL_BUILDER );

public static final EnumerableTransformerRule ENUMERABLE_TRANSFORMER_RULE = new EnumerableTransformerRule();

public static final EnumerableLpgMatchRule ENUMERABLE_GRAPH_MATCH_RULE = new EnumerableLpgMatchRule( AlgFactories.LOGICAL_BUILDER );
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,3 @@ public Expression comparer() {
*/
public abstract Expression field( Expression expression, int field, Type fromType, Type fieldType );
}

Loading