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

Improve negate performance #20

Merged
merged 3 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Tests
'on':
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
test_mysql:
runs-on: ubuntu-20.04
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html

### Compatible changes

## 0.11.2 2024-10-31

### Compatible changes

- Fix: Performance of queries using a negation ("-xxx") is improved by using an anti-join instead of a "NOT IN".

## 0.11.1 2024-08-22

### Compatible changes
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.4.2.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.4.2.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.5.2.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.5.2.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.6.0.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.6.0.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.6.1.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.6.1.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.0.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.0.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.1.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.1.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.2.mysql2.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.7.2.pg.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
minidusen (0.11.1)
minidusen (0.11.2)
activerecord (>= 3.2)
activesupport (>= 3.2)
edge_rider (>= 0.2.5)
Expand Down
17 changes: 14 additions & 3 deletions lib/minidusen/syntax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class Syntax

def initialize
@scopers = {}
@alias_count = 0
end

def learn_field(field, &scoper)
Expand Down Expand Up @@ -45,9 +46,19 @@ def apply_query(instance, root_scope, query)

def append_excludes(instance, matches, exclude_query)
excluded_records = apply_query(instance, matches.origin_class, exclude_query)
qualified_id_field = Util.qualify_column_name(excluded_records, excluded_records.primary_key)
exclude_sql = "#{qualified_id_field} NOT IN (#{excluded_records.select(qualified_id_field).to_sql})"
matches.where(exclude_sql)
primary_key = excluded_records.primary_key
join_alias = "exclude_#{@alias_count += 1}"
# due to performance reasons on big tables this needs to be implemented as an anti-join
# will generate SQL like
# LEFT JOIN (SELECT "users"."id" FROM "users" WHERE $condition) excluded
# ON "users"."id" = "excluded"."id"
# WHERE "excluded"."id" IS NULL
matches
.joins(<<~SQL)
LEFT JOIN (#{excluded_records.select(primary_key).to_sql}) #{join_alias}
ON #{Util.qualify_column_name(excluded_records, primary_key)} = #{Util.qualify_column_name(excluded_records, primary_key, table_name: join_alias)}
SQL
.where(join_alias => { primary_key => nil })
end

end
Expand Down
4 changes: 2 additions & 2 deletions lib/minidusen/util.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ def escape_for_like_query(phrase)
escape_with_backslash(phrase, ['%', '_'])
end

def qualify_column_name(model, column_name)
def qualify_column_name(model, column_name, table_name: model.table_name)
column_name = column_name.to_s
unless column_name.include?('.')
quoted_table_name = model.connection.quote_table_name(model.table_name)
quoted_table_name = model.connection.quote_table_name(table_name)
quoted_column_name = model.connection.quote_column_name(column_name)
column_name = "#{quoted_table_name}.#{quoted_column_name}"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/minidusen/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Minidusen
VERSION = '0.11.1'
VERSION = '0.11.2'
end
8 changes: 8 additions & 0 deletions spec/minidusen/filter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@
user_filter.filter(User, '-name_and_city_regex:Power').to_a.should == [match]
end

it 'can be filtered twice' do
match = User.create!(:name => 'Sunny Flower', :city => "Flower")
no_match = User.create!(:name => 'Sunny Power', :city => "Power")
also_no_match = User.create!(:name => 'Sunny Forever', :city => "Forever")
first_result = user_filter.filter(User, '-name_and_city_regex:Power')
user_filter.filter(first_result, '-name_and_city_regex:Forever').to_a.should == [match]
end

end

context 'when the given query is blank' do
Expand Down
Loading