Changeset 106321 in webkit


Ignore:
Timestamp:
Jan 30, 2012 7:14:19 PM (12 years ago)
Author:
rniwa@webkit.org
Message:

Python code in webkit-perf.appspot.com uses camelCase
​https://bugs.webkit.org/show_bug.cgi?id=77392

Reviewed by Adam Barth.

Use PEP8 style naming conventions instead of camelCase.

  • Websites/webkit-perf.appspot.com/create_handler.py:

(CreateHandler.post):
(CreateHandler._create_builder):
(CreateHandler._create_branch):
(CreateHandler._create_platform):

  • Websites/webkit-perf.appspot.com/dashboard_handler.py:

(DashboardHandler.get):

  • Websites/webkit-perf.appspot.com/manifest_handler.py:

(ManifestHandler.get):

  • Websites/webkit-perf.appspot.com/merge_tests_handler.py:

(MergeTestsHandler.post):

  • Websites/webkit-perf.appspot.com/models.py:

(create_in_transaction_with_numeric_id_holder):
(delete_model_with_numeric_id_holder):
(modelFromNumericId):
(Builder.authenticate):
(Builder.hashed_password):
(Test.cache_key):

  • Websites/webkit-perf.appspot.com/report_handler.py:

(ReportHandler.post):
(ReportHandler._model_by_key_name_in_body_or_error):
(ReportHandler._integer_in_body):
(ReportHandler._timestamp_in_body):
(ReportHandler.bypass_authentication):
(ReportHandler._results_are_valid):
(ReportHandler._results_are_valid._is_float_convertible):
(ReportHandler._create_build_if_possible):
(ReportHandler._create_build_if_possible.execute):
(ReportHandler._add_test_if_needed):
(ReportHandler._add_test_if_needed.execute):
(ReportHandler):
(AdminReportHandler.bypass_authentication):

  • Websites/webkit-perf.appspot.com/runs_handler.py:

(RunsHandler.get):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r106308 r106321  
     12012-01-30  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Python code in webkit-perf.appspot.com uses camelCase
     4        https://bugs.webkit.org/show_bug.cgi?id=77392
     5
     6        Reviewed by Adam Barth.
     7
     8        Use PEP8 style naming conventions instead of camelCase.
     9
     10        * Websites/webkit-perf.appspot.com/create_handler.py:
     11        (CreateHandler.post):
     12        (CreateHandler._create_builder):
     13        (CreateHandler._create_branch):
     14        (CreateHandler._create_platform):
     15        * Websites/webkit-perf.appspot.com/dashboard_handler.py:
     16        (DashboardHandler.get):
     17        * Websites/webkit-perf.appspot.com/manifest_handler.py:
     18        (ManifestHandler.get):
     19        * Websites/webkit-perf.appspot.com/merge_tests_handler.py:
     20        (MergeTestsHandler.post):
     21        * Websites/webkit-perf.appspot.com/models.py:
     22        (create_in_transaction_with_numeric_id_holder):
     23        (delete_model_with_numeric_id_holder):
     24        (modelFromNumericId):
     25        (Builder.authenticate):
     26        (Builder.hashed_password):
     27        (Test.cache_key):
     28        * Websites/webkit-perf.appspot.com/report_handler.py:
     29        (ReportHandler.post):
     30        (ReportHandler._model_by_key_name_in_body_or_error):
     31        (ReportHandler._integer_in_body):
     32        (ReportHandler._timestamp_in_body):
     33        (ReportHandler.bypass_authentication):
     34        (ReportHandler._results_are_valid):
     35        (ReportHandler._results_are_valid._is_float_convertible):
     36        (ReportHandler._create_build_if_possible):
     37        (ReportHandler._create_build_if_possible.execute):
     38        (ReportHandler._add_test_if_needed):
     39        (ReportHandler._add_test_if_needed.execute):
     40        (ReportHandler):
     41        (AdminReportHandler.bypass_authentication):
     42        * Websites/webkit-perf.appspot.com/runs_handler.py:
     43        (RunsHandler.get):
     44
    1452012-01-30  Ryosuke Niwa  <rniwa@webkit.org>
    246

  • trunk/Websites/webkit-perf.appspot.com/create_handler.py

    r106308 r106321  
    3838from models import NumericIdHolder
    3939from models import Platform
    40 from models import createInTransactionWithNumericIdHolder
     40from models import create_in_transaction_with_numeric_id_holder
    4141
    4242
    … …  
    5555
    5656        if model == 'builder':
    57             error = self._createBuilder(name, password)
     57            error = self._create_builder(name, password)
    5858        elif model == 'branch':
    59             error = self._createBranch(key, name)
     59            error = self._create_branch(key, name)
    6060        elif model == 'platform':
    61             error = self._createPlatform(key, name)
     61            error = self._create_platform(key, name)
    6262        else:
    6363            error = "Unknown model type: %s\n" % model
    … …  
    6767        self.response.out.write(error + '\n' if error else 'OK')
    6868
    69     def _createBuilder(self, name, password):
     69    def _create_builder(self, name, password):
    7070        if not name or not password:
    7171            return 'Invalid name or password'
    7272
    73         password = Builder.hashedPassword(password)
     73        password = Builder.hashed_password(password)
    7474
    7575        def execute():
    … …  
    8686        return db.run_in_transaction(execute)
    8787
    88     def _createBranch(self, key, name):
     88    def _create_branch(self, key, name):
    8989        if not key or not name:
    9090            return 'Invalid key or name'
    … …  
    100100            return branch
    101101
    102         createInTransactionWithNumericIdHolder(execute)
     102        create_in_transaction_with_numeric_id_holder(execute)
    103103        return error[0]
    104104
    105     def _createPlatform(self, key, name):
     105    def _create_platform(self, key, name):
    106106        if not key or not name:
    107107            return 'Invalid key name'
    … …  
    117117            return platform
    118118
    119         createInTransactionWithNumericIdHolder(execute)
     119        create_in_transaction_with_numeric_id_holder(execute)
    120120        return error[0]

  • trunk/Websites/webkit-perf.appspot.com/dashboard_handler.py

    r106308 r106321  
    4242    def get(self):
    4343        self.response.headers['Content-Type'] = 'application/json; charset=utf-8';
    44 
    4544        cache = memcache.get('dashboard')
    4645        if cache:
    … …  
    4847            return
    4948
    50         webkitTrunk = Branch.get_by_key_name('webkit-trunk')
     49        webkit_trunk = Branch.get_by_key_name('webkit-trunk')
    5150
    5251        # FIXME: Determine popular branches, platforms, and tests
    5352        dashboard = {
    5453            'defaultBranch': 'WebKit trunk',
    55             'branchToId': {webkitTrunk.name: webkitTrunk.id},
     54            'branchToId': {webkit_trunk.name: webkit_trunk.id},
    5655            'platformToId': {},
    5756            'testToId': {},

  • trunk/Websites/webkit-perf.appspot.com/manifest_handler.py

    r106308 r106321  
    4747            return
    4848
    49         testMap = {}
    50         platformIdMap = {}
    51         branchIdMap = {}
     49        test_map = {}
     50        platform_id_map = {}
     51        branch_id_map = {}
    5252        for test in Test.all():
    53             branchIds = [Branch.get(branchKey).id for branchKey in test.branches]
    54             platformIds = [Platform.get(platformKey).id for platformKey in test.platforms]
    55             testMap[test.id] = {
     53            branch_ids = [Branch.get(branch_key).id for branch_key in test.branches]
     54            platform_ids = [Platform.get(platform_key).id for platform_key in test.platforms]
     55            test_map[test.id] = {
    5656                'name': test.name,
    57                 'branchIds': branchIds,
    58                 'platformIds': platformIds,
     57                'branchIds': branch_ids,
     58                'platformIds': platform_ids,
    5959            }
    6060
    61             for platformId in platformIds:
    62                 platformIdMap.setdefault(platformId, {'tests': [], 'branches': []})
    63                 platformIdMap[platformId]['tests'].append(test.id)
    64                 platformIdMap[platformId]['branches'] += branchIds
     61            for platform_id in platform_ids:
     62                platform_id_map.setdefault(platformId, {'tests': [], 'branches': []})
     63                platform_id_map[platform_id]['tests'].append(test.id)
     64                platform_id_map[platform_id]['branches'] += branch_ids
    6565
    66             for branchId in branchIds:
    67                 branchIdMap.setdefault(branchId, {'tests': [], 'platforms': []})
    68                 branchIdMap[branchId]['tests'].append(test.id)
    69                 branchIdMap[branchId]['platforms'] += platformIds
     66            for branch_id in branch_ids:
     67                branch_id_map.setdefault(branchId, {'tests': [], 'platforms': []})
     68                branch_id_map[branch_id]['tests'].append(test.id)
     69                branch_id_map[branch_id]['platforms'] += platform_ids
    7070
    71         platformMap = {}
     71        platform_map = {}
    7272        for platform in Platform.all():
    73             if platform.id not in platformIdMap:
     73            if platform.id not in platform_id_map:
    7474                continue
    75             platformMap[platform.id] = {
     75            platform_map[platform.id] = {
    7676                'name': platform.name,
    77                 'testIds': list(set(platformIdMap[platform.id]['tests'])),
    78                 'branchIds': list(set(platformIdMap[platform.id]['branches'])),
     77                'testIds': list(set(platform_id_map[platform.id]['tests'])),
     78                'branchIds': list(set(platform_id_map[platform.id]['branches'])),
    7979            }
    8080
    81         branchMap = {}
     81        branch_map = {}
    8282        for branch in Branch.all():
    83             if branch.id not in branchIdMap:
     83            if branch.id not in branch_id_map:
    8484                continue
    85             branchMap[branch.id] = {
     85            branch_map[branch.id] = {
    8686                'name': branch.name,
    87                 'testIds': list(set(branchIdMap[branch.id]['tests'])),
    88                 'platformIds': list(set(branchIdMap[branch.id]['platforms'])),
     87                'testIds': list(set(branch_id_map[branch.id]['tests'])),
     88                'platformIds': list(set(branch_id_map[branch.id]['platforms'])),
    8989            }
    9090
    91         result = json.dumps({'testMap': testMap, 'platformMap': platformMap, 'branchMap': branchMap})
     91        result = json.dumps({'testMap': test_map, 'platformMap': platform_map, 'branchMap': branch_map})
    9292        self.response.out.write(result)
    9393        memcache.add('manifest', result)

  • trunk/Websites/webkit-perf.appspot.com/merge_tests_handler.py

    r106308 r106321  
    3636from models import Test
    3737from models import TestResult
    38 from models import deleteModelWithNumericIdHolder
     38from models import delete_model_with_numeric_id_holder
    3939
    4040
    … …  
    5252            return
    5353
    54         mergedResults = TestResult.all()
    55         mergedResults.filter('name =', merge.name)
    56         for result in mergedResults:
     54        merged_results = TestResult.all()
     55        merged_results.filter('name =', merge.name)
     56        for result in merged_results:
    5757            result.name = into.name
    5858            result.put()
    … …  
    6262        memcache.flush_all()
    6363
    64         deleteModelWithNumericIdHolder(merge)
     64        delete_model_with_numeric_id_holder(merge)
    6565
    6666        self.response.out.write('OK')

  • trunk/Websites/webkit-perf.appspot.com/models.py

    r106308 r106321  
    3939
    4040
    41 def createInTransactionWithNumericIdHolder(callback):
    42     idHolder = NumericIdHolder()
    43     idHolder.put()
    44     idHolder = NumericIdHolder.get(idHolder.key())
    45     owner = db.run_in_transaction(callback, idHolder.key().id())
     41def create_in_transaction_with_numeric_id_holder(callback):
     42    id_holder = NumericIdHolder()
     43    id_holder.put()
     44    id_holder = NumericIdHolder.get(id_holder.key())
     45    owner = db.run_in_transaction(callback, id_holder.key().id())
    4646    if owner:
    47         idHolder.owner = owner
    48         idHolder.put()
     47        id_holder.owner = owner
     48        id_holder.put()
    4949    else:
    50         idHolder.delete()
     50        id_holder.delete()
    5151    return owner
    5252
    53 def deleteModelWithNumericIdHolder(model):
    54     idHolder = NumericIdHolder.get_by_id(model.id)
     53
     54def delete_model_with_numeric_id_holder(model):
     55    id_holder = NumericIdHolder.get_by_id(model.id)
    5556    model.delete()
    56     idHolder.delete()
     57    id_holder.delete()
    5758
    5859
    59 def modelFromNumericId(id, expectedKind):
    60     idHolder = NumericIdHolder.get_by_id(id)
    61     return idHolder.owner if idHolder and idHolder.owner and isinstance(idHolder.owner, expectedKind) else None
     60def modelFromNumericId(id, expected_kind):
     61    id_holder = NumericIdHolder.get_by_id(id)
     62    return id_holder.owner if id_holder and id_holder.owner and isinstance(id_holder.owner, expected_kind) else None
    6263
    6364
    … …  
    7677    password = db.StringProperty(required=True)
    7778
    78     def authenticate(self, rawPassword):
    79         return self.password == hashlib.sha256(rawPassword).hexdigest()
     79    def authenticate(self, raw_password):
     80        return self.password == hashlib.sha256(raw_password).hexdigest()
    8081
    8182    @staticmethod
    82     def hashedPassword(rawPassword):
    83         return hashlib.sha256(rawPassword).hexdigest()
     83    def hashed_password(raw_password):
     84        return hashlib.sha256(raw_password).hexdigest()
    8485
    8586
    … …  
    101102
    102103    @staticmethod
    103     def cacheKey(testId, branchId, platformId):
    104         return 'runs:%d,%d,%d' % (testId, branchId, platformId)
     104    def cache_key(test_id, branch_id, platform_id):
     105        return 'runs:%d,%d,%d' % (test_id, branch_id, platform_id)
    105106
    106107

  • trunk/Websites/webkit-perf.appspot.com/report_handler.py

    r106308 r106321  
    4545from models import Test
    4646from models import TestResult
    47 from models import createInTransactionWithNumericIdHolder
     47from models import create_in_transaction_with_numeric_id_holder
    4848
    4949
    … …  
    6464            return self._output('Failed to parse the payload as a json. Report key: %d' % log.key().id())
    6565
    66         builder = self._modelByKeyNameInBodyOrError(Builder, 'builder-name')
    67         branch = self._modelByKeyNameInBodyOrError(Branch, 'branch')
    68         platform = self._modelByKeyNameInBodyOrError(Platform, 'platform')
    69         buildNumber = self._integerInBody('build-number')
    70         revision = self._integerInBody('revision')
    71         timestamp = self._timestampInBody()
     66        builder = self._model_by_key_name_in_body_or_error(Builder, 'builder-name')
     67        branch = self._model_by_key_name_in_body_or_error(Branch, 'branch')
     68        platform = self._model_by_key_name_in_body_or_error(Platform, 'platform')
     69        build_number = self._integer_in_body('build-number')
     70        revision = self._integer_in_body('revision')
     71        timestamp = self._timestamp_in_body()
    7272
    7373        failed = False
    74         if builder and not (self.bypassAuthentication() or builder.authenticate(self._body.get('password', ''))):
     74        if builder and not (self.bypass_authentication() or builder.authenticate(self._body.get('password', ''))):
    7575            self._output('Authentication failed')
    7676            failed = True
    7777
    78         if not self._resultsAreValid():
     78        if not self._results_are_valid():
    7979            self._output("The payload doesn't contain results or results are malformed")
    8080            failed = True
    8181
    82         if not (builder and branch and platform and buildNumber and revision and timestamp) or failed:
     82        if not (builder and branch and platform and build_number and revision and timestamp) or failed:
    8383            return
    8484
    85         build = self._createBuildIfPossible(builder, buildNumber, branch, platform, revision, timestamp)
     85        build = self._create_build_if_possible(builder, build_number, branch, platform, revision, timestamp)
    8686        if not build:
    8787            return
    8888
    89         for testName, result in self._body['results'].iteritems():
    90             test = self._addTestIfNeeded(testName, branch, platform)
    91             memcache.delete(Test.cacheKey(test.id, branch.id, platform.id))
     89        for test_name, result in self._body['results'].iteritems():
     90            test = self._add_test_if_needed(test_name, branch, platform)
     91            memcache.delete(Test.cache_key(test.id, branch.id, platform.id))
    9292            if isinstance(result, dict):
    93                 TestResult(name=testName, build=build, value=float(result.get('avg', 0)), valueMedian=float(result.get('median', 0)),
     93                TestResult(name=test_name, build=build, value=float(result.get('avg', 0)), valueMedian=float(result.get('median', 0)),
    9494                    valueStdev=float(result.get('stdev', 0)), valueMin=float(result.get('min', 0)), valueMax=float(result.get('max', 0))).put()
    9595            else:
    96                 TestResult(name=testName, build=build, value=float(result)).put()
     96                TestResult(name=test_name, build=build, value=float(result)).put()
    9797
    9898        log = ReportLog.get(log.key())
    … …  
    105105        return self._output('OK')
    106106
    107     def _modelByKeyNameInBodyOrError(self, model, keyName):
     107    def _model_by_key_name_in_body_or_error(self, model, keyName):
    108108        key = self._body.get(keyName, '')
    109109        instance = key and model.get_by_key_name(key)
    … …  
    112112        return instance
    113113
    114     def _integerInBody(self, key):
     114    def _integer_in_body(self, key):
    115115        value = self._body.get(key, '')
    116116        try:
    … …  
    119119            return self._output('Invalid %s: "%s"' % (key.replace('-', ' '), value))
    120120
    121     def _timestampInBody(self):
     121    def _timestamp_in_body(self):
    122122        value = self._body.get('timestamp', '')
    123123        try:
    … …  
    129129        self.response.out.write(message + '\n')
    130130
    131     def bypassAuthentication(self):
     131    def bypass_authentication(self):
    132132        return False
    133133
    134     def _resultsAreValid(self):
     134    def _results_are_valid(self):
    135135
    136         def _isFloatConvertible(value):
     136        def _is_float_convertible(value):
    137137            try:
    138138                float(value)
    … …  
    147147            if isinstance(testResult, dict):
    148148                for value in testResult.values():
    149                     if not _isFloatConvertible(value):
     149                    if not _is_float_convertible(value):
    150150                        return False
    151151                if 'avg' not in testResult:
    152152                    return False
    153153                continue
    154             if not _isFloatConvertible(testResult):
     154            if not _is_float_convertible(testResult):
    155155                return False
    156156
    157157        return True
    158158
    159     def _createBuildIfPossible(self, builder, buildNumber, branch, platform, revision, timestamp):
     159    def _create_build_if_possible(self, builder, build_number, branch, platform, revision, timestamp):
    160160        key_name = builder.name + ':' + str(int(time.mktime(timestamp.timetuple())))
    161161
    … …  
    165165                return self._output('The build at %s already exists for %s' % (str(timestamp), builder.name))
    166166
    167             return Build(branch=branch, platform=platform, builder=builder, buildNumber=buildNumber,
    168                 timestamp=timestamp, revision=revision, key_name=key_name).put()
     167            return Build(branch=branch, platform=platform, builder=builder, buildNumber=build_number,
     168                timestamp=timestamp, revision=revision, keyName=key_name).put()
    169169        return db.run_in_transaction(execute)
    170170
    171     def _addTestIfNeeded(self, testName, branch, platform):
     171    def _add_test_if_needed(self, test_name, branch, platform):
    172172
    173173        def execute(id):
    174             test = Test.get_by_key_name(testName)
     174            test = Test.get_by_key_name(test_name)
    175175            returnValue = None
    176176            if not test:
    177                 test = Test(id=id, name=testName, key_name=testName)
     177                test = Test(id=id, name=test_name, key_name=test_name)
    178178                returnValue = test
    179179            if branch.key() not in test.branches:
    … …  
    183183            test.put()
    184184            return returnValue
    185         return createInTransactionWithNumericIdHolder(execute) or Test.get_by_key_name(testName)
     185        return create_in_transaction_with_numeric_id_holder(execute) or Test.get_by_key_name(test_name)
    186186
    187187
    188188class AdminReportHandler(ReportHandler):
    189     def bypassAuthentication(self):
     189    def bypass_authentication(self):
    190190        return True

  • trunk/Websites/webkit-perf.appspot.com/runs_handler.py

    r106308 r106321  
    5050
    5151        try:
    52             testId = int(self.request.get('id', 0))
    53             branchId = int(self.request.get('branchid', 0))
    54             platformId = int(self.request.get('platformid', 0))
     52            test_id = int(self.request.get('id', 0))
     53            branch_id = int(self.request.get('branchid', 0))
     54            platform_id = int(self.request.get('platformid', 0))
    5555        except TypeError:
    5656            # FIXME: Output an error here
    57             testId = 0
    58             branchId = 0
    59             platformId = 0
     57            test_id = 0
     58            branch_id = 0
     59            platform_id = 0
    6060
    6161        # FIXME: Just fetch builds specified by "days"
    6262        # days = self.request.get('days', 365)
    6363
    64         cacheKey = Test.cacheKey(testId, branchId, platformId)
    65         cache = memcache.get(cacheKey)
     64        cache_key = Test.cache_key(test_id, branch_id, platform_id)
     65        cache = memcache.get(cache_key)
    6666        if cache:
    6767            self.response.out.write(cache)
    … …  
    6969
    7070        builds = Build.all()
    71         builds.filter('branch =', modelFromNumericId(branchId, Branch))
    72         builds.filter('platform =', modelFromNumericId(platformId, Platform))
     71        builds.filter('branch =', modelFromNumericId(branch_id, Branch))
     72        builds.filter('platform =', modelFromNumericId(platform_id, Platform))
    7373
    74         test = modelFromNumericId(testId, Test)
    75         testName = test.name if test else None
     74        test = modelFromNumericId(test_id, Test)
     75        test_name = test.name if test else None
    7676        test_runs = []
    7777        averages = {}
    … …  
    8181        for build in builds:
    8282            results = TestResult.all()
    83             results.filter('name =', testName)
     83            results.filter('name =', test_name)
    8484            results.filter('build =', build)
    8585            for result in results:
    … …  
    102102            'stat': 'ok'})
    103103        self.response.out.write(result)
    104         memcache.add(cacheKey, result)
     104        memcache.add(cache_key, result)
Note: See TracChangeset for help on using the changeset viewer.