switchman 2.1.1 → 2.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/switchman/active_record/attribute_methods.rb +38 -17
- data/lib/switchman/active_record/base.rb +11 -11
- data/lib/switchman/engine.rb +1 -1
- data/lib/switchman/version.rb +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e619ee38f22bd57ca2cd0c1fbb5ccc6f1a7f0257c71dcc4995d0032dc44865ad
|
4
|
+
data.tar.gz: 7f980b4cfd0cff41357b3bd0f0cd53eb8a41556d1b4bc31eb3e0d2316391bc55
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 679583144bfc68dc465f31eaedb32d8d960a7645cbf360c83562e463fc11174d3b7191c866246660340045a3fa0985086771e230d48dcbfd77a78b759225fa41
|
7
|
+
data.tar.gz: 9750de1c00f02b7307589128d70f614b9508588049bd9d384eb3f7e77d7171ac04a71ba2b0fd9700b1306ab68585e002807dcd183ba4b1e115d730f822dac0ce
|
@@ -38,11 +38,15 @@ module Switchman
|
|
38
38
|
def define_method_global_attribute(attr_name)
|
39
39
|
if sharded_column?(attr_name)
|
40
40
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
41
|
-
def
|
41
|
+
def __temp_global_attribute__
|
42
|
+
raw_value = original_#{attr_name}
|
43
|
+
return nil if raw_value.nil?
|
44
|
+
return raw_value if raw_value > Shard::IDS_PER_SHARD
|
45
|
+
|
42
46
|
Shard.global_id_for(original_#{attr_name}, shard)
|
43
47
|
end
|
44
|
-
alias_method 'global_#{attr_name}', :
|
45
|
-
undef_method :
|
48
|
+
alias_method 'global_#{attr_name}', :__temp_global_attribute__
|
49
|
+
undef_method :__temp_global_attribute__
|
46
50
|
RUBY
|
47
51
|
else
|
48
52
|
define_method_unsharded_column(attr_name, 'global')
|
@@ -52,11 +56,13 @@ module Switchman
|
|
52
56
|
def define_method_local_attribute(attr_name)
|
53
57
|
if sharded_column?(attr_name)
|
54
58
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
55
|
-
def
|
56
|
-
|
59
|
+
def __temp_local_attribute__
|
60
|
+
raw_value = original_#{attr_name}
|
61
|
+
return nil if raw_value.nil?
|
62
|
+
return raw_value % Shard::IDS_PER_SHARD
|
57
63
|
end
|
58
|
-
alias_method 'local_#{attr_name}', :
|
59
|
-
undef_method :
|
64
|
+
alias_method 'local_#{attr_name}', :__temp_local_attribute__
|
65
|
+
undef_method :__temp_local_attribute__
|
60
66
|
RUBY
|
61
67
|
else
|
62
68
|
define_method_unsharded_column(attr_name, 'local')
|
@@ -94,18 +100,33 @@ module Switchman
|
|
94
100
|
# rename the original method to original_
|
95
101
|
alias_method 'original_#{attr_name}', '#{attr_name}'
|
96
102
|
# and replace with one that transposes the id
|
97
|
-
def
|
98
|
-
|
103
|
+
def __temp_relative_attribute__
|
104
|
+
raw_value = original_#{attr_name}
|
105
|
+
return nil if raw_value.nil?
|
106
|
+
|
107
|
+
abs_raw_value = raw_value.abs
|
108
|
+
current_shard = Shard.current(#{shard_category_code_for_reflection(reflection)})
|
109
|
+
same_shard = shard == current_shard
|
110
|
+
return raw_value if same_shard && abs_raw_value < Shard::IDS_PER_SHARD
|
111
|
+
|
112
|
+
value_shard_id = abs_raw_value / Shard::IDS_PER_SHARD
|
113
|
+
# this is a stupid case when someone stuffed a global id for the current shard in instead
|
114
|
+
# of a local id
|
115
|
+
return raw_value % Shard::IDS_PER_SHARD if value_shard_id == current_shard.id
|
116
|
+
return raw_value if !same_shard && abs_raw_value > Shard::IDS_PER_SHARD
|
117
|
+
return shard.global_id_for(raw_value) if !same_shard && abs_raw_value < Shard::IDS_PER_SHARD
|
118
|
+
|
119
|
+
Shard.relative_id_for(raw_value, shard, current_shard)
|
99
120
|
end
|
100
|
-
alias_method '#{attr_name}', :
|
101
|
-
undef_method :
|
121
|
+
alias_method '#{attr_name}', :__temp_relative_attribute__
|
122
|
+
undef_method :__temp_relative_attribute__
|
102
123
|
|
103
124
|
alias_method 'original_#{attr_name}=', '#{attr_name}='
|
104
|
-
def
|
125
|
+
def __temp_relative_attribute_assignment__(new_value)
|
105
126
|
self.original_#{attr_name} = Shard.relative_id_for(new_value, Shard.current(#{shard_category_code_for_reflection(reflection)}), shard)
|
106
127
|
end
|
107
|
-
alias_method '#{attr_name}=', :
|
108
|
-
undef_method :
|
128
|
+
alias_method '#{attr_name}=', :__temp_relative_attribute_assignment__
|
129
|
+
undef_method :__temp_relative_attribute_assignment__
|
109
130
|
RUBY
|
110
131
|
else
|
111
132
|
define_method_unsharded_column(attr_name, 'global')
|
@@ -115,11 +136,11 @@ module Switchman
|
|
115
136
|
def define_method_unsharded_column(attr_name, prefix)
|
116
137
|
return if columns_hash["#{prefix}_#{attr_name}"]
|
117
138
|
generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
|
118
|
-
def
|
139
|
+
def __temp_unsharded_attribute__
|
119
140
|
raise NoMethodError, "undefined method `#{prefix}_#{attr_name}'; are you missing an association?"
|
120
141
|
end
|
121
|
-
alias_method '#{prefix}_#{attr_name}', :
|
122
|
-
undef_method :
|
142
|
+
alias_method '#{prefix}_#{attr_name}', :__temp_unsharded_attribute__
|
143
|
+
undef_method :__temp_unsharded_attribute__
|
123
144
|
RUBY
|
124
145
|
end
|
125
146
|
end
|
@@ -80,17 +80,17 @@ module Switchman
|
|
80
80
|
end
|
81
81
|
end
|
82
82
|
|
83
|
-
def self.
|
84
|
-
klass.
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
end
|
83
|
+
def self.prepended(klass)
|
84
|
+
klass.singleton_class.prepend(ClassMethods)
|
85
|
+
end
|
86
|
+
|
87
|
+
def _run_initialize_callbacks
|
88
|
+
@shard ||= if self.class.sharded_primary_key?
|
89
|
+
Shard.shard_for(self[self.class.primary_key], Shard.current(self.class.shard_category))
|
90
|
+
else
|
91
|
+
Shard.current(self.class.shard_category)
|
93
92
|
end
|
93
|
+
super
|
94
94
|
end
|
95
95
|
|
96
96
|
def shard
|
@@ -158,7 +158,7 @@ module Switchman
|
|
158
158
|
end
|
159
159
|
|
160
160
|
def update_columns(*)
|
161
|
-
db =
|
161
|
+
db = shard.database_server
|
162
162
|
if ::GuardRail.environment != db.guard_rail_environment
|
163
163
|
return db.unguard { super }
|
164
164
|
else
|
data/lib/switchman/engine.rb
CHANGED
@@ -95,7 +95,7 @@ module Switchman
|
|
95
95
|
|
96
96
|
::StandardError.include(StandardError)
|
97
97
|
|
98
|
-
|
98
|
+
prepend ActiveRecord::Base
|
99
99
|
include ActiveRecord::AttributeMethods
|
100
100
|
include ActiveRecord::Persistence
|
101
101
|
singleton_class.prepend ActiveRecord::ModelSchema::ClassMethods
|
data/lib/switchman/version.rb
CHANGED
metadata
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: switchman
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Cody Cutrer
|
8
8
|
- James Williams
|
9
9
|
- Jacob Fugal
|
10
|
-
autorequire:
|
10
|
+
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2021-
|
13
|
+
date: 2021-08-03 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: railties
|
@@ -257,7 +257,7 @@ homepage: http://www.instructure.com/
|
|
257
257
|
licenses:
|
258
258
|
- MIT
|
259
259
|
metadata: {}
|
260
|
-
post_install_message:
|
260
|
+
post_install_message:
|
261
261
|
rdoc_options: []
|
262
262
|
require_paths:
|
263
263
|
- lib
|
@@ -272,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
272
272
|
- !ruby/object:Gem::Version
|
273
273
|
version: '0'
|
274
274
|
requirements: []
|
275
|
-
rubygems_version: 3.
|
276
|
-
signing_key:
|
275
|
+
rubygems_version: 3.0.3
|
276
|
+
signing_key:
|
277
277
|
specification_version: 4
|
278
278
|
summary: Rails sharding magic
|
279
279
|
test_files: []
|