Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9511eca8 authored by Fyodor Kupolov's avatar Fyodor Kupolov Committed by Android (Google) Code Review
Browse files

Merge "Updated NewDatabasePerformanceTests"

parents a375a4e2 b5f38041

core/tests/coretests/src/android/database/NewDatabasePerformanceTestSuite.java

+23 −62
Original line number Diff line number Diff line
@@ -23,68 +23,29 @@ public class NewDatabasePerformanceTestSuite extends TestSuite { 
        TestSuite suite =

          new TestSuite(NewDatabasePerformanceTestSuite.class.getName());



        suite.addTestSuite(NewDatabasePerformanceTests.

                           Insert1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InsertIndexed1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           Select100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringComparison100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InnerJoin100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InnerJoinOneSide100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InnerJoinNoIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectSubQIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectIndexStringComparison100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectInteger100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectString100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectIntegerIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectIndexString100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringStartsWith100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           DeleteIndexed1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           Delete1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           DeleteWhere1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           DeleteIndexWhere1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           UpdateIndexWhere1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           UpdateWhere1000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InsertInteger10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InsertIntegerIndex10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InsertString10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           InsertStringIndexed10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringStartsWith10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringIndexedStartsWith10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectInteger10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectIntegerIndexed10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringContains10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.

                           SelectStringIndexedContains10000.class);

        suite.addTestSuite(NewDatabasePerformanceTests.Insert100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.InsertIndexed100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.Select100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectStringComparison100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.InnerJoin100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.InnerJoinOneSide100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.InnerJoinNoIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectSubQIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectIndexStringComparison100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectInteger100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectString100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectIntegerIndex100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectIndexString100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectStringStartsWith100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.DeleteIndexed100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.Delete100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.DeleteWhere100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.DeleteIndexWhere100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.UpdateIndexWhere100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.UpdateWhere100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectStringContains100.class);

        suite.addTestSuite(NewDatabasePerformanceTests.SelectStringIndexedContains100.class);



        return suite;

    }

core/tests/coretests/src/android/database/NewDatabasePerformanceTests.java

+132 −374

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/database/process_newdb_perf_test_logs.py

0 → 100644
+50 −0
Original line number Diff line number Diff line 
#!/usr/bin/env python



# Copyright (C) 2017 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import re

import sys



def main():

    args = sys.argv

    if len(args) <= 1:

        exit("Usage %s <log_file>" % args[0])

    with open(args[1], 'r') as f:

        all_lines = f.readlines()

    timings = {}

    running_sum = 0

    for line in all_lines:

        regex = r"NewDatabasePerformanceTests: Test (\w+) took (\d+) ms"

        matches = re.search(regex, line)

        if matches:

            test_name = matches.group(1)

            duration = int(matches.group(2))

            if not test_name in timings:

                timings[test_name] = []

            timings[test_name].append(duration)

            running_sum += duration

        if ("TestRunner: run finished:" in line) and (running_sum > 0):

            test_name = '*** TOTAL ALL TESTS (ms) ***'

            if not test_name in timings:

                timings[test_name] = []

            timings[test_name].append(running_sum)

            running_sum=0



    for k in sorted(timings):

        timings_ar = timings[k]

        print "%s: %s avg: %s" % (k, timings_ar, sum(timings_ar) / float(len(timings_ar)) )



if __name__ == '__main__':

    main()