Add an option to use existing tables to perf.py

docker/test/performance-comparison/perf.py

@@ -48,6 +48,8 @@ parser.add_argument('--profile-seconds', type=int, default=0, help='For how many
 parser.add_argument('--long', action='store_true', help='Do not skip the tests tagged as long.')
 parser.add_argument('--print-queries', action='store_true', help='Print test queries and exit.')
 parser.add_argument('--print-settings', action='store_true', help='Print test settings and exit.')
+parser.add_argument('--keep-created-tables', action='store_true', help="Don't drop the created tables after the test.")
+parser.add_argument('--use-existing-tables', action='store_true', help="Don't create or drop the tables, use the existing ones instead.")
 args = parser.parse_args()
 
 reportStageEnd('start')
@@ -148,20 +150,21 @@ for i, s in enumerate(servers):
 
 reportStageEnd('connect')
 
-# Run drop queries, ignoring errors. Do this before all other activity, because
-# clickhouse_driver disconnects on error (this is not configurable), and the new
-# connection loses the changes in settings.
-drop_query_templates = [q.text for q in root.findall('drop_query')]
-drop_queries = substitute_parameters(drop_query_templates)
-for conn_index, c in enumerate(all_connections):
-    for q in drop_queries:
-        try:
-            c.execute(q)
-            print(f'drop\t{conn_index}\t{c.last_query.elapsed}\t{tsv_escape(q)}')
-        except:
-            pass
+if not args.use_existing_tables:
+    # Run drop queries, ignoring errors. Do this before all other activity,
+    # because clickhouse_driver disconnects on error (this is not configurable),
+    # and the new connection loses the changes in settings.
+    drop_query_templates = [q.text for q in root.findall('drop_query')]
+    drop_queries = substitute_parameters(drop_query_templates)
+    for conn_index, c in enumerate(all_connections):
+        for q in drop_queries:
+            try:
+                c.execute(q)
+                print(f'drop\t{conn_index}\t{c.last_query.elapsed}\t{tsv_escape(q)}')
+            except:
+                pass
 
-reportStageEnd('drop-1')
+    reportStageEnd('drop-1')
 
 # Apply settings.
 # If there are errors, report them and continue -- maybe a new test uses a setting
@@ -193,37 +196,40 @@ for t in tables:
 
 reportStageEnd('preconditions')
 
-# Run create and fill queries. We will run them simultaneously for both servers,
-# to save time.
-# The weird search is to keep the relative order of elements, which matters, and
-# etree doesn't support the appropriate xpath query.
-create_query_templates = [q.text for q in root.findall('./*') if q.tag in ('create_query', 'fill_query')]
-create_queries = substitute_parameters(create_query_templates)
+if not args.use_existing_tables:
+    # Run create and fill queries. We will run them simultaneously for both
+    # servers, to save time. The weird XML search + filter is because we want to
+    # keep the relative order of elements, and etree doesn't support the
+    # appropriate xpath query.
+    create_query_templates = [q.text for q in root.findall('./*')
+        if q.tag in ('create_query', 'fill_query')]
+    create_queries = substitute_parameters(create_query_templates)
 
-# Disallow temporary tables, because the clickhouse_driver reconnects on errors,
-# and temporary tables are destroyed. We want to be able to continue after some
-# errors.
-for q in create_queries:
-    if re.search('create temporary table', q, flags=re.IGNORECASE):
-        print(f"Temporary tables are not allowed in performance tests: '{q}'",
-            file = sys.stderr)
-        sys.exit(1)
+    # Disallow temporary tables, because the clickhouse_driver reconnects on
+    # errors, and temporary tables are destroyed. We want to be able to continue
+    # after some errors.
+    for q in create_queries:
+        if re.search('create temporary table', q, flags=re.IGNORECASE):
+            print(f"Temporary tables are not allowed in performance tests: '{q}'",
+                file = sys.stderr)
+            sys.exit(1)
 
-def do_create(connection, index, queries):
-    for q in queries:
-        connection.execute(q)
-        print(f'create\t{index}\t{connection.last_query.elapsed}\t{tsv_escape(q)}')
+    def do_create(connection, index, queries):
+        for q in queries:
+            connection.execute(q)
+            print(f'create\t{index}\t{connection.last_query.elapsed}\t{tsv_escape(q)}')
 
-threads = [Thread(target = do_create, args = (connection, index, create_queries))
-                for index, connection in enumerate(all_connections)]
+    threads = [
+        Thread(target = do_create, args = (connection, index, create_queries))
+        for index, connection in enumerate(all_connections)]
 
-for t in threads:
-    t.start()
+    for t in threads:
+        t.start()
 
-for t in threads:
-    t.join()
+    for t in threads:
+        t.join()
 
-reportStageEnd('create')
+    reportStageEnd('create')
 
 # By default, test all queries.
 queries_to_run = range(0, len(test_queries))
@@ -402,10 +408,11 @@ print(f'profile-total\t{profile_total_seconds}')
 reportStageEnd('run')
 
 # Run drop queries
-drop_queries = substitute_parameters(drop_query_templates)
-for conn_index, c in enumerate(all_connections):
-    for q in drop_queries:
-        c.execute(q)
-        print(f'drop\t{conn_index}\t{c.last_query.elapsed}\t{tsv_escape(q)}')
+if not args.keep_created_tables and not args.use_existing_tables:
+    drop_queries = substitute_parameters(drop_query_templates)
+    for conn_index, c in enumerate(all_connections):
+        for q in drop_queries:
+            c.execute(q)
+            print(f'drop\t{conn_index}\t{c.last_query.elapsed}\t{tsv_escape(q)}')
 
 reportStageEnd('drop-2')