You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2019/04/18 06:12:49 UTC
[hawq] branch master updated: HAWQ-1703. delete legacy orc in hawq
This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/master by this push:
new ad23e03 HAWQ-1703. delete legacy orc in hawq
ad23e03 is described below
commit ad23e03299e560c3473a416b799c5057f8a52ff4
Author: oushu1tuyu1 <tu...@oushu.io>
AuthorDate: Thu Apr 18 11:15:47 2019 +0800
HAWQ-1703. delete legacy orc in hawq
---
contrib/orc/Makefile | 39 -----
contrib/orc/README | 5 -
contrib/orc/cwrapper/Makefile | 25 ---
contrib/orc/cwrapper/cwrapper.cpp | 30 ----
contrib/orc/cwrapper/cwrapper.h | 35 -----
contrib/orc/cwrapper/format/Makefile | 24 ---
contrib/orc/cwrapper/format/orc_format.cpp | 22 ---
contrib/orc/cwrapper/format/orc_format.h | 19 ---
contrib/orc/orc.c | 237 -----------------------------
contrib/orc/orc_init.sql | 60 --------
contrib/orc/orc_install.sql | 70 ---------
contrib/orc/orc_uninstall.sql | 36 -----
12 files changed, 602 deletions(-)
diff --git a/contrib/orc/Makefile b/contrib/orc/Makefile
deleted file mode 100644
index 9938d74..0000000
--- a/contrib/orc/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-MODULE_big = orc
-OBJS = cwrapper/cwrapper.o orc.o
-
-PG_CPPFLAGS = -I$(libpq_srcdir)
-PG_LIBS = $(libpq_pgport)
-
-ifdef USE_PGXS
-PGXS := $(shell pg_config --pgxs)
-include $(PGXS)
-else
-subdir = contrib/orc
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
-
-clean distclean:
- $(MAKE) -C cwrapper $@ || true;
- rm -f orc.o orc.so
-
-cwrapper/cwrapper.o:
- $(MAKE) -C cwrapper cwrapper.o
diff --git a/contrib/orc/README b/contrib/orc/README
deleted file mode 100644
index 0d669d3..0000000
--- a/contrib/orc/README
+++ /dev/null
@@ -1,5 +0,0 @@
-1. Compile ORC format in pluggable storage framework
- $ ./configure --with-orc; make -j8; make install
-
-2. Configure and initialize cluster
- $ hawq init cluster -a
diff --git a/contrib/orc/cwrapper/Makefile b/contrib/orc/cwrapper/Makefile
deleted file mode 100644
index f8b3c53..0000000
--- a/contrib/orc/cwrapper/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-cwrapper.o: cwrapper.cpp cwrapper.h
- $(MAKE) -C format liborc_format.so
- g++ --shared -o cwrapper.o cwrapper.cpp -Lformat -lorc_format
-
-clean distclean:
- $(MAKE) -C format $@ || true;
- rm -f ./cwrapper.o
diff --git a/contrib/orc/cwrapper/cwrapper.cpp b/contrib/orc/cwrapper/cwrapper.cpp
deleted file mode 100644
index f7a6376..0000000
--- a/contrib/orc/cwrapper/cwrapper.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <uuid/uuid.h>
-#include "format/orc_format.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
- void wrap_func_test(){
- func_test();
- }
-#ifdef __cplusplus
-}
-#endif
diff --git a/contrib/orc/cwrapper/cwrapper.h b/contrib/orc/cwrapper/cwrapper.h
deleted file mode 100644
index 4151265..0000000
--- a/contrib/orc/cwrapper/cwrapper.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#ifndef STORAGE_SRC_STORAGE_CWRAPPER_ORC_FORMAT_C_H_
-#define STORAGE_SRC_STORAGE_CWRAPPER_ORC_FORMAT_C_H_
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef ERROR_MESSAGE_BUFFER_SIZE
-#define ERROR_MESSAGE_BUFFER_SIZE 4096
-#endif
- void wrap_func_test();
-#ifdef __cplusplus
-}
-#endif
-
-#endif // STORAGE_SRC_STORAGE_CWRAPPER_ORC_FORMAT_C_H_
\ No newline at end of file
diff --git a/contrib/orc/cwrapper/format/Makefile b/contrib/orc/cwrapper/format/Makefile
deleted file mode 100644
index d5a4cbe..0000000
--- a/contrib/orc/cwrapper/format/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-All: orc_format.so
-liborc_format.so: orc_format.cpp
- g++ --shared -o liborc_format.so orc_format.cpp
-
-clean:
- rm -f ./liborc_format.so
diff --git a/contrib/orc/cwrapper/format/orc_format.cpp b/contrib/orc/cwrapper/format/orc_format.cpp
deleted file mode 100644
index d1bdbb8..0000000
--- a/contrib/orc/cwrapper/format/orc_format.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#include "../cwrapper.h"
-void func_test(){
-
-}
diff --git a/contrib/orc/cwrapper/format/orc_format.h b/contrib/orc/cwrapper/format/orc_format.h
deleted file mode 100644
index c05746d..0000000
--- a/contrib/orc/cwrapper/format/orc_format.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-void func_test();
\ No newline at end of file
diff --git a/contrib/orc/orc.c b/contrib/orc/orc.c
deleted file mode 100644
index 729c729..0000000
--- a/contrib/orc/orc.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#include <json-c/json.h>
-
-#include "c.h"
-#include "port.h"
-#include "postgres.h"
-#include "fmgr.h"
-#include "funcapi.h"
-#include "nodes/pg_list.h"
-#include "utils/memutils.h"
-#include "utils/relcache.h"
-#include "utils/uri.h"
-#include "utils/formatting.h"
-#include "utils/lsyscache.h"
-#include "utils/datetime.h"
-#include "mb/pg_wchar.h"
-#include "commands/defrem.h"
-#include "commands/copy.h"
-#include "access/tupdesc.h"
-#include "access/filesplit.h"
-#include "access/plugstorage.h"
-#include "cdb/cdbvars.h"
-#include "catalog/pg_exttable.h"
-#include "catalog/namespace.h"
-#include "postmaster/identity.h"
-#include "nodes/makefuncs.h"
-#include "nodes/plannodes.h"
-#include "utils/uri.h"
-
-
-#define ORC_TIMESTAMP_EPOCH_JDATE 2457024 /* == date2j(2015, 1, 1) */
-#define MAX_ORC_ARRAY_DIMS 10000
-
-/* Do the module magic dance */
-PG_MODULE_MAGIC;
-
-/* Validators for pluggable storage format ORC */
-PG_FUNCTION_INFO_V1(orc_validate_interfaces);
-PG_FUNCTION_INFO_V1(orc_validate_options);
-PG_FUNCTION_INFO_V1(orc_validate_encodings);
-PG_FUNCTION_INFO_V1(orc_validate_datatypes);
-
-/* Accessors for pluggable storage format ORC */
-PG_FUNCTION_INFO_V1(orc_beginscan);
-PG_FUNCTION_INFO_V1(orc_getnext_init);
-PG_FUNCTION_INFO_V1(orc_getnext);
-PG_FUNCTION_INFO_V1(orc_rescan);
-PG_FUNCTION_INFO_V1(orc_endscan);
-PG_FUNCTION_INFO_V1(orc_stopscan);
-PG_FUNCTION_INFO_V1(orc_insert_init);
-PG_FUNCTION_INFO_V1(orc_insert);
-PG_FUNCTION_INFO_V1(orc_insert_finish);
-
-/* Definitions of validators for pluggable storage format ORC */
-Datum orc_validate_interfaces(PG_FUNCTION_ARGS);
-Datum orc_validate_options(PG_FUNCTION_ARGS);
-Datum orc_validate_encodings(PG_FUNCTION_ARGS);
-Datum orc_validate_datatypes(PG_FUNCTION_ARGS);
-
-/* Definitions of accessors for pluggable storage format ORC */
-Datum orc_beginscan(PG_FUNCTION_ARGS);
-Datum orc_getnext_init(PG_FUNCTION_ARGS);
-Datum orc_getnext(PG_FUNCTION_ARGS);
-Datum orc_rescan(PG_FUNCTION_ARGS);
-Datum orc_endscan(PG_FUNCTION_ARGS);
-Datum orc_stopscan(PG_FUNCTION_ARGS);
-Datum orc_insert_init(PG_FUNCTION_ARGS);
-Datum orc_insert(PG_FUNCTION_ARGS);
-Datum orc_insert_finish(PG_FUNCTION_ARGS);
-
-
-Datum orc_validate_interfaces(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_validate_interfaces has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_validate_options(List *formatOptions,
- * char *formatStr,
- * bool isWritable)
- */
-Datum orc_validate_options(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_validate_options has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_validate_encodings(char *encodingName)
- */
-Datum orc_validate_encodings(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_validate_encodings has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_validate_datatypes(TupleDesc tupDesc)
- */
-Datum orc_validate_datatypes(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_validate_datatypes has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * FileScanDesc
- * orc_beginscan(ExternalScan *extScan,
- * ScanState *scanState,
- * Relation relation,
- * int formatterType,
- * char *formatterName)
- */
-Datum orc_beginscan(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_beginscan has not be completed, please fill it");
- PG_RETURN_POINTER(NULL);
-}
-
-/*
- * ExternalSelectDesc
- * orc_getnext_init(PlanState *planState,
- * ExternalScanState *extScanState)
- */
-Datum orc_getnext_init(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_getnext_init has not be completed, please fill it");
- PG_RETURN_POINTER(NULL);
-}
-
-/*
- * bool
- * orc_getnext(FileScanDesc fileScanDesc,
- * ScanDirection direction,
- * ExternalSelectDesc extSelectDesc,
- * ScanState *scanState,
- * TupleTableSlot *tupTableSlot)
- */
-Datum orc_getnext(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_getnext has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_rescan(FileScanDesc scan)
- */
-Datum orc_rescan(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_rescan has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_endscan(FileScanDesc scan)
- */
-Datum orc_endscan(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_endscan has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * void
- * orc_stopscan(FileScanDesc scan)
- */
-Datum orc_stopscan(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_stopscan has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
-/*
- * ExternalInsertDesc
- * orc_insert_init(Relation relation,
- * int formatterType,
- * char *formatterName)
- */
-Datum orc_insert_init(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_insert_init has not be completed, please fill it");
- PG_RETURN_POINTER(NULL);
-}
-
-/*
- * Oid
- * orc_insert(ExternalInsertDesc extInsertDesc,
- * TupleTableSlot *tupTableSlot)
- */
-Datum orc_insert(PG_FUNCTION_ARGS)
-{
-
- elog(ERROR, "Funtion orc_insert has not be completed, please fill it");
- PG_RETURN_OID(InvalidOid);
-}
-
-/*
- * void
- * orc_insert_finish(ExternalInsertDesc extInsertDesc)
- */
-Datum orc_insert_finish(PG_FUNCTION_ARGS)
-{
- elog(ERROR, "Funtion orc_insert_finish has not be completed, please fill it");
- PG_RETURN_VOID();
-}
-
diff --git a/contrib/orc/orc_init.sql b/contrib/orc/orc_init.sql
deleted file mode 100644
index fa720b7..0000000
--- a/contrib/orc/orc_init.sql
+++ /dev/null
@@ -1,60 +0,0 @@
--- --------------------------------------------------------------------
---
--- orc_init.sql
---
--- Support ORC format in pluggable storage framework at initialization
---
--- --------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_interfaces() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_interfaces'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_options() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_options'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_encodings() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_encodings'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_datatypes() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_datatypes'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_beginscan() RETURNS bytea
-AS '$libdir/orc.so', 'orc_beginscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_getnext_init() RETURNS bytea
-AS '$libdir/orc.so', 'orc_getnext_init'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_getnext() RETURNS bytea
-AS '$libdir/orc.so', 'orc_getnext'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_rescan() RETURNS void
-AS '$libdir/orc.so', 'orc_rescan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_endscan() RETURNS void
-AS '$libdir/orc.so', 'orc_endscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_stopscan() RETURNS void
-AS '$libdir/orc.so', 'orc_stopscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert_init() RETURNS bytea
-AS '$libdir/orc.so', 'orc_insert_init'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert() RETURNS bytea
-AS '$libdir/orc.so', 'orc_insert'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert_finish() RETURNS void
-AS '$libdir/orc.so', 'orc_insert_finish'
-LANGUAGE C STABLE;
-
diff --git a/contrib/orc/orc_install.sql b/contrib/orc/orc_install.sql
deleted file mode 100644
index 424019e..0000000
--- a/contrib/orc/orc_install.sql
+++ /dev/null
@@ -1,70 +0,0 @@
--- --------------------------------------------------------------------
---
--- orc_install.sql
---
--- Support ORC format in pluggable storage framework
---
--- --------------------------------------------------------------------
-
-SET allow_system_table_mods=ddl;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_interfaces() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_interfaces'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_options() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_options'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_encodings() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_encodings'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_validate_datatypes() RETURNS void
-AS '$libdir/orc.so', 'orc_validate_datatypes'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_beginscan() RETURNS bytea
-AS '$libdir/orc.so', 'orc_beginscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_getnext_init() RETURNS bytea
-AS '$libdir/orc.so', 'orc_getnext_init'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_getnext() RETURNS bytea
-AS '$libdir/orc.so', 'orc_getnext'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_rescan() RETURNS void
-AS '$libdir/orc.so', 'orc_rescan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_endscan() RETURNS void
-AS '$libdir/orc.so', 'orc_endscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_stopscan() RETURNS void
-AS '$libdir/orc.so', 'orc_stopscan'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert_init() RETURNS bytea
-AS '$libdir/orc.so', 'orc_insert_init'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert() RETURNS bytea
-AS '$libdir/orc.so', 'orc_insert'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION pg_catalog.orc_insert_finish() RETURNS void
-AS '$libdir/orc.so', 'orc_insert_finish'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION hdfs_validate() RETURNS void
-AS '$libdir/exthdfs.so', 'hdfsprotocol_validate'
-LANGUAGE C STABLE;
-
-CREATE OR REPLACE FUNCTION hdfs_blocklocation() RETURNS void
-AS '$libdir/exthdfs.so', 'hdfsprotocol_blocklocation'
-LANGUAGE C STABLE;
-
diff --git a/contrib/orc/orc_uninstall.sql b/contrib/orc/orc_uninstall.sql
deleted file mode 100644
index 1ad03b4..0000000
--- a/contrib/orc/orc_uninstall.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- --------------------------------------------------------------------
---
--- orc_uninstall.sql
---
--- Remove ORC format in pluggable storage framework
---
--- --------------------------------------------------------------------
-
-SET allow_system_table_mods=ddl;
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_validate_interfaces();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_validate_options();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_validate_encodings();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_validate_datatypes();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_beginscan();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_getnext_init();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_getnext();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_rescan();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_endscan();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_stopscan();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_insert_init();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_insert();
-
-DROP FUNCTION IF EXISTS pg_catalog.orc_insert_finish();
-