Commit c9490507 authored by Levin Zimmermann's avatar Levin Zimmermann Committed by Kirill Smelkov

Revert "Y client: Adjust URI scheme to move client-specific options to fragment"

This reverts commit kirr/neo@4c9414ea.
This patch was added at a time when nexedi/neoppod!18 wasn't
resolved yet, but we already wanted to proceed with WCFS. Now the NEO MR
is resolved and we decided to mostly leave the NEO zurl as it was
originally implemented in nexedi/neoppod!6.
This means we don't need this patch anymore which changed the NEO
zurl format.
parent f1a1bb9d
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
URI format: URI format:
neo(s)://[credentials@]master1,master2,...,masterN/name?server_options#client_options neo(s)://[credentials@]master1,master2,...,masterN/name?options
""" """
import ZODB.config import ZODB.config
...@@ -30,9 +30,6 @@ from urlparse import urlsplit, parse_qsl ...@@ -30,9 +30,6 @@ from urlparse import urlsplit, parse_qsl
# _credopts defines which options correspond to credentials # _credopts defines which options correspond to credentials
_credopts = {'ca', 'cert', 'key'} _credopts = {'ca', 'cert', 'key'}
# _clientopts defines which options control client behaviour, not the storage itself
_clientopts = {'compress', 'read-only', 'logfile', 'cache-size'}
# neo_zconf_options returns set of zconfig options supported by NEO storage # neo_zconf_options returns set of zconfig options supported by NEO storage
def neo_zconf_options(): def neo_zconf_options():
neo_schema = """<schema> neo_schema = """<schema>
...@@ -49,15 +46,11 @@ def neo_zconf_options(): ...@@ -49,15 +46,11 @@ def neo_zconf_options():
assert 'name' in options assert 'name' in options
options.remove('master_nodes') # comes in netloc options.remove('master_nodes') # comes in netloc
options.remove('name') # comes in path options.remove('name') # comes in path
for opt in _credopts.union(_clientopts): for opt in _credopts:
assert opt in options, opt assert opt in options, opt
return options return options
# _srvopts defines which options control server behaviour
_srvopts = neo_zconf_options() .difference(_credopts) .difference(_clientopts)
# canonical_opt_name returns "oPtion_nAme" as "option-name" # canonical_opt_name returns "oPtion_nAme" as "option-name"
def canonical_opt_name(name): def canonical_opt_name(name):
return name.lower().replace('_', '-') return name.lower().replace('_', '-')
...@@ -68,6 +61,8 @@ def _resolve_uri(uri): ...@@ -68,6 +61,8 @@ def _resolve_uri(uri):
if scheme not in ("neo", "neos"): if scheme not in ("neo", "neos"):
raise ValueError("invalid uri: %s : expected neo:// or neos:// scheme" % uri) raise ValueError("invalid uri: %s : expected neo:// or neos:// scheme" % uri)
if frag != "":
raise ValueError("invalid uri: %s : non-empty fragment" % uri)
# name is given as path # name is given as path
if path.startswith("/"): if path.startswith("/"):
...@@ -97,33 +92,21 @@ def _resolve_uri(uri): ...@@ -97,33 +92,21 @@ def _resolve_uri(uri):
raise ValueError("invalid uri: %s : unexpected credential %s" % (uri, k)) raise ValueError("invalid uri: %s : unexpected credential %s" % (uri, k))
neokw[k] = v neokw[k] = v
# get server options from query # get options from query: only those that are defined by NEO schema go to
# storage - rest are returned as database options
dbkw = {} dbkw = {}
neo_options = neo_zconf_options()
for k, v in OrderedDict(parse_qsl(query)).items(): for k, v in OrderedDict(parse_qsl(query)).items():
if k in _credopts: if k in _credopts:
raise ValueError("invalid uri: %s : option %s must be in credentials" % (uri, k)) raise ValueError("invalid uri: %s : option %s must be in credentials" % (uri, k))
if k in _clientopts: elif k in neo_options:
raise ValueError("invalid uri: %s : option %s must be in fragment" % (uri, k))
elif k in _srvopts:
neokw[k] = v
else:
raise ValueError("invalid uri: %s : invalid option %s" % (uri, k))
# get client option from fragment: only those that are defined by NEO
# schema go to storage - rest are returned as database options
for k, v in OrderedDict(parse_qsl(frag)).items():
if k in _credopts:
raise ValueError("invalid uri: %s : fragment option %s must be in credentials" % (uri, k))
if k in _srvopts:
raise ValueError("invalid uri: %s : fragment option %s must be in query" % (uri, k))
elif k in _clientopts:
neokw[k] = v neokw[k] = v
else: else:
# it might be option for storage, but not in canonical form e.g. # it might be option for storage, but not in canonical form e.g.
# read_only -> read-only (zodburi world settled on using "_" and # read_only -> read-only (zodburi world settled on using "_" and
# ZConfig world on "-" as separators) # ZConfig world on "-" as separators)
k2 = canonical_opt_name(k) k2 = canonical_opt_name(k)
if k2 in _clientopts: if k2 in neo_options:
neokw[k2] = v neokw[k2] = v
# else keep this kv as db option # else keep this kv as db option
......
...@@ -34,7 +34,7 @@ testv = [ ...@@ -34,7 +34,7 @@ testv = [
""", """,
{}), {}),
("neo://master1,master2:port2/db3#read_only=true", ("neo://master1,master2:port2/db3?read_only=true",
"""\ """\
master_nodes\tmaster1 master2:port2 master_nodes\tmaster1 master2:port2
name\tdb3 name\tdb3
...@@ -42,8 +42,8 @@ testv = [ ...@@ -42,8 +42,8 @@ testv = [
""", """,
{}), {}),
("neos://ca=qqq;cert=rrr;key=sss@[2001:67c:1254:2a::1]:1234,master2:port2/db4?dynamic_master_list=zzz" ("neos://ca=qqq;cert=rrr;key=sss@[2001:67c:1254:2a::1]:1234,master2:port2/db4?read_only=false"
"#read_only=false&compress=true&logfile=xxx&alpha=111" "&compress=true&logfile=xxx&alpha=111&dynamic_master_list=zzz"
"&beta=222", "&beta=222",
"""\ """\
master_nodes\t[2001:67c:1254:2a::1]:1234 master2:port2 master_nodes\t[2001:67c:1254:2a::1]:1234 master2:port2
...@@ -51,10 +51,10 @@ testv = [ ...@@ -51,10 +51,10 @@ testv = [
ca\tqqq ca\tqqq
cert\trrr cert\trrr
key\tsss key\tsss
dynamic_master_list\tzzz
read-only\tfalse read-only\tfalse
compress\ttrue compress\ttrue
logfile\txxx logfile\txxx
dynamic_master_list\tzzz
""", """,
{"alpha": "111", "beta": "222"}), {"alpha": "111", "beta": "222"}),
] ]
...@@ -64,8 +64,9 @@ testv = [ ...@@ -64,8 +64,9 @@ testv = [
class ZODBURITests(unittest.TestCase): class ZODBURITests(unittest.TestCase):
def test_zodburi(self): def test_zodburi(self):
# invalid schema # invalid schema / fragment
self.assertRaises(ValueError, _resolve_uri, "http://master/db") self.assertRaises(ValueError, _resolve_uri, "http://master/db")
self.assertRaises(ValueError, _resolve_uri, "neo://master/db#frag")
# master/db not fully specified # master/db not fully specified
self.assertRaises(ValueError, _resolve_uri, "neo://master") self.assertRaises(ValueError, _resolve_uri, "neo://master")
...@@ -74,12 +75,8 @@ class ZODBURITests(unittest.TestCase): ...@@ -74,12 +75,8 @@ class ZODBURITests(unittest.TestCase):
self.assertRaises(ValueError, _resolve_uri, "neo://master/db?master_nodes=a,b,c") self.assertRaises(ValueError, _resolve_uri, "neo://master/db?master_nodes=a,b,c")
self.assertRaises(ValueError, _resolve_uri, "neo://master/db?name=zzz") self.assertRaises(ValueError, _resolve_uri, "neo://master/db?name=zzz")
# option that corresponds to credential provided in query or fragment # option that corresponds to credential provided in query
self.assertRaises(ValueError, _resolve_uri, "neos://master/db?ca=123") self.assertRaises(ValueError, _resolve_uri, "neos://master/db?ca=123")
self.assertRaises(ValueError, _resolve_uri, "neos://master/db#ca=123")
# option that corresponds to client provided in query
self.assertRaises(ValueError, _resolve_uri, "neos://master/db?compress=1")
# credentials with neo:// instead of neos:// # credentials with neo:// instead of neos://
self.assertRaises(ValueError, _resolve_uri, "neo://key:zzz@master/db") self.assertRaises(ValueError, _resolve_uri, "neo://key:zzz@master/db")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment