Skip to content

R
rails

张重言 / rails

通知 1
Star 0
Fork 0
R
rails

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 22 3月, 2018 4 次提交
    • E
      Add ability to create/drop/migrate all dbs for a given env · 5eb4488d
      由 eileencodes 提交于 
      `each_current_configuration` is used by create, drop, and other methods
to find the configs for a given environment and returning those to the
method calling them.

The change here allows for the database commands to operate on all the
configs in the environment. Previously we couldn't slice the hashes and
iterate over them becasue they could be two tier or could be three
tier. By using the database config structs we don't need to care whether
we're dealing with a three tier or two tier, we can just parse all the
configs based on the environment.

This makes it possible for us to run `bin/rails db:create` and it will
create all the configs for the dev and test environment ust like it does
for a two tier - it creates the db for dev and test. Now `db:create`
will create `primary` for dev and test, and `animals` for dev and test
if our database.yml looks like:

```
development:
  primary:
    etc
  animals:
    etc

test:
  primary:
    etc
  animals:
    etc
```

This means that `bin/rails db:create`, `bin/rails db:drop`, and
`bin/rails db:migrate` will operate on the dev and test env for both
primary and animals ds.
      5eb4488d
    • E
      Add create/drop/migrate db tasks for each database in the environment · d79d6867
      由 eileencodes 提交于 
      If we have a three-tier yaml file like this:

```
development:
  primary:
    database: "development"
  animals:
    database: "development_animals"
    migrations_paths: "db/animals_migrate"
```

This will add db create/drop/and migrate tasks for each level of the
config under that environment.

```
bin/rails db:drop:primary
bin/rails db:drop:animals

bin/rails db:create:primary
bin/rails db:create:animals

bin/rails db:migrate:primary
bin/rails db:migrate:animals
```
      d79d6867
    • E
      Add DatabaseConfig Struct and associated methods · 1756094b
      由 eileencodes 提交于 
      Passing around and parsing hashes is easy if you know that it's a two
tier config and each key will be named after the environment and each
value will be the config for that environment key.

