external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

11 and 12 both pass

merge-cstore-pykello
Jeff Davis 2020-09-16 09:36:18 -07:00
parent 248a2db970
commit 3b3d1b1f89
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -7,7 +7,7 @@ MODULE_big = cstore_fdw
PG_CPPFLAGS = -std=c11 PG_CPPFLAGS = -std=c11
OBJS = cstore.o cstore_fdw.o cstore_writer.o cstore_reader.o \ OBJS = cstore.o cstore_fdw.o cstore_writer.o cstore_reader.o \
cstore_compression.o mod.o cstore_metadata_tables.o cstore_tableam.o cstore_compression.o mod.o cstore_metadata_tables.o
EXTENSION = cstore_fdw EXTENSION = cstore_fdw
DATA = cstore_fdw--1.7.sql cstore_fdw--1.6--1.7.sql cstore_fdw--1.5--1.6.sql cstore_fdw--1.4--1.5.sql \ DATA = cstore_fdw--1.7.sql cstore_fdw--1.6--1.7.sql cstore_fdw--1.5--1.6.sql cstore_fdw--1.4--1.5.sql \
@ -17,15 +17,22 @@ DATA = cstore_fdw--1.7.sql cstore_fdw--1.6--1.7.sql cstore_fdw--1.5--1.6.sql cs
# #
# disabled tests: am_block_filtering am_analyze am_alter # disabled tests: am_block_filtering am_analyze am_alter
# #
REGRESS = extension_create am_create am_load am_query am_data_types am_functions \ REGRESS = extension_create
am_drop am_insert am_copyto am_truncate clean \
fdw_create fdw_load fdw_query fdw_analyze fdw_data_types fdw_functions \
fdw_block_filtering fdw_drop fdw_insert fdw_copyto fdw_alter fdw_truncate
EXTRA_CLEAN = cstore.pb-c.h cstore.pb-c.c data/*.cstore data/*.cstore.footer \ EXTRA_CLEAN = cstore.pb-c.h cstore.pb-c.c data/*.cstore data/*.cstore.footer \
sql/block_filtering.sql sql/create.sql sql/data_types.sql sql/load.sql \ sql/block_filtering.sql sql/create.sql sql/data_types.sql sql/load.sql \
sql/copyto.sql expected/block_filtering.out expected/create.out \ sql/copyto.sql expected/block_filtering.out expected/create.out \
expected/data_types.out expected/load.out expected/copyto.out expected/data_types.out expected/load.out expected/copyto.out
VER := $(shell pg_config --version)
ifeq ($(findstring 12,$(VER)),12)
REGRESS += am_create am_load am_query am_data_types am_functions \
am_drop am_insert am_copyto am_truncate clean
OBJS += cstore_tableam.o
endif
REGRESS += fdw_create fdw_load fdw_query fdw_analyze fdw_data_types fdw_functions \
fdw_block_filtering fdw_drop fdw_insert fdw_copyto fdw_alter fdw_truncate
ifeq ($(enable_coverage),yes) ifeq ($(enable_coverage),yes)
PG_CPPFLAGS += --coverage PG_CPPFLAGS += --coverage
SHLIB_LINK += --coverage SHLIB_LINK += --coverage

20
cstore_fdw--1.7--1.8.sql
View File

@ -1,9 +1,17 @@
/* cstore_fdw/cstore_fdw--1.7--1.8.sql */ /* cstore_fdw/cstore_fdw--1.7--1.8.sql */
CREATE FUNCTION cstore_tableam_handler(internal) DO $proc$
RETURNS table_am_handler BEGIN
LANGUAGE C
AS 'MODULE_PATHNAME', 'cstore_tableam_handler';
CREATE ACCESS METHOD cstore_tableam IF version() ~ '12' THEN
TYPE TABLE HANDLER cstore_tableam_handler; EXECUTE $$
CREATE FUNCTION cstore_tableam_handler(internal)
RETURNS table_am_handler
LANGUAGE C
AS 'MODULE_PATHNAME', 'cstore_tableam_handler';
CREATE ACCESS METHOD cstore_tableam
TYPE TABLE HANDLER cstore_tableam_handler;
$$;
END IF;
END$proc$;