remove the obsolete handling of the indexed objects

Author: kimakan

src/queryparser/common/common.py

@@ -734,15 +734,7 @@ def process_query(self, replace_schema_name=None, indexed_objects=None):
         :param replace_schema_name:
             A new schema name to be put in place of the original.
 
-        :param indexed_objects:
-            A dictionary defining pgsphere objects to be replaced with 
-            precomputed (on the database level) columns. For example,
-
-            iob = {'spoint': ((('gdr2', 'gaia_source', 'ra'),
-                               ('gdr2', 'gaia_source', 'dec'), 'pos'),)}
-
-            will replace 'spoint(RADIANS(ra), RADIANS(dec))' with a 'pos'
-            column.
+        :param indexed_objects: Deprecated
 
         """
         # Antlr objects
@@ -893,14 +885,6 @@ def process_query(self, replace_schema_name=None, indexed_objects=None):
                                          for i in mc])
                 raise QueryError("Unreferenced column(s): '%s'." % unref_cols)
 
-        # If we have indexed_objects, we are also accessing those. We
-        # need to add them into the columns stack:
-        if indexed_objects is not None:
-            for k, v in indexed_objects.items():
-                for vals in v:
-                    touched_columns.append([[vals[0][0], vals[0][1], vals[2],
-                                           None], None])
-
         touched_columns = set([tuple(i[0]) for i in touched_columns])
 
         # extract display_columns
@@ -942,25 +926,6 @@ def process_query(self, replace_schema_name=None, indexed_objects=None):
                                       if i[0][1] is not None else i[0][1]])
                                 for i in tables]))
 
-        # If there are any sphere-like objects (pgsphere...) that are indexed
-        # we need to replace the ADQL translated query parts with the indexed
-        # column names
-        if indexed_objects is not None and self.sphere_listener is not None:
-            # we need to correctly alias 'pos' columns
-            for k, v in indexed_objects.items():
-                indexed_objects[k] = list([list(i) for i in v])
-                for i, vals in enumerate(v):
-                    for t in tables:
-                        if vals[0][0] == t[0][0] and vals[0][1] == t[0][1] and\
-                                t[1] is not None:
-                            indexed_objects[k][i][2] = t[1] + '.' +\
-                                    indexed_objects[k][i][2]
-
-            sphere_listener = self.sphere_listener(columns, indexed_objects)
-            self.walker.walk(sphere_listener, tree)
-            for k, v in sphere_listener.replace_dict.items():
-                self._query = self._query.replace(k, v)
-
     @property
     def query(self):
         """

src/queryparser/postgresql/postgresqllisteners.py

@@ -1,51 +1,3 @@
 # -*- coding: utf-8 -*-
-
-from __future__ import (absolute_import, print_function)
-
-import antlr4
-
-from .PostgreSQLParserListener import PostgreSQLParserListener
-
-from ..common import process_column_name, get_column_name_listener
-
-
-class PgSphereListener(PostgreSQLParserListener):
-
-    def __init__(self, columns, indexed_objects=None):
-        self.column_name_listener = get_column_name_listener(
-                PostgreSQLParserListener)()
-        self.walker = antlr4.ParseTreeWalker()
-
-        self.cctx_dict = {}
-        for c in columns:
-            try:
-                # PgSphere sphere stuff can't be in the USING statement
-                self.cctx_dict[c[3]] = c[:3]
-            except IndexError:
-                pass
-
-        self.indexed_objects = indexed_objects
-        self.replace_dict = {}
-
-    def enterSpoint(self, ctx):
-        try:
-            spoint = self.indexed_objects['spoint']
-        except KeyError:
-            return
-
-        cn = process_column_name(self.column_name_listener, self.walker, ctx,
-                                 '"')
-        cols = []
-
-        for c in cn:
-            try:
-                cols.append(self.cctx_dict[c[3]])
-            except KeyError:
-                pass
-
-        if len(cols):
-            for sp in spoint:
-                if sp[0] == cols[0] and sp[1] == cols[1]:
-                    rt = ctx.start.getInputStream().getText(ctx.start.start,
-                                                            ctx.stop.stop)
-                    self.replace_dict[rt] = sp[2]
+#
+# Put any PostgreSQL specific listeners here.

src/queryparser/postgresql/postgresqlprocessor.py

@@ -14,13 +14,10 @@
 from .PostgreSQLParser import PostgreSQLParser
 from .PostgreSQLParserListener import PostgreSQLParserListener
 
-from .postgresqllisteners import PgSphereListener
-
 from ..common import SQLQueryProcessor
 
 
 class PostgreSQLQueryProcessor(SQLQueryProcessor):
     def __init__(self, query=None):
         super().__init__(PostgreSQLLexer, PostgreSQLParser,
-                         PostgreSQLParserListener, '"', query,
-                         PgSphereListener)
+                         PostgreSQLParserListener, '"', query)

src/queryparser/testing/tests.yaml

@@ -7,7 +7,6 @@
 # - display columns in form col_name: db.tab.col 
 # - tables accessed by the query
 # - schema replacement name (optional)
-# - indexed objects (optional)
 
 common_tests:
     -
@@ -164,7 +163,7 @@ common_tests:
         - ['foo.tab']
         - 'd': 'foo'
 
-    -   
+    -
         - SELECT DISTINCT t.table_name
           FROM tap_schema.tabs AS t
           JOIN tap_schema.cols AS c USING (table_name)
@@ -197,12 +196,12 @@ common_tests:
         - ['MDR1.FOF.x', 'MDR1.FOF.y', 'MDR1.FOF.z', 'MDR1.FOF.mass',
            'MDR1.FOF.snapnum']
         - ['limit', 'order by', 'group by']
-        - 
+        -
         - ['x: MDR1.FOF.x', 'y: MDR1.FOF.y', 'z: MDR1.FOF.z',
            'mass: MDR1.FOF.mass']
         - ['MDR1.FOF']
 
-    -   
+    -
         - SELECT h.Mvir, h.spin, g.diskMassStellar,
                  g.diskMassStellar/h.Mvir AS mass_ratio
           FROM MDPL2.Rockstar AS h, MDPL2.Galacticus AS g
@@ -380,16 +379,16 @@ common_tests:
         -
         -
         - ['db.tab', 'db.blem']
-        
+
     -
         - SELECT t1.a, t2.b, t3.c, t4.z
           FROM d.tab t1, db2.tab t2, foo.tab t3, x.y t4
         - ['foo.tab.a', 'bar.tab.b', 'bas.tab.c', 'x.y.z']
-        - 
+        -
         -
         - ['a: foo.tab.a', 'b: bar.tab.b', 'c: bas.tab.c', 'z: x.y.z']
         - ['foo.tab', 'bas.tab', 'bar.tab', 'x.y']
-        - 
+        -
           'd': 'foo'
           'db2': 'bar'
           'foo': 'bas'
@@ -495,7 +494,7 @@ common_translation_tests:
         -
         -
 
-        
+
 mysql_tests:
     -
         - SELECT `fi@1`, fi2
@@ -624,20 +623,20 @@ mysql_tests:
 postgresql_tests:
     -
         - SELECT pdist(1000, 10, 11, 12, 11, 11, 12)
-        - 
-        - 
+        -
+        -
         - ['pdist']
-        - 
-        - 
+        -
+        -
 
     -
         - SELECT DISTINCT ON ("source"."tycho2_id") "tycho2_id", "source"."tycho2_dist"
           FROM "applause_dr3"."source_calib" AS "source"
         - ['applause_dr3.source_calib.tycho2_id', 'applause_dr3.source_calib.tycho2_dist']
-        - 
-        - 
-        - 
-        - 
+        -
+        -
+        -
+        -
 
     -
         - SELECT ra, dec FROM gdr1.gaia_source