This falls apart pretty quickly with three-tier configs. We have no idea
what the second tier will be named (we know the first is primary but we
don't know the second), we have no easy way of figuring out
how deep a hash we have without iterating over it, and we'd have to do
this a lot throughout the code since it breaks all of Active Record's
assumptions regarding configurations.

These methods allow us to pass around objects instead. This will allow
us to more easily parse the configs for the rake tasks. Evenually I'd
like to replace the Active Record connection management that passes
around config hashes to use these methods as well but that's much
farther down the road.

`walk_configs` takes an environment, specification name, and a config
and turns them into DatabaseConfig struct objects so we can ask the
configs questions like:

```
db_config.spec_name
=> animals

db_config.env_name
=> development

db_config.config
{ :adapter => mysql etc }
```

`db_configs` loops through all given configurations and returns an array
of DatabaseConfig structs for each config in the yaml file.

and lastly `configs_for` takes an environment and either returns the
spec name and config if a block is given or returns an array of
DatabaseConfig structs just for the given environment.
      1756094b
    • A
      Update loofah to mitigate CVE-2018-8048 · 627ef063
      由 Andrew White 提交于 
      See flavorjones/loofah#144
      627ef063
  3. 21 3月, 2018 2 次提交
  5. 20 3月, 2018 10 次提交
    • R
      Allow any version of dalli less them 2.7.7 · fab6ded8
      由 Rafael Mendonça França 提交于
      fab6ded8
    • A
      Merge pull request #32305 from q-centrix/perf-improvement-translation-helper · 09656deb
      由 Andrew White 提交于 
      Memoize the result of gsubbing @virtual_path
      09656deb
    • D
      Memoize the result of gsubbing @virtual_path · 05eaa076
      由 Dillon Welch 提交于 
      This gets called many times for each virtual_path, creating a new string
each time that `translate` is called. We can memoize this so that it
only happens once per virtual_path instead.
      05eaa076
    • A
      Merge pull request #32302 from q-centrix/perf-improvement-tag-name · c7cbc2e3
      由 Andrew White 提交于 
      Interpolate '' instead of nil when multiple is false.
      c7cbc2e3
    • D
      Interpolate '' instead of nil when multiple is false. · 8e095d69
      由 Dillon Welch 提交于 
      "my string #{nil}" results in an additional '' string allocation, I'm
guessing because the nil has to be converted to a string.

"my string #{'[]' if multiple}" results in "my string #{nil}" if
multiple is false. Doing "my string #{''}" does not result in an extra
string allocation. I moved the if multiple logic into a method so I only
had to make the change once.

```ruby
begin
  require "bundler/inline"
rescue LoadError => e
  $stderr.puts "Bundler version 1.10 or later is required. Please update
                your Bundler"
  raise e
end

gemfile(true) do
  source "https://rubygems.org"

  gem "benchmark-ips"
  gem "rails"
end

def allocate_count
  GC.disable
  before = ObjectSpace.count_objects
  yield
  after = ObjectSpace.count_objects
  after.each { |k,v| after[k] = v - before[k] }
  after[:T_HASH] -= 1 # probe effect - we created the before hash.
  GC.enable
  result = after.reject { |k,v| v == 0 }
  GC.start
  result
end

@html_options = {}

def master_version(multiple=nil)
  "hi#{"[]" if multiple}"
end

def fast_version(multiple=nil)
  str = multiple ? "[]" : ''
  "hi#{str}"
end

def test
  puts "master_version"
  puts allocate_count { 1000.times { master_version } }
  puts "master_version with arg"
  puts allocate_count { 1000.times { master_version(' there') } }
  puts "fast_version"
  puts allocate_count { 1000.times { fast_version } }
  puts "fast_version with arg"
  puts allocate_count { 1000.times { fast_version(' there') } }

  Benchmark.ips do |x|
    x.report("master_version") { master_version }
    x.report("master_version with arg") { master_version(' there') }
    x.report("fast_version")     { fast_version }
    x.report("fast_version with arg")     { fast_version(' there') }
    x.compare!
  end
end

test
```

results:
```ruby
master_version
{:FREE=>-1981, :T_STRING=>2052}
master_version with arg
{:FREE=>-1001, :T_STRING=>1000}
fast_version
{:FREE=>-1001, :T_STRING=>1000}
fast_version with arg
{:FREE=>-1001, :T_STRING=>1000}
Warming up --------------------------------------
      master_version   138.851k i/100ms
master_version with arg
                       164.029k i/100ms
        fast_version   165.737k i/100ms
fast_version with arg
                       167.016k i/100ms
Calculating -------------------------------------
      master_version      2.464M (±14.7%) i/s -     11.941M in   5.023307s
master_version with arg
                          3.754M (± 8.5%) i/s -     18.699M in   5.021354s
        fast_version      3.449M (±11.7%) i/s -     17.071M in   5.033312s
fast_version with arg
                          3.636M (± 6.9%) i/s -     18.205M in   5.034792s

Comparison:
master_version with arg:  3753896.1 i/s
fast_version with arg:  3636094.5 i/s - same-ish: difference falls within error
        fast_version:  3448766.2 i/s - same-ish: difference falls within error
      master_version:  2463857.3 i/s - 1.52x  slower
```
      8e095d69
    • J
      Merge pull request #32282 from javan/fix-digesting-mixed-formats · 7f71a6a6
      由 Javan Makhmali 提交于 
      Fix digesting templates with mixed formats
      7f71a6a6
    • J
      Fix digesting templates with mixed formats · f4eb2e23
      由 Javan Makhmali 提交于
      f4eb2e23
    • R
      Merge pull request #32300 from albertoalmagro/albertoalmagro/remove-outdated-todo · 9d9f7526
      由 Rafael França 提交于 
      ActiveJob: Remove support for Qu gem.
      9d9f7526
    • A
      Remove support for Qu gem. · 6ef72079
      由 Alberto Almagro 提交于 
      Reasons are that the Qu gem wasn't compatible since Rails 5.1,
gem development was stopped in 2014 and maintainers have
confirmed its demise. See issue #32273
      6ef72079
    • J
      Add documentation about not accepting PRs for new adapters (#32298) · 538463bc
      由 Jeremy Green 提交于
      538463bc
  7. 19 3月, 2018 10 次提交
  9. 18 3月, 2018 3 次提交
  11. 17 3月, 2018 5 次提交
    • G
      Merge pull request #32275 from elainefang/fix-grammar · ef73318e
      由 George Claghorn 提交于 
      Fix grammar in Getting Started with Rails
      ef73318e
    • E
      Fix grammar in Getting Started with Rails · aa8f51b9
      由 ef718 提交于
      aa8f51b9
    • E
      Merge pull request #32271 from eileencodes/fix-three-tier-default-connection · 9700dacf
      由 Eileen M. Uchitelle 提交于 
      Fix default connection handling with three-tier config
      9700dacf
    • E
      Switch dbconsole config loader check · 4027643f
      由 eileencodes 提交于 
      In a three-tier config environment
`configurations[environment].presence` will return `{ :primary => {
:key => value, :key => value }, :secondary => { :key => value, :key =>
value} }, which means it's not given a single config to connect to.

If we flip these however it will connect to primary because that's the
default connection, and on a two tier it will be `nil` so the code will
select the connection from the configurations rather than the
connection.
      4027643f
    • E
      Fix connection handling with three-tier config · 03929463
      由 eileencodes 提交于 
      If you had a three-tier config, the `establish_connection` that's called
in the Railtie on load can't figure out how to access the default
configuration.

This is because Rails assumes that the config is the first value in the
hash and always associated with the key from the environment. With a
three tier config however we need to go one level deeper.

This commit includes 2 changes. 1) removes a line from `resolve_all`
which was parsing out the the environment from the config so instead of
getting

```
{
  :development => {
    :primary => {
      :database => "whatever"
    }
  },
    :animals => {
      :database => "whatever-animals"
    }
  },
  etc with test / prod
}
```

We'd instead end up with a config that had no attachment to it's
envioronment.

```
{
  :primary => {
    :database => "whatever"
  }
  :animals => {
    :database => "whatever-animals"
  }
  etc - without test and prod
}
```

Not only did this mean that Active Record didn't know how to establish a
connection, it didn't have the other necessary configs along with it in
the configs list.

So fix this I removed the line that deletes these configs.

The second thing this commit changes is adding this line to
`establish_connection`

```
spec = spec[spec_name.to_sym] if spec[spec_name.to_sym]
```

When you have a three-tier config and don't pass any hash/symbol/env etc
to `establish_connection` the resolver will automatically return both
the primary and secondary (in this case animals db) configurations.
We'll get an `database configuration does not specify adapter` error
because AR will try to establish a connection on the `primary` key
rather than the `primary` key's config. It assumes that the
`development` or default env automatically will return a config hash,
but with a three-tier config we actually get a key and config `primary
=> config`.

This fix is a bit of a bandaid because it's not the "correct" way to
handle this situation, but it does solve our immediate problem. The new
code here is saying "if the config returned from the resolver (I know
it's called spec in here but we interchange our meanings a LOT and what
is returned is a three-tier config) has a key matching the "primary"
spec name, grab the config from the spec and pass that to the
estalbish_connection method".

This works because if we pass `:animals` or a hash, or `:primary` we'll
already have the correct configuration to connect with.

This fixes the case where we want Rail to connect with the default
connection.

Coming soon is a refactoring that should eliminate the need to do this
but I need this fix in order to write the multi-db rake tasks that I
promised in my RailsConf submission. `@tenderlove` and I are working on
the refactoring of the internals for connection management but it won't
be ready for a few weeks and this issue has been blocking progress.
      03929463
  13. 16 3月, 2018 6 次提交