5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Remove some duplication

Browse Source
This commit is contained in:
Garret Alfert 2013-10-27 21:11:15 +01:00
parent a470b37c2c
commit 39dac0a5ed
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/remote_storage/riak.rb
View File

@ -260,12 +260,7 @@ module RemoteStorage
end end
def directory_entries(user, directory) def directory_entries(user, directory)
directory = "/" if directory == "" all_keys = user_directory_keys(user, directory, data_bucket)
user_keys = data_bucket.get_index("user_id_bin", user)
directory_keys = data_bucket.get_index("directory_bin", directory)
all_keys = user_keys & directory_keys
return [] if all_keys.empty? return [] if all_keys.empty?
map_query = <<-EOH map_query = <<-EOH
@ -283,23 +278,11 @@ module RemoteStorage
} }
EOH EOH
map_reduce = ::Riak::MapReduce.new(client) run_map_reduce(data_bucket, all_keys, map_query)
all_keys.each do |key|
map_reduce.add(data_bucket.name, key)
end
map_reduce.
map(map_query, :keep => true).
run
end end
def sub_directories(user, directory) def sub_directories(user, directory)
directory = "/" if directory == "" all_keys = user_directory_keys(user, directory, directory_bucket)
user_keys = directory_bucket.get_index("user_id_bin", user)
directory_keys = directory_bucket.get_index("directory_bin", directory)
all_keys = user_keys & directory_keys
return [] if all_keys.empty? return [] if all_keys.empty?
map_query = <<-EOH map_query = <<-EOH
@ -314,9 +297,22 @@ module RemoteStorage
} }
EOH EOH
run_map_reduce(directory_bucket, all_keys, map_query)
end
def user_directory_keys(user, directory, bucket)
directory = "/" if directory == ""
user_keys = bucket.get_index("user_id_bin", user)
directory_keys = bucket.get_index("directory_bin", directory)
user_keys & directory_keys
end
def run_map_reduce(bucket, keys, map_query)
map_reduce = ::Riak::MapReduce.new(client) map_reduce = ::Riak::MapReduce.new(client)
all_keys.each do |key| keys.each do |key|
map_reduce.add(directory_bucket.name, key) map_reduce.add(bucket.name, key)
end end
map_reduce. map_reduce.