| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
The caller needs to have knowledge of the rollback either way, so do it
all in the caller (#transaction)
|
| | |
| | |
| | |
| | | |
This avoids us having to manually increment and decrement it.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
during a"
This reverts commit c24c885209ac2334dc6f798c394a821ee270bec6.
Here's the explanation I just sent to @tenderlove:
Hey,
I've been thinking about about the transaction memory leak thing that we
were discussing.
Example code:
post = nil
Post.transaction do
N.times { post = Post.create }
end
Post.transaction is going to create a real transaction and there will
also be a (savepoint) transaction inside each Post.create.
In an idea world, we'd like all but the last Post instance to be GC'd,
and for the last Post instance to receive its after_commit callback when
Post.transaction returns.
I can't see how this can work using your solution where the Post itself
holds a reference to the transaction it is in; when Post.transaction
returns, control does not switch to any of Post's instance methods, so
it can't trigger the callbacks itself.
What we really want is for the transaction itself to hold weak
references to the objects within the transaction. So those objects can
be GC'd, but if they are not GC'd then the transaction can iterate them
and execute their callbacks.
I've looked into WeakRef implementations that are available. On 1.9.3,
the stdlib weakref library is broken and we shouldn't use it.
There is a better implementation here:
https://github.com/bdurand/ref/blob/master/lib/ref/weak_reference/pure_ruby.rb
We could use that, either by pulling in the gem or just copying the code
in, but it still suffers from the limitation that it uses ObjectSpace
finalizers.
In my testing, this finalizers make GC quite expensive:
https://gist.github.com/3722432
Ruby 2.0 will have a native WeakRef implementation (via
ObjectSpace::WeakMap), hence won't be reliant on finalizers:
http://bugs.ruby-lang.org/issues/4168
So the ultimate solution will be for everyone to use Ruby 2.0, and for
us to just use ObjectSpace::WeakMap.
In the meantime, we have basically 3 options:
The first is to leave it as it is.
The second is to use a finalizer-based weakref implementation and take
the GC perf hit.
The final option is to store object ids rather than the actual objects.
Then use ObjectSpace._id2ref to deference the objects at the end of the
transaction, if they exist. This won't stop memory use growing within
the transaction, but it'll grow more slowly.
I benchmarked the performance of _id2ref this if the object does or does
not exist: https://gist.github.com/3722550
If it does exist it seems decent, but it's hugely more expensive if it
doesn't, probably because we have to do the rescue nil.
Probably most of the time the objects will exist. However the point of
doing this optimisation is to allow people to create a large number of
objects inside a transaction and have them be GC'd. So for that use
case, we'd be replacing one problem with another. I'm not sure which of
the two problems is worse.
My feeling is that we should just leave this for now and come back to it
when Ruby 2.0 is out.
I'm going to revert your commit because I can't see how it solves this.
Hope you don't mind... if I've misunderstood then let me know!
Jon
|
| | | |
|
|\ \ \
| |_|/
|/| | |
update CHANGELOG
|
|/ /
| |
| |
| |
| | |
Add entry about 245941101b1ea00a9b1af613c20b0ee994a43946 and
95be790ece75710f2588558a6d5f40fd09543b97.
|
|\ \
| | |
| | | |
warning removed: shadowing outer local variable - message
|
| |/ |
|
|\ \
| | |
| | | |
Build fix for ActionMailer
|
| |/
| |
| |
| |
| |
| | |
See
http://travis-ci.org/#!/rails/rails/jobs/2444632
|
|\ \
| |/
|/| |
use presence method instead of checking for blank
|
|/ |
|
|\
| |
| | |
Implement :null_session CSRF protection method
|
| |
| |
| |
| |
| |
| |
| |
| | |
It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946.
The :null_session CSRF protection method provide an empty session during
request processing but doesn't reset it completely (as :reset_session
does).
|
|\ \
| | |
| | | |
Allow passing block to deep_merge and deep_merge!
|
|/ /
| |
| |
| |
| | |
Hash#merge accepts block that you can use to customize how hash values
are merged. This change makes merge and deep_merge compatible.
|
| | |
|
|\ \
| | |
| | | |
Add boolean type conversion for AR::Store
|
|/ / |
|
|\ \
| | |
| | | |
Allow ActiveSupport::Deprecation features to be used by rails applications and library authors
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ActiveSupport::Deprecation is now a class rather than a module. You can
get instance of ActiveSupport::Deprecation calling #instance method.
ActiveSupport::Deprecation.instance
But when you need to get new object od ActiveSupport::Deprecation you
need to just call #new.
@instance = ActiveSupport::Deprecation.new
Since you can create a new object, you can change the version and the
name of the library where the deprecator concerned.
ActiveSupport::Deprecation.new('2.0', 'MyGem')
If you need use another deprecator instance you can select it in the
options of deprecate method.
deprecate :method, :deprecator => deprecator_instance
Documentation has been updated.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
extend/include it also.
test local deprecation
deprecator object
Test ActiveSupport::Deprecation when included
|
|\ \
| | |
| | | |
update ConnectionAdapter::Column#type_cast_code to be compatible with rails 3.2 branch
|
|/ / |
|
|\ \
| | |
| | | |
add --skip-ignore and --skip-keeps options to generators.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Users of other SCM's can now generate rails
apps that will add the "empty" directories to source control,
but will not have a useless .gitignore or mis-named .gitkeep
files.
* Change `rails new` and `rails plugin new` generators to name
the `.gitkeep` as `.keep` in a more SCM-agnostic way.
* Change `--skip-git` option to only skip the `.gitignore` file
and still generate the `.keep` files.
* Add `--skip-keeps` option to skip the `.keep` files.
It closes #2800.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In some circumstances engine was Arel::Table.engine which for separate
reasons was an ActiveRecord::Model::DeprecationProxy, which caused a
deprecation warning.
In any case, we want the actual model class here, since we want to use
it to infer information about associations.
|
| | |
|
| |
| |
| |
| |
| | |
Previously the reflection would be looked up on the wrong class. However
the test passed because the examples referred back to themselves.
|
|\ \
| | |
| | | |
Convert model name to foreign key in queries
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allows you to specify the model association key in a belongs_to
relationship instead of the foreign key.
The following queries are now equivalent:
Post.where(:author_id => Author.first)
Post.where(:author => Author.first)
PriceEstimate.where(:estimate_of_type => 'Treasure', :estimate_of_id => treasure)
PriceEstimate.where(:estimate_of => treasure)
|
|\ \ \
| | | |
| | | | |
Update documentation for CollectionProxy [ci skip]
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
default is the SynchronousQueue.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
We don't need to rely on rails/queueing in Action Pack tests
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allow the users to do:
config.action_mailer.queue = MyQueue.new
and
class UsersMailer < ActionMailer::Base
self.queue = MyQueue.new
end
|
|/ / /
| | |
| | |
| | |
| | | |
We should not let the users use the ThreadedConsumer without know about
the risks
|
|\ \ \
| | | |
| | | |
| | | | |
Add docs to inheritance_column method, explaining how to override it
to be able to use the "type" column without STI [ci skip]
|
| | | |
| | | |
| | | |
| | | |
| | | | |
single-table inheritance by overriding it in your ActiveRecord
Model.
|
|\ \ \ \
| | | | |
| | | | | |
Fixed support for DATABASE_URL for rake db tasks
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- added tests to confirm establish_connection uses DATABASE_URL and
Rails.env correctly even when no arguments are passed in.
- updated rake db tasks to support DATABASE_URL, and added tests to
confirm correct behavior for these rake tasks. (Removed
establish_connection call from some tasks since in those cases
the :environment task already made sure the function would be called)
- updated Resolver so that when it resolves the database url, it
removes hash values with empty strings from the config spec (e.g.
to support connection to postgresql when no username is specified).
|
|\ \ \ \ \
| | | | | |
| | | | | | |
Fix build Rails.queue
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
see 34b23e7110a3a13cf157608cefc9b5701017bf39
|
|\ \ \ \ \
| | | | | |
| | | | | | |
Remove '.rb' from require call
|
| |/ / / / |
|