Skip to content

[Fix] Fix overgeneralizaiton of var to varlist #83

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
colinthebomb1 merged 1 commit into from
Oct 7, 2025
Merged

[Fix] Fix overgeneralizaiton of var to varlist #83

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
7 changes: 1 addition & 6 deletions core/rule_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def _fingerPrint(fingerPrint: str) -> str:
@staticmethod
def _fingerPrint2(fingerPrint: str) -> str:
# get rid of the numbers inside each var/varList
fingerPrint = re.sub(r"V(\d+)>", "V", fingerPrint)
fingerPrint = re.sub(r"V(\d+)", "V", fingerPrint)
fingerPrint = re.sub(r"VL(\d+)", "VL", fingerPrint)
return fingerPrint

Expand Down Expand Up @@ -2563,11 +2563,6 @@ def variablize_all_subtrees(rule: dict, subtrees: list) -> dict:
new_rule_rewrite_json = json.loads(new_rule['rewrite_json'])

for subtree in subtrees:
# Prevents already variablized subtrees from being variablized again in an infinite loop
# ex. {"value": "V22"} should not be variablized again
if len(subtree) == 1 and 'value' in subtree and QueryRewriter.is_var(subtree['value']):
continue

# Find a variable name for the given subtree
#
new_rule_mapping, newVarInternal = RuleGenerator.findNextVarInternal(new_rule_mapping)
Expand Down
85 changes: 62 additions & 23 deletions tests/test_rule_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ def test_generate_rule_graph_0():

def unify_variable_names(q0, q1):
# Variable pattern
pattern = r'<<[^>]*>>|<[^>]*>'
pattern = r'<<[^>]+>>|<[a-zA-Z][^>]*>'

# Find all variables in q0 and q1, and unify their names into xi in ascending order
substrings = re.findall(pattern, q0 + q1)
Expand Down Expand Up @@ -1920,30 +1920,21 @@ def test_generate_general_rule_7():
FROM <x2>
'''))

# TODO - fix issue with <x1> becoming <<y>>
# def test_generate_general_rule_8():
def test_generate_general_rule_8():

# q0 = '''
# SELECT * FROM t WHERE CAST(created_at AS DATE) = TIMESTAMP '2016-10-01 00:00:00.000'
# '''
# q1 = '''
# SELECT * FROM t WHERE created_at = TIMESTAMP '2016-10-01 00:00:00.000'
# '''
q0 = '''
SELECT * FROM t WHERE CAST(created_at AS DATE) = TIMESTAMP '2016-10-01 00:00:00.000'
'''
q1 = '''
SELECT * FROM t WHERE created_at = TIMESTAMP '2016-10-01 00:00:00.000'
'''

# rule = RuleGenerator.generate_general_rule(q0, q1)
# assert type(rule) is dict
rule = RuleGenerator.generate_general_rule(q0, q1)
assert type(rule) is dict

# assert StringUtil.strim(RuleGenerator._fingerPrint(rule['pattern'])) == StringUtil.strim(RuleGenerator._fingerPrint('''
# CAST(<x1> AS DATE)
# ''')) or StringUtil.strim(RuleGenerator._fingerPrint(rule['rewrite'])) == StringUtil.strim(RuleGenerator._fingerPrint('''
# CAST(<<y>> AS DATE)
# '''))
assert StringUtil.strim(RuleGenerator._fingerPrint(rule['pattern'])) == StringUtil.strim(RuleGenerator._fingerPrint("CAST(<x1> AS DATE)"))

# assert StringUtil.strim(RuleGenerator._fingerPrint(rule['rewrite'])) == StringUtil.strim(RuleGenerator._fingerPrint('''
# <x1>
# ''')) or StringUtil.strim(RuleGenerator._fingerPrint(rule['rewrite'])) == StringUtil.strim(RuleGenerator._fingerPrint('''
# <<y>>
# '''))
assert StringUtil.strim(RuleGenerator._fingerPrint(rule['rewrite'])) == StringUtil.strim(RuleGenerator._fingerPrint("<x1>"))


def test_generate_general_rule_9():
Expand Down Expand Up @@ -2286,6 +2277,54 @@ def test_generate_general_rule_22():
assert q0_rule == "SELECT <<x1>>, DATE(<x2>.<x3>), CASE WHEN SUM(CASE WHEN <x2>.<x4> = <x5> THEN <x5> ELSE <x6> END) >= <x5> THEN <x5> ELSE <x6> END FROM <x2> GROUP BY <<x7>>, DATE(<x2>.<x3>)"
assert q1_rule == "SELECT <<x1>>, <x2>.<x3> FROM (SELECT <x8>, DATE(<x3>) FROM <x2> WHERE <x4> = <x5>) AS t1 GROUP BY <<x7>>, <x2>.<x3>"

# TODO: fix issue with test random
# def test_generate_spreadsheet_id_2():
# q0 = """SELECT *
# FROM place
# WHERE "select" = TRUE
# OR exists (SELECT id
# FROM bookmark
# WHERE user IN (1,2,3,4)
# AND bookmark.place = place.id)
# LIMIT 10;"""

# q1 = """SELECT *
# FROM (
# (SELECT *
# FROM place
# WHERE "select" = True
# LIMIT 10)
# UNION
# (SELECT *
# FROM place
# WHERE EXISTS
# (SELECT 1
# FROM bookmark
# WHERE user IN (1, 2, 3, 4)
# AND bookmark.place = place.id)
# LIMIT 10))
# LIMIT 10;"""

# rule = RuleGenerator.generate_general_rule(q0, q1)
# assert type(rule) is dict

# q0_rule, q1_rule = unify_variable_names(rule['pattern'], rule['rewrite'])
# assert q0_rule == "FROM <x1> WHERE <x2> OR EXISTS (SELECT <x3> FROM <x4> WHERE <x5> IN (<x6>, <x7>, <x8>, <x9>) AND <<x10>>)"
# assert q1_rule == "FROM ((SELECT <<x11>> FROM <x1> WHERE <x2> LIMIT <x12>) UNION (SELECT <<x11>> FROM <x1> WHERE EXISTS (SELECT <x6> FROM <x4> WHERE <x5> IN (<x6>, <x7>, <x8>, <x9>) AND <<x10>>) LIMIT <x12>))"

def test_generate_spreadsheet_id_3():
q0 = """SELECT EMPNO FROM EMP WHERE EMPNO > 10 AND EMPNO <= 10"""

q1 = """SELECT EMPNO FROM EMP WHERE FALSE"""

rule = RuleGenerator.generate_general_rule(q0, q1)
assert type(rule) is dict

q0_rule, q1_rule = unify_variable_names(rule['pattern'], rule['rewrite'])
assert q0_rule == "<x1> > <x2> AND <x1> <= <x2>"
assert q1_rule == "False"


def test_generate_spreadsheet_id_4():
q0 = """SELECT entities.data FROM entities WHERE
entities._id IN (SELECT index_users_email._id FROM index_users_email WHERE index_users_email.key = 'test')
Expand Down Expand Up @@ -2517,8 +2556,8 @@ def test_generate_spreadsheet_id_18():
assert type(rule) is dict

q0_rule, q1_rule = unify_variable_names(rule['pattern'], rule['rewrite'])
assert q0_rule == "SELECT DISTINCT ON (<x1>) <x2>, <x3>, <x1>, COALESCE(<x4>.<x5>, <x6>), <<x7>> FROM <x8> LEFT JOIN <x4> ON <<x9>> LEFT JOIN <x10> ON <<x11>> WHERE <<x12>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) AND <<x21>> ORDER BY <x8>.<x22> DESC"
assert q1_rule == "SELECT <x2>, <x3>, <x1>, COALESCE((SELECT <x4>.<x5> FROM <x4> WHERE <<x9>> AND <<x21>> LIMIT <x15>), <x6>), (SELECT <<x7>> FROM <x10> WHERE <<x11>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) LIMIT <x15>) FROM <x8> WHERE <<x12>>"
assert StringUtil.strim(RuleGenerator._fingerPrint(q0_rule)) == StringUtil.strim(RuleGenerator._fingerPrint("SELECT DISTINCT ON (<x1>) <x2>, <x3>, <x4>, COALESCE(<x5>.<x6>, <x7>), <<x8>> FROM <x9> LEFT JOIN <x5> ON <<x10>> LEFT JOIN <x11> ON <<x12>> WHERE <<x13>> AND <x11>.<x14> IN (<x15>, <x16>, <x17>, <x18>, <x19>, <x20>, <x21>) AND <<x22>> ORDER BY <x9>.<x23> DESC"))
assert StringUtil.strim(RuleGenerator._fingerPrint(q1_rule)) == StringUtil.strim(RuleGenerator._fingerPrint("SELECT <x2>, <x3>, <x1>, COALESCE((SELECT <x4>.<x5> FROM <x4> WHERE <<x9>> AND <<x21>> LIMIT <x15>), <x6>), (SELECT <<x7>> FROM <x10> WHERE <<x11>> AND <x10>.<x13> IN (<x14>, <x15>, <x16>, <x17>, <x18>, <x19>, <x20>) LIMIT <x15>) FROM <x8> WHERE <<x12>>"))

def test_generate_spreadsheet_id_20():
q0 = """SELECT * FROM (SELECT * FROM (SELECT NULL FROM EMP) WHERE N IS NULL) WHERE N IS NULL"""
Expand Down