Update HeavyDB connector with most recent thrift changes (#7321)

* Update HeavyDB connector with most recent thrift changes * Add MULTIPOINT and MULTILINESTRING Signed-off-by: Misiu Godfrey <misiu.godfrey@kraken.mapd.com>
SINHASantos · Aug 28, 2023 · 5f7c30f · 5f7c30f
1 parent 88af5a5
commit 5f7c30f
Show file tree

Hide file tree

Showing 16 changed files with 351 additions and 54 deletions.
diff --git a/python/Makefile b/python/Makefile
@@ -4,6 +4,10 @@ thrift:
 	thrift -r -gen py ../heavy.thrift
 	rm -rf heavydb/thrift/*
 	cp -r gen-py/heavydb/thrift/* heavydb/thrift/
+	cp -r gen-py/heavydb/common/* heavydb/common/
+	cp -r gen-py/heavydb/completion_hints/* heavydb/completion_hints/
+	cp -r gen-py/heavydb/extension_functions/* heavydb/extension_functions/
+	cp -r gen-py/heavydb/serialized_result_set/* heavydb/serialized_result_set/
 
 .PHONY: build
 build: thrift

diff --git a/python/heavydb/_parsers.py b/python/heavydb/_parsers.py
@@ -47,7 +47,9 @@
     'DOUBLE': 'real',
     'STR': 'str',
     'POINT': 'str',
+    'MULTIPOINT': 'str',
     'LINESTRING': 'str',
+    'MULTILINESTRING': 'str',
     'POLYGON': 'str',
     'MULTIPOLYGON': 'str',
     'TINYINT': 'int',

diff --git a/python/heavydb/_utils.py b/python/heavydb/_utils.py
@@ -54,7 +54,9 @@ def date_to_seconds(arr):
     'TIME': 'int_col',
     'STR': 'str_col',
     'POINT': 'str_col',
+    'MULTIPOINT': 'str_col',
     'LINESTRING': 'str_col',
+    'MULTILINESTRING': 'str_col',
     'POLYGON': 'str_col',
     'MULTIPOLYGON': 'str_col',
     'TINYINT': 'int_col',
@@ -78,7 +80,9 @@ def date_to_seconds(arr):
     'TIME': -9223372036854775808,
     'STR': '',
     'POINT': '',
+    'MULTIPOINT': '',
     'LINESTRING': '',
+    'MULTILINESTRING': '',
     'POLYGON': '',
     'MULTIPOLYGON': '',
     'TINYINT': -128,

diff --git a/python/heavydb/common/constants.py b/python/heavydb/common/constants.py
diff --git a/python/heavydb/common/ttypes.py b/python/heavydb/common/ttypes.py
diff --git a/python/heavydb/completion_hints/constants.py b/python/heavydb/completion_hints/constants.py
diff --git a/python/heavydb/completion_hints/ttypes.py b/python/heavydb/completion_hints/ttypes.py
diff --git a/python/heavydb/dtypes.py b/python/heavydb/dtypes.py
@@ -32,7 +32,9 @@ def __hash__(self):
     [
         T.STR,
         T.POINT,
+        T.MULTIPOINT,
         T.LINESTRING,
+        T.MULTILINESTRING,
         T.POLYGON,
         T.MULTIPOLYGON,
         T.GEOMETRY,

diff --git a/python/heavydb/extension_functions/constants.py b/python/heavydb/extension_functions/constants.py