diff options
author | Michael Opdenacker <michael.opdenacker@bootlin.com> | 2024-04-12 11:02:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-14 06:31:45 +0100 |
commit | 62a3a7172a0cf71889603698780a5911b7f84e36 (patch) | |
tree | 0e09ea106a59f09ce7062765425f73faa6a62cf0 | |
parent | d133dc7e7723f3f9b98fa0d0e72c9dce451e0889 (diff) | |
download | poky-62a3a7172a0cf71889603698780a5911b7f84e36.tar.gz |
bitbake: prserv: capitalization and spacing improvements
Choosing only one style of capitalization
Add extra space after some commas too
Remove idle spaces
(Bitbake rev: daad17bccec8cb98ef2fca4262641167500bd46e)
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Tim Orling <ticotimo@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/prserv/__init__.py | 2 | ||||
-rw-r--r-- | bitbake/lib/prserv/db.py | 56 | ||||
-rw-r--r-- | bitbake/lib/prserv/serv.py | 10 |
3 files changed, 34 insertions, 34 deletions
diff --git a/bitbake/lib/prserv/__init__.py b/bitbake/lib/prserv/__init__.py index 5790a8db1e..0e0aa34d0e 100644 --- a/bitbake/lib/prserv/__init__.py +++ b/bitbake/lib/prserv/__init__.py | |||
@@ -7,7 +7,7 @@ | |||
7 | __version__ = "1.0.0" | 7 | __version__ = "1.0.0" |
8 | 8 | ||
9 | import os, time | 9 | import os, time |
10 | import sys,logging | 10 | import sys, logging |
11 | 11 | ||
12 | def init_logger(logfile, loglevel): | 12 | def init_logger(logfile, loglevel): |
13 | numeric_level = getattr(logging, loglevel.upper(), None) | 13 | numeric_level = getattr(logging, loglevel.upper(), None) |
diff --git a/bitbake/lib/prserv/db.py b/bitbake/lib/prserv/db.py index 0859cf4f2c..7bc2b2dc2d 100644 --- a/bitbake/lib/prserv/db.py +++ b/bitbake/lib/prserv/db.py | |||
@@ -38,9 +38,9 @@ class PRTable(object): | |||
38 | self.read_only = read_only | 38 | self.read_only = read_only |
39 | self.dirty = False | 39 | self.dirty = False |
40 | if nohist: | 40 | if nohist: |
41 | self.table = "%s_nohist" % table | 41 | self.table = "%s_nohist" % table |
42 | else: | 42 | else: |
43 | self.table = "%s_hist" % table | 43 | self.table = "%s_hist" % table |
44 | 44 | ||
45 | if self.read_only: | 45 | if self.read_only: |
46 | table_exists = self._execute( | 46 | table_exists = self._execute( |
@@ -78,7 +78,7 @@ class PRTable(object): | |||
78 | self.sync() | 78 | self.sync() |
79 | self.dirty = False | 79 | self.dirty = False |
80 | 80 | ||
81 | def _getValueHist(self, version, pkgarch, checksum): | 81 | def _get_value_hist(self, version, pkgarch, checksum): |
82 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 82 | data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
83 | (version, pkgarch, checksum)) | 83 | (version, pkgarch, checksum)) |
84 | row=data.fetchone() | 84 | row=data.fetchone() |
@@ -87,7 +87,7 @@ class PRTable(object): | |||
87 | else: | 87 | else: |
88 | #no value found, try to insert | 88 | #no value found, try to insert |
89 | if self.read_only: | 89 | if self.read_only: |
90 | data = self._execute("SELECT ifnull(max(value)+1,0) FROM %s where version=? AND pkgarch=?;" % (self.table), | 90 | data = self._execute("SELECT ifnull(max(value)+1, 0) FROM %s where version=? AND pkgarch=?;" % (self.table), |
91 | (version, pkgarch)) | 91 | (version, pkgarch)) |
92 | row = data.fetchone() | 92 | row = data.fetchone() |
93 | if row is not None: | 93 | if row is not None: |
@@ -96,9 +96,9 @@ class PRTable(object): | |||
96 | return 0 | 96 | return 0 |
97 | 97 | ||
98 | try: | 98 | try: |
99 | self._execute("INSERT INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1,0) from %s where version=? AND pkgarch=?));" | 99 | self._execute("INSERT INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1, 0) from %s where version=? AND pkgarch=?));" |
100 | % (self.table,self.table), | 100 | % (self.table, self.table), |
101 | (version,pkgarch, checksum,version, pkgarch)) | 101 | (version, pkgarch, checksum, version, pkgarch)) |
102 | except sqlite3.IntegrityError as exc: | 102 | except sqlite3.IntegrityError as exc: |
103 | logger.error(str(exc)) | 103 | logger.error(str(exc)) |
104 | 104 | ||
@@ -112,10 +112,10 @@ class PRTable(object): | |||
112 | else: | 112 | else: |
113 | raise prserv.NotFoundError | 113 | raise prserv.NotFoundError |
114 | 114 | ||
115 | def _getValueNohist(self, version, pkgarch, checksum): | 115 | def _get_value_no_hist(self, version, pkgarch, checksum): |
116 | data=self._execute("SELECT value FROM %s \ | 116 | data=self._execute("SELECT value FROM %s \ |
117 | WHERE version=? AND pkgarch=? AND checksum=? AND \ | 117 | WHERE version=? AND pkgarch=? AND checksum=? AND \ |
118 | value >= (select max(value) from %s where version=? AND pkgarch=?);" | 118 | value >= (select max(value) from %s where version=? AND pkgarch=?);" |
119 | % (self.table, self.table), | 119 | % (self.table, self.table), |
120 | (version, pkgarch, checksum, version, pkgarch)) | 120 | (version, pkgarch, checksum, version, pkgarch)) |
121 | row=data.fetchone() | 121 | row=data.fetchone() |
@@ -124,7 +124,7 @@ class PRTable(object): | |||
124 | else: | 124 | else: |
125 | #no value found, try to insert | 125 | #no value found, try to insert |
126 | if self.read_only: | 126 | if self.read_only: |
127 | data = self._execute("SELECT ifnull(max(value)+1,0) FROM %s where version=? AND pkgarch=?;" % (self.table), | 127 | data = self._execute("SELECT ifnull(max(value)+1, 0) FROM %s where version=? AND pkgarch=?;" % (self.table), |
128 | (version, pkgarch)) | 128 | (version, pkgarch)) |
129 | row = data.fetchone() | 129 | row = data.fetchone() |
130 | if row is not None: | 130 | if row is not None: |
@@ -133,8 +133,8 @@ class PRTable(object): | |||
133 | return 0 | 133 | return 0 |
134 | 134 | ||
135 | try: | 135 | try: |
136 | self._execute("INSERT OR REPLACE INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1,0) from %s where version=? AND pkgarch=?));" | 136 | self._execute("INSERT OR REPLACE INTO %s VALUES (?, ?, ?, (select ifnull(max(value)+1, 0) from %s where version=? AND pkgarch=?));" |
137 | % (self.table,self.table), | 137 | % (self.table, self.table), |
138 | (version, pkgarch, checksum, version, pkgarch)) | 138 | (version, pkgarch, checksum, version, pkgarch)) |
139 | except sqlite3.IntegrityError as exc: | 139 | except sqlite3.IntegrityError as exc: |
140 | logger.error(str(exc)) | 140 | logger.error(str(exc)) |
@@ -150,17 +150,17 @@ class PRTable(object): | |||
150 | else: | 150 | else: |
151 | raise prserv.NotFoundError | 151 | raise prserv.NotFoundError |
152 | 152 | ||
153 | def getValue(self, version, pkgarch, checksum): | 153 | def get_value(self, version, pkgarch, checksum): |
154 | if self.nohist: | 154 | if self.nohist: |
155 | return self._getValueNohist(version, pkgarch, checksum) | 155 | return self._get_value_no_hist(version, pkgarch, checksum) |
156 | else: | 156 | else: |
157 | return self._getValueHist(version, pkgarch, checksum) | 157 | return self._get_value_hist(version, pkgarch, checksum) |
158 | 158 | ||
159 | def _importHist(self, version, pkgarch, checksum, value): | 159 | def _import_hist(self, version, pkgarch, checksum, value): |
160 | if self.read_only: | 160 | if self.read_only: |
161 | return None | 161 | return None |
162 | 162 | ||
163 | val = None | 163 | val = None |
164 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, | 164 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, |
165 | (version, pkgarch, checksum)) | 165 | (version, pkgarch, checksum)) |
166 | row = data.fetchone() | 166 | row = data.fetchone() |
@@ -183,27 +183,27 @@ class PRTable(object): | |||
183 | val = row[0] | 183 | val = row[0] |
184 | return val | 184 | return val |
185 | 185 | ||
186 | def _importNohist(self, version, pkgarch, checksum, value): | 186 | def _import_no_hist(self, version, pkgarch, checksum, value): |
187 | if self.read_only: | 187 | if self.read_only: |
188 | return None | 188 | return None |
189 | 189 | ||
190 | try: | 190 | try: |
191 | #try to insert | 191 | #try to insert |
192 | self._execute("INSERT INTO %s VALUES (?, ?, ?, ?);" % (self.table), | 192 | self._execute("INSERT INTO %s VALUES (?, ?, ?, ?);" % (self.table), |
193 | (version, pkgarch, checksum,value)) | 193 | (version, pkgarch, checksum, value)) |
194 | except sqlite3.IntegrityError as exc: | 194 | except sqlite3.IntegrityError as exc: |
195 | #already have the record, try to update | 195 | #already have the record, try to update |
196 | try: | 196 | try: |
197 | self._execute("UPDATE %s SET value=? WHERE version=? AND pkgarch=? AND checksum=? AND value<?" | 197 | self._execute("UPDATE %s SET value=? WHERE version=? AND pkgarch=? AND checksum=? AND value<?" |
198 | % (self.table), | 198 | % (self.table), |
199 | (value,version,pkgarch,checksum,value)) | 199 | (value, version, pkgarch, checksum, value)) |
200 | except sqlite3.IntegrityError as exc: | 200 | except sqlite3.IntegrityError as exc: |
201 | logger.error(str(exc)) | 201 | logger.error(str(exc)) |
202 | 202 | ||
203 | self.dirty = True | 203 | self.dirty = True |
204 | 204 | ||
205 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, | 205 | data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, |
206 | (version,pkgarch,checksum,value)) | 206 | (version, pkgarch, checksum, value)) |
207 | row=data.fetchone() | 207 | row=data.fetchone() |
208 | if row is not None: | 208 | if row is not None: |
209 | return row[0] | 209 | return row[0] |
@@ -212,13 +212,13 @@ class PRTable(object): | |||
212 | 212 | ||
213 | def importone(self, version, pkgarch, checksum, value): | 213 | def importone(self, version, pkgarch, checksum, value): |
214 | if self.nohist: | 214 | if self.nohist: |
215 | return self._importNohist(version, pkgarch, checksum, value) | 215 | return self._import_no_hist(version, pkgarch, checksum, value) |
216 | else: | 216 | else: |
217 | return self._importHist(version, pkgarch, checksum, value) | 217 | return self._import_hist(version, pkgarch, checksum, value) |
218 | 218 | ||
219 | def export(self, version, pkgarch, checksum, colinfo): | 219 | def export(self, version, pkgarch, checksum, colinfo): |
220 | metainfo = {} | 220 | metainfo = {} |
221 | #column info | 221 | #column info |
222 | if colinfo: | 222 | if colinfo: |
223 | metainfo["tbl_name"] = self.table | 223 | metainfo["tbl_name"] = self.table |
224 | metainfo["core_ver"] = prserv.__version__ | 224 | metainfo["core_ver"] = prserv.__version__ |
@@ -238,7 +238,7 @@ class PRTable(object): | |||
238 | 238 | ||
239 | if self.nohist: | 239 | if self.nohist: |
240 | sqlstmt = "SELECT T1.version, T1.pkgarch, T1.checksum, T1.value FROM %s as T1, \ | 240 | sqlstmt = "SELECT T1.version, T1.pkgarch, T1.checksum, T1.value FROM %s as T1, \ |
241 | (SELECT version,pkgarch,max(value) as maxvalue FROM %s GROUP BY version,pkgarch) as T2 \ | 241 | (SELECT version, pkgarch, max(value) as maxvalue FROM %s GROUP BY version, pkgarch) as T2 \ |
242 | WHERE T1.version=T2.version AND T1.pkgarch=T2.pkgarch AND T1.value=T2.maxvalue " % (self.table, self.table) | 242 | WHERE T1.version=T2.version AND T1.pkgarch=T2.pkgarch AND T1.value=T2.maxvalue " % (self.table, self.table) |
243 | else: | 243 | else: |
244 | sqlstmt = "SELECT * FROM %s as T1 WHERE 1=1 " % self.table | 244 | sqlstmt = "SELECT * FROM %s as T1 WHERE 1=1 " % self.table |
@@ -302,7 +302,7 @@ class PRData(object): | |||
302 | def disconnect(self): | 302 | def disconnect(self): |
303 | self.connection.close() | 303 | self.connection.close() |
304 | 304 | ||
305 | def __getitem__(self,tblname): | 305 | def __getitem__(self, tblname): |
306 | if not isinstance(tblname, str): | 306 | if not isinstance(tblname, str): |
307 | raise TypeError("tblname argument must be a string, not '%s'" % | 307 | raise TypeError("tblname argument must be a string, not '%s'" % |
308 | type(tblname)) | 308 | type(tblname)) |
@@ -316,4 +316,4 @@ class PRData(object): | |||
316 | if tblname in self._tables: | 316 | if tblname in self._tables: |
317 | del self._tables[tblname] | 317 | del self._tables[tblname] |
318 | logger.info("drop table %s" % (tblname)) | 318 | logger.info("drop table %s" % (tblname)) |
319 | self.connection.execute("DROP TABLE IF EXISTS %s;" % tblname) | 319 | self.connection.execute("DROP TABLE IF EXISTS %s;" % tblname) |
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index ab9a0a66df..efb2e0cf93 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -50,7 +50,7 @@ class PRServerClient(bb.asyncrpc.AsyncServerConnection): | |||
50 | 50 | ||
51 | response = None | 51 | response = None |
52 | try: | 52 | try: |
53 | value = self.server.table.getValue(version, pkgarch, checksum) | 53 | value = self.server.table.get_value(version, pkgarch, checksum) |
54 | response = {"value": value} | 54 | response = {"value": value} |
55 | except prserv.NotFoundError: | 55 | except prserv.NotFoundError: |
56 | self.logger.error("can not find value for (%s, %s)",version, checksum) | 56 | self.logger.error("can not find value for (%s, %s)",version, checksum) |
@@ -173,16 +173,16 @@ def run_as_daemon(func, pidfile, logfile): | |||
173 | # potentially hanging on a pipe. Handle both cases. | 173 | # potentially hanging on a pipe. Handle both cases. |
174 | si = open("/dev/null", "r") | 174 | si = open("/dev/null", "r") |
175 | try: | 175 | try: |
176 | os.dup2(si.fileno(),sys.stdin.fileno()) | 176 | os.dup2(si.fileno(), sys.stdin.fileno()) |
177 | except (AttributeError, io.UnsupportedOperation): | 177 | except (AttributeError, io.UnsupportedOperation): |
178 | sys.stdin = si | 178 | sys.stdin = si |
179 | so = open(logfile, "a+") | 179 | so = open(logfile, "a+") |
180 | try: | 180 | try: |
181 | os.dup2(so.fileno(),sys.stdout.fileno()) | 181 | os.dup2(so.fileno(), sys.stdout.fileno()) |
182 | except (AttributeError, io.UnsupportedOperation): | 182 | except (AttributeError, io.UnsupportedOperation): |
183 | sys.stdout = so | 183 | sys.stdout = so |
184 | try: | 184 | try: |
185 | os.dup2(so.fileno(),sys.stderr.fileno()) | 185 | os.dup2(so.fileno(), sys.stderr.fileno()) |
186 | except (AttributeError, io.UnsupportedOperation): | 186 | except (AttributeError, io.UnsupportedOperation): |
187 | sys.stderr = so | 187 | sys.stderr = so |
188 | 188 | ||
@@ -253,7 +253,7 @@ def stop_daemon(host, port): | |||
253 | portstr = "Wrong port? Other ports listening at %s: %s" % (host, " ".join(ports)) | 253 | portstr = "Wrong port? Other ports listening at %s: %s" % (host, " ".join(ports)) |
254 | 254 | ||
255 | sys.stderr.write("pidfile %s does not exist. Daemon not running? %s\n" | 255 | sys.stderr.write("pidfile %s does not exist. Daemon not running? %s\n" |
256 | % (pidfile,portstr)) | 256 | % (pidfile, portstr)) |
257 | return 1 | 257 | return 1 |
258 | 258 | ||
259 | try: | 259 | try: |