Try TPC-DS test

Author: ololobus

.gitignore

@@ -9,3 +9,5 @@ pg_query_state--*.sql
 cscope.out
 tags
 Dockerfile
+tmp_stress
+

.travis.yml

@@ -26,6 +26,7 @@ env:
     - PG_VERSION=10
     - PG_VERSION=9.6 LEVEL=hardcore
     - PG_VERSION=9.6
+    - PG_VERSION=12 LEVEL=stress
 
 matrix:
     allow_failures:

Dockerfile.tmpl

@@ -2,7 +2,7 @@ FROM postgres:${PG_VERSION}-alpine
 
 # Install dependencies
 RUN apk add --no-cache \
-	openssl curl \
+	openssl curl git \
 	perl perl-ipc-run \
 	make musl-dev gcc bison flex coreutils \
 	zlib-dev libedit-dev \
@@ -29,7 +29,6 @@ RUN	chown postgres:postgres ${PGDATA} && \
 	chmod a+rwx /usr/local/share/postgresql/extension
 
 COPY run_tests.sh /run.sh
-COPY tests/requirements.txt /requirements.txt
 RUN chmod 755 /run.sh
 
 ADD . /pg/testdir

run_tests.sh

@@ -144,7 +144,7 @@ if [ -f regression.diffs ]; then cat regression.diffs; fi
 # run python tests
 set +x -e
 python3 -m venv /tmp/env && source /tmp/env/bin/activate &&
-pip install -r /requirements.txt
+pip install -r tests/requirements.txt
 set -e #exit virtualenv with error code
 python tests/pg_qs_test_runner.py --port $PGPORT
 deactivate

tests/prepare_stress.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+
 mkdir -p tmp_stress
 cd tmp_stress
 rm -rf ./*
@@ -8,10 +9,10 @@ cd tpcds-kit/tools
 make -s
 
 #Generate data
-./dsdgen -FORCE -VERBOSE
+./dsdgen -FORCE -VERBOSE -SCALE 1
 
 #Prepare data
-mkdir tables -p
+mkdir -p tables
 for i in `ls *.dat`; do
   echo "Preparing file " $i
   sed 's/|$//' $i > tables/$i
@@ -22,4 +23,5 @@ done
          -INPUT ../query_templates/templates.lst \
          -VERBOSE Y \
          -QUALIFY Y \
+         -SCALE 1 \
          -DIALECT netezza

tests/query_tpcds.sql

@@ -471,7 +471,7 @@ def test_formats(config):
 
 	qs = query_state(config, acon, query, {'format': 'yaml'})
 	try:
-		yaml_doc = yaml.load(qs[0][3])
+		yaml_doc = yaml.load(qs[0][3], Loader=yaml.FullLoader)
 	except:
 		assert False, 'Invalid yaml format'
 	assert len(qs) == 1
@@ -508,26 +508,29 @@ class DataLoadException(Exception): pass
 class StressTestException(Exception): pass
 
 def load_tpcds_data(config):
-	print('Preparing TPC-DS...')
-	subprocess.call(['./tests/prepare_stress.sh'])
+	print('Loading TPC-DS data...')
+	# subprocess.call(['./tests/prepare_stress.sh'])
 
 	try:
 		conn = psycopg2.connect(**config)
 		cur = conn.cursor()
 
 		# Create tables
-		cur.execute(open('tmp_stress/tpcds-kit/tools/tpcds.sql', 'r').read())
+		with open('tmp_stress/tpcds-kit/tools/tpcds.sql', 'r') as f:
+			cur.execute(f.read())
 
 		# Copy table data from files
 		for table_datafile in os.listdir('tmp_stress/tpcds-kit/tools/'):
-			if table_datafile.endswith(".dat"):
+			if table_datafile.endswith('.dat'):
 				table_name = os.path.splitext(os.path.basename(table_datafile))[0]
-				copy_cmd = "COPY %s FROM 'tmp_stress/tpcds-kit/tools/tables/%s' CSV DELIMITER '|'" % (table_name, table_datafile)
+				copy_cmd = "COPY %s FROM '/pg/testdir/tmp_stress/tpcds-kit/tools/tables/%s' CSV DELIMITER '|'" % (table_name, table_datafile)
 
-				print("Loading table ", table_name)
-				cur.execute("TRUNCATE %s" % table_name)
+				print("Loading table", table_name)
+				# cur.execute("TRUNCATE %s" % table_name)
 				cur.execute(copy_cmd)
 
+		conn.commit()
+
 	except Exception as e:
 		cur.close()
 		conn.close()
@@ -538,10 +541,10 @@ def load_tpcds_data(config):
 def stress_test(config):
 	"""TPC-DS stress test"""
 	load_tpcds_data(config)
-	print('Starting test...')
 
+	print('Preparing TPC-DS queries...')
 	# Execute query in separate thread 
-	with open("tests/query_tpcds.sql",'r') as f:
+	with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:
 		sql = f.read()
 
 	queries = sql.split(';')
@@ -552,10 +555,14 @@ def stress_test(config):
 
 	acon, = n_async_connect(config)
 
+	print('Starting test...')
 	timeout_list = []
+	exclude_list = [2]
 	bar = progressbar.ProgressBar(max_value=len(queries))
 	for i, query in enumerate(queries):
 		bar.update(i + 1)
+		if i + 1 in exclude_list:
+			continue
 		try:
 			# Set query timeout to 10 sec 
 			set_guc(acon, 'statement_timeout', 10000)
@@ -564,8 +571,6 @@ def stress_test(config):
 		#TODO: Put here testgres exception when supported
 		except psycopg2.extensions.QueryCanceledError:
 			timeout_list.append(i)
-		finally:
-			pass
 
 	n_close((acon,))