Skip to content

Fix/init data race #40

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: public
Choose a base branch
from
Open

Fix/init data race #40

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
667d848
initialize mondrian connection in config.ru and pass to APIHelpers @@…
Oct 22, 2018
43c74be
forgot end for if
hwchen Oct 22, 2018
62be4ec
change refernces from to
Oct 23, 2018
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
18 changes: 8 additions & 10 deletions lib/mondrian_rest/api_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ class PropertyError < StandardError
end

module APIHelpers
@@olap = nil
@@olap = nil # env['mondrian-olap.conn']
@@mdx_parser = nil

def olap
if @@olap.nil?
@@olap = Mondrian::OLAP::Connection.new(env['mondrian-olap.params'])
@@olap.connect
raise 'Please create mondrian connection and .connect in config.ru'
end
@@olap
end
Expand All @@ -19,22 +18,21 @@ def olap
# Returns an instance of org.olap4j.mdx.parser.MdxParser
def mdx_parser
if @@mdx_parser.nil?
@@mdx_parser = olap.raw_connection.getParserFactory
.createMdxParser(olap.raw_connection)
raise 'Please create mondrian mdx parser'
end
@@mdx_parser
end

def olap_flush
if olap.connected?
olap.flush_schema_cache
olap.close
if @@olap.connected?
@@olap.flush_schema_cache
@@olap.close
end
olap.connect
@@olap.connect
end

def get_cube_or_404(name)
cube = olap.cube(name)
cube = @@olap.cube(name)
error!('Not found', 404) if cube.nil?
cube
end
Expand Down