Hi, On 2018-11-26 22:56:09 -0600, Justin Pryzby wrote: > On Mon, Nov 26, 2018 at 07:00:35PM -0800, Andres Freund wrote: > > Could you check that the attached patch this also fixes your original > > issue? Going through the code to see if there's other occurances of > > this. > > Confirmed that fixes my crash.
Thanks a lot for narrowing down your crash to something I can reproduce! Here's a more complete patch, with a testcase. Tom, the test creates a 1100k column table (using \set ECHO none + gexec), but with a small row. Currently it's not dropped after the table, as I thought it might be worthwhile to be tested by pg_dump/upgrade etc too. You're probably the person most concerned with test runtimes, ... Any concerns about that? The table creation is quick*, on the order of 30ms. Greetings, Andres Freund *at least as long as there's no default columns and the table's not dropped, seems we have somewhat of an O(N^2) situation going on when dropping a table with many columns that have default columns - we re-build the cache entry after each dropped default value. But as the max is 1600 columns, that's not too bad.
>From fda7a2b41cba265f6dc3212f65a9da5f3518cf7c Mon Sep 17 00:00:00 2001 From: Andres Freund <and...@anarazel.de> Date: Tue, 27 Nov 2018 00:22:02 -0800 Subject: [PATCH v1] Fix jit compilation issue on very wide tables. Reported-By: Justin Pryzby Author: Andres Freund Discussion: https://postgr.es/m/20181115223959.gb10...@telsasoft.com Backpatch: 11, just as jit compilation was --- src/backend/jit/llvm/llvmjit_deform.c | 12 +++++++++--- src/test/regress/expected/create_table.out | 10 ++++++++++ src/test/regress/expected/sanity_check.out | 1 + src/test/regress/sql/create_table.sql | 10 ++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/backend/jit/llvm/llvmjit_deform.c b/src/backend/jit/llvm/llvmjit_deform.c index 4111bf0a54b..d168eae0873 100644 --- a/src/backend/jit/llvm/llvmjit_deform.c +++ b/src/backend/jit/llvm/llvmjit_deform.c @@ -248,10 +248,16 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc, v_infomask2, "maxatt"); + /* + * Need to zext, as getelementptr otherwise treats hoff as a signed 8bit + * integer, which'd yield a negative offset for t_hoff > 127. + */ v_hoff = - l_load_struct_gep(b, v_tuplep, - FIELDNO_HEAPTUPLEHEADERDATA_HOFF, - "t_hoff"); + LLVMBuildZExt(b, + l_load_struct_gep(b, v_tuplep, + FIELDNO_HEAPTUPLEHEADERDATA_HOFF, + ""), + LLVMInt32Type(), "t_hoff"); v_tupdata_base = LLVMBuildGEP(b, diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index e92748c1ea0..b26b4e7b6d9 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -261,6 +261,16 @@ ERROR: relation "as_select1" already exists CREATE TABLE IF NOT EXISTS as_select1 AS SELECT * FROM pg_class WHERE relkind = 'r'; NOTICE: relation "as_select1" already exists, skipping DROP TABLE as_select1; +-- create an extra wide table to test for issues related to that +-- (temporarily hide query, to avoid the long CREATE TABLE stmt) +\set ECHO none +INSERT INTO extra_wide_table(firstc, lastc) VALUES('first col', 'last col'); +SELECT firstc, lastc FROM extra_wide_table; + firstc | lastc +-----------+---------- + first col | last col +(1 row) + -- check that tables with oids cannot be created anymore CREATE TABLE withoid() WITH OIDS; ERROR: syntax error at or near "OIDS" diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out index c77060d36c1..009a89fc1ad 100644 --- a/src/test/regress/expected/sanity_check.out +++ b/src/test/regress/expected/sanity_check.out @@ -44,6 +44,7 @@ dupindexcols|t e_star|f emp|f equipment_r|f +extra_wide_table|f f_star|f fast_emp4000|t float4_tbl|f diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index 90cc1a578f3..c6f048f8c2a 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -277,6 +277,16 @@ CREATE TABLE as_select1 AS SELECT * FROM pg_class WHERE relkind = 'r'; CREATE TABLE IF NOT EXISTS as_select1 AS SELECT * FROM pg_class WHERE relkind = 'r'; DROP TABLE as_select1; +-- create an extra wide table to test for issues related to that +-- (temporarily hide query, to avoid the long CREATE TABLE stmt) +\set ECHO none +SELECT 'CREATE TABLE extra_wide_table(firstc text, '|| array_to_string(array_agg('c'||i||' bool'),',')||', lastc text);' +FROM generate_series(1, 1100) g(i) +\gexec +\set ECHO all +INSERT INTO extra_wide_table(firstc, lastc) VALUES('first col', 'last col'); +SELECT firstc, lastc FROM extra_wide_table; + -- check that tables with oids cannot be created anymore CREATE TABLE withoid() WITH OIDS; CREATE TABLE withoid() WITH (oids); -- 2.18.0.rc2.dirty
