bitbake: data_smart: implement remote datastore functionality
This allows you to maintain a local reference to a remote datastore. The actual implementation of the remote connection is delegated to a connector object that the caller must define and supply. There is support for getting variable values and expanding python references (i.e. ${@...} remotely, however setting variables remotely is not supported - any variable setting is done locally as if the datastore were a copy (which it kind of is). Loosely based on an earlier prototype implementation by Qing He. (Bitbake rev: a3edc3eefa2d03c4ad5d12187b32fa4dc495082a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
727f332829
commit
d325d94f3f
|
@ -116,7 +116,15 @@ class VariableParse:
|
||||||
return match.group()
|
return match.group()
|
||||||
|
|
||||||
def python_sub(self, match):
|
def python_sub(self, match):
|
||||||
code = match.group()[3:-1]
|
if isinstance(match, str):
|
||||||
|
code = match
|
||||||
|
else:
|
||||||
|
code = match.group()[3:-1]
|
||||||
|
|
||||||
|
if "_remote_data" in self.d:
|
||||||
|
connector = self.d["_remote_data"]
|
||||||
|
return connector.expandPythonRef(self.varname, code)
|
||||||
|
|
||||||
codeobj = compile(code.strip(), self.varname or "<expansion>", "eval")
|
codeobj = compile(code.strip(), self.varname or "<expansion>", "eval")
|
||||||
|
|
||||||
parser = bb.codeparser.PythonParser(self.varname, logger)
|
parser = bb.codeparser.PythonParser(self.varname, logger)
|
||||||
|
@ -247,10 +255,15 @@ class VariableHistory(object):
|
||||||
self.variables[var].append(loginfo.copy())
|
self.variables[var].append(loginfo.copy())
|
||||||
|
|
||||||
def variable(self, var):
|
def variable(self, var):
|
||||||
if var in self.variables:
|
remote_connector = self.dataroot.getVar('_remote_data', False)
|
||||||
return self.variables[var]
|
if remote_connector:
|
||||||
|
varhistory = remote_connector.getVarHistory(var)
|
||||||
else:
|
else:
|
||||||
return []
|
varhistory = []
|
||||||
|
|
||||||
|
if var in self.variables:
|
||||||
|
varhistory.extend(self.variables[var])
|
||||||
|
return varhistory
|
||||||
|
|
||||||
def emit(self, var, oval, val, o, d):
|
def emit(self, var, oval, val, o, d):
|
||||||
history = self.variable(var)
|
history = self.variable(var)
|
||||||
|
@ -449,6 +462,10 @@ class DataSmart(MutableMapping):
|
||||||
if var in dest:
|
if var in dest:
|
||||||
return dest[var]
|
return dest[var]
|
||||||
|
|
||||||
|
if "_remote_data" in dest:
|
||||||
|
connector = dest["_remote_data"]["_content"]
|
||||||
|
return connector.getVar(var)
|
||||||
|
|
||||||
if "_data" not in dest:
|
if "_data" not in dest:
|
||||||
break
|
break
|
||||||
dest = dest["_data"]
|
dest = dest["_data"]
|
||||||
|
@ -471,6 +488,12 @@ class DataSmart(MutableMapping):
|
||||||
if 'parsing' in loginfo:
|
if 'parsing' in loginfo:
|
||||||
parsing=True
|
parsing=True
|
||||||
|
|
||||||
|
if '_remote_data' in self.dict:
|
||||||
|
connector = self.dict["_remote_data"]["_content"]
|
||||||
|
res = connector.setVar(var, value)
|
||||||
|
if not res:
|
||||||
|
return
|
||||||
|
|
||||||
if 'op' not in loginfo:
|
if 'op' not in loginfo:
|
||||||
loginfo['op'] = "set"
|
loginfo['op'] = "set"
|
||||||
self.expand_cache = {}
|
self.expand_cache = {}
|
||||||
|
@ -875,7 +898,7 @@ class DataSmart(MutableMapping):
|
||||||
|
|
||||||
def localkeys(self):
|
def localkeys(self):
|
||||||
for key in self.dict:
|
for key in self.dict:
|
||||||
if key != '_data':
|
if key not in ['_data', '_remote_data']:
|
||||||
yield key
|
yield key
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
|
@ -884,7 +907,7 @@ class DataSmart(MutableMapping):
|
||||||
def keylist(d):
|
def keylist(d):
|
||||||
klist = set()
|
klist = set()
|
||||||
for key in d:
|
for key in d:
|
||||||
if key == "_data":
|
if key in ["_data", "_remote_data"]:
|
||||||
continue
|
continue
|
||||||
if key in deleted:
|
if key in deleted:
|
||||||
continue
|
continue
|
||||||
|
@ -898,6 +921,10 @@ class DataSmart(MutableMapping):
|
||||||
if "_data" in d:
|
if "_data" in d:
|
||||||
klist |= keylist(d["_data"])
|
klist |= keylist(d["_data"])
|
||||||
|
|
||||||
|
if "_remote_data" in d:
|
||||||
|
connector = d["_remote_data"]["_content"]
|
||||||
|
klist |= connector.getKeys()
|
||||||
|
|
||||||
return klist
|
return klist
|
||||||
|
|
||||||
self.need_overrides()
|
self.need_overrides()
|
||||||
|
|
|
@ -444,3 +444,42 @@ class Contains(unittest.TestCase):
|
||||||
|
|
||||||
self.assertFalse(bb.utils.contains_any("SOMEFLAG", "x", True, False, self.d))
|
self.assertFalse(bb.utils.contains_any("SOMEFLAG", "x", True, False, self.d))
|
||||||
self.assertFalse(bb.utils.contains_any("SOMEFLAG", "x y z", True, False, self.d))
|
self.assertFalse(bb.utils.contains_any("SOMEFLAG", "x y z", True, False, self.d))
|
||||||
|
|
||||||
|
|
||||||
|
class Remote(unittest.TestCase):
|
||||||
|
def test_remote(self):
|
||||||
|
class TestConnector:
|
||||||
|
d = None
|
||||||
|
def __init__(self, d):
|
||||||
|
self.d = d
|
||||||
|
def getVar(self, name):
|
||||||
|
return self.d._findVar(name)
|
||||||
|
def getKeys(self):
|
||||||
|
return self.d.localkeys()
|
||||||
|
def getVarHistory(self, name):
|
||||||
|
return self.d.varhistory.variable(name)
|
||||||
|
def expandPythonRef(self, varname, expr):
|
||||||
|
varparse = bb.data_smart.VariableParse(varname, self.d)
|
||||||
|
return varparse.python_sub(expr)
|
||||||
|
def setVar(self, name, value):
|
||||||
|
self.d.setVar(name, value)
|
||||||
|
|
||||||
|
d1 = bb.data.init()
|
||||||
|
d1.enableTracking()
|
||||||
|
d2 = bb.data.init()
|
||||||
|
d2.enableTracking()
|
||||||
|
connector = TestConnector(d1)
|
||||||
|
|
||||||
|
d2.setVar('_remote_data', connector)
|
||||||
|
|
||||||
|
d1.setVar('HELLO', 'world')
|
||||||
|
d1.setVarFlag('OTHER', 'flagname', 'flagvalue')
|
||||||
|
self.assertEqual(d2.getVar('HELLO'), 'world')
|
||||||
|
self.assertEqual(d2.expand('${HELLO}'), 'world')
|
||||||
|
self.assertEqual(d2.expand('${@d.getVar("HELLO")}'), 'world')
|
||||||
|
self.assertIn('flagname', d2.getVarFlags('OTHER'))
|
||||||
|
self.assertEqual(d2.getVarFlag('OTHER', 'flagname'), 'flagvalue')
|
||||||
|
self.assertEqual(d1.varhistory.variable('HELLO'), d2.varhistory.variable('HELLO'))
|
||||||
|
# Test setVar on client side affects server
|
||||||
|
d2.setVar('HELLO', 'other-world')
|
||||||
|
self.assertEqual(d1.getVar('HELLO'), 'other-world')
|
||||||
|
|
Loading…
Reference in New Issue