Skip to content

Commit

Permalink
update PG16 regression test expected (still have 2 issues)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaigai committed Oct 21, 2024
1 parent 8179282 commit 2b77d56
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
1 change: 1 addition & 0 deletions src/gpu_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -2769,6 +2769,7 @@ pgstromScanChunkGpuCache(pgstromTaskState *pts,
else
{
pts->scan_done = true;
return NULL;
}
/* XXX - debug message */
if (repeat_id > 0 && repeat_id != pts->last_repeat_id)
Expand Down
8 changes: 4 additions & 4 deletions src/xpu_common.cu
Original file line number Diff line number Diff line change
Expand Up @@ -1961,8 +1961,8 @@ ExecGiSTIndexPostQuals(kern_context *kcxt,
{
const kvec_internal_t *kvecs;
HeapTupleHeaderData *htup;
xpu_bool_t status;
uint32_t slot_id;
int status;

/* fetch the inner heap tuple */
assert(kexp_gist->opcode == FuncOpCode__GiSTEval);
Expand All @@ -1984,13 +1984,13 @@ ExecGiSTIndexPostQuals(kern_context *kcxt,
}
/* run the join quals */
kcxt_reset(kcxt);
if (!EXEC_KERN_EXPRESSION(kcxt, kexp_join, &status))
if (!ExecGpuJoinQuals(kcxt, kexp_join, &status))
{
assert(kcxt->errcode != ERRCODE_STROM_SUCCESS);
return false;
}
//CHECK CPU FALLBACK
return (!XPU_DATUM_ISNULL(&status) && status.value);
//XXX - CHECK CPU FALLBACK?
return (status > 0);
}

/* ----------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions test/16/expected/arrow_index.out
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SELECT count(*)
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------------------------------------
Aggregate (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=2 loops=1)
GPU Projection: pgstrom.nrows()
GPU Scan Quals: ((date_num >= '04-14-2019'::date) AND (date_num <= '05-23-2023'::date)) [plan: 1000000 -> 5000, exec: 621378 -> 374353]
referenced: date_num
Expand Down Expand Up @@ -285,7 +285,7 @@ SELECT count(*)
QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------------------------------
Aggregate (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=2 loops=1)
GPU Projection: pgstrom.nrows()
GPU Scan Quals: ((decimal_num >= '-5000'::numeric) AND (decimal_num <= '5000'::numeric)) [plan: 1000000 -> 5000, exec: 932067 -> 500583]
referenced: decimal_num
Expand Down Expand Up @@ -339,7 +339,7 @@ SELECT count(*)
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Aggregate (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=2 loops=1)
GPU Projection: pgstrom.nrows()
GPU Scan Quals: ((time_num >= '09:00:00'::time without time zone) AND (time_num <= '17:00:00'::time without time zone)) [plan: 1000000 -> 5000, exec: 621378 -> 333443]
referenced: time_num
Expand Down Expand Up @@ -393,7 +393,7 @@ SELECT count(*)
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Aggregate (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=1 loops=1)
-> Custom Scan (GpuPreAgg) on regtest_arrow (actual rows=2 loops=1)
GPU Projection: pgstrom.nrows()
GPU Scan Quals: ((timestamp_num >= 'Sun Apr 14 09:00:00 2019'::timestamp without time zone) AND (timestamp_num <= 'Tue May 23 17:00:00 2023'::timestamp without time zone)) [plan: 1000000 -> 5000, exec: 621378 -> 410884]
referenced: timestamp_num
Expand Down
8 changes: 2 additions & 6 deletions test/16/expected/gpu_cache.out
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ CREATE TRIGGER row_sync_test_ng01 AFTER INSERT OR UPDATE OR DELETE
EXECUTE FUNCTION pgstrom.gpucache_sync_trigger('cpu_device_id=0');
ERROR: gpucache: unknown option [cpu_device_id]=[0]
-- validation error
-- 32GB limitation check was removed, so it should not be an error
CREATE TRIGGER row_sync_test_ng02 AFTER INSERT OR UPDATE OR DELETE
ON cache_test_table FOR ROW
EXECUTE FUNCTION pgstrom.gpucache_sync_trigger('max_num_rows=200000000');
DROP TRIGGER IF EXISTS row_sync_test_ng02 ON cache_test_table;
-- validation error
CREATE TRIGGER row_sync_test_ng03 AFTER INSERT OR UPDATE OR DELETE
ON cache_test_table FOR ROW
EXECUTE FUNCTION pgstrom.gpucache_sync_trigger('redo_buffer_size=4m');
Expand Down Expand Up @@ -709,6 +703,8 @@ SELECT * FROM cache_corruption_test WHERE b%3=0;
Output: id, a, b, c, d, e, f, g, h, i, j
GPU Projection: id, a, b, c, d, e, f, g, h, i, j
GPU Scan Quals: (((b)::integer % 3) = 0) [rows: 4000 -> 20]
GPU Cache: GPU0 [phase: corrupted, max_num_rows: 5000]
GPU Cache Options: gpu_device_id=0,max_num_rows=5000,redo_buffer_size=157286400,gpu_sync_interval=4000000,gpu_sync_threshold=10485760
KVars-Slot: <slot=0, type='int2', expr='b', kv_off=0x0000>, <slot=1, type='int4', expr='id', kv_off=0x0c00>, <slot=2, type='int1', expr='a', kv_off=0x2000>, <slot=3, type='int4', expr='c', kv_off=0x2800>, <slot=4, type='int8', expr='d', kv_off=0x3c00>, <slot=5, type='float2', expr='e', kv_off=0x6000>, <slot=6, type='float4', expr='f', kv_off=0x6c00>, <slot=7, type='float8', expr='g', kv_off=0x8000>, <slot=8, type='text', expr='h', kv_off=0xa400>, <slot=9, type='text', expr='i', kv_off=0xd800>, <slot=10, type='bpchar', expr='j', kv_off=0x10c00>
KVecs-Buffer: nbytes: 81920, ndims: 2, items=[kvec0=<0x0000-0bff, type='int2', expr='b'>, kvec1=<0x0c00-1fff, type='int4', expr='id'>, kvec2=<0x2000-27ff, type='int1', expr='a'>, kvec3=<0x2800-3bff, type='int4', expr='c'>, kvec4=<0x3c00-5fff, type='int8', expr='d'>, kvec5=<0x6000-6bff, type='float2', expr='e'>, kvec6=<0x6c00-7fff, type='float4', expr='f'>, kvec7=<0x8000-a3ff, type='float8', expr='g'>, kvec8=<0xa400-d7ff, type='text', expr='h'>, kvec9=<0xd800-10bff, type='text', expr='i'>, kvec10=<0x10c00-13fff, type='bpchar', expr='j'>]
LoadVars OpCode: {Packed items[0]={LoadVars(depth=0): kvars=[<slot=1, type='int4' resno=1(id)>, <slot=2, type='int1' resno=2(a)>, <slot=0, type='int2' resno=3(b)>, <slot=3, type='int4' resno=4(c)>, <slot=4, type='int8' resno=5(d)>, <slot=5, type='float2' resno=6(e)>, <slot=6, type='float4' resno=7(f)>, <slot=7, type='float8' resno=8(g)>, <slot=8, type='text' resno=9(h)>, <slot=9, type='text' resno=10(i)>, <slot=10, type='bpchar' resno=11(j)>]}}
Expand Down
2 changes: 1 addition & 1 deletion test/16/expected/pgstrom_guc.out
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ SHOW pg_strom.gpu_operator_cost;
0.00015625

SHOW pg_strom.max_async_tasks;
12
16

SHOW pg_strom.gpu_direct_seq_page_cost;
0.25
Expand Down
1 change: 1 addition & 0 deletions test/16/expected/pgstrom_init.out
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ SELECT current_database();
\getenv regress_dataset_revision REGRESS_DATASET_REVISION
SELECT pgstrom.regression_testdb_revision() = cast(:regress_dataset_revision as text) revision_check_result
\gset
SET client_min_messages TO WARNING;
\if :revision_check_result
---
--- OK, regression test database is the latest revision
Expand Down

0 comments on commit 2b77d56

Please sign in to comment.