Move explain utility functions to src/import

This moves EXPLAIN utility functions into apache to make it available to all custom nodes. Since these are copies of static postgres functions there is no reason for them to be TSL licensed.
timescale · Oct 8, 2023 · 8476adc · 8476adc
1 parent 7dc14ac
commit 8476adc
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/import/CMakeLists.txt b/src/import/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/planner.c
     ${CMAKE_CURRENT_SOURCE_DIR}/allpaths.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/ht_hypertable_modify.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/ht_hypertable_modify.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/planner.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/ts_explain.c)
 
 target_sources(${PROJECT_NAME} PRIVATE ${SOURCES})
diff --git a/tsl/src/import/ts_explain.c → src/import/ts_explain.c b/tsl/src/import/ts_explain.c → src/import/ts_explain.c
@@ -1,7 +1,7 @@
 /*
- * This file and its contents are licensed under the Timescale License.
+ * This file and its contents are licensed under the Apache License 2.0.
  * Please see the included NOTICE for copyright information and
- * LICENSE-TIMESCALE for a copy of the license.
+ * LICENSE-APACHE for a copy of the license.
  */
 
 /*

diff --git a/tsl/src/import/ts_explain.h → src/import/ts_explain.h b/tsl/src/import/ts_explain.h → src/import/ts_explain.h
@@ -1,7 +1,7 @@
 /*
- * This file and its contents are licensed under the Timescale License.
+ * This file and its contents are licensed under the Apache License 2.0.
  * Please see the included NOTICE for copyright information and
- * LICENSE-TIMESCALE for a copy of the license.
+ * LICENSE-APACHE for a copy of the license.
  */
 
 /*
@@ -19,8 +19,10 @@
 #include <nodes/execnodes.h>
 #include <nodes/pg_list.h>
 
-void ts_show_scan_qual(List *qual, const char *qlabel, PlanState *planstate, List *ancestors,
-					   ExplainState *es);
+#include "export.h"
 
-void ts_show_instrumentation_count(const char *qlabel, int which, PlanState *planstate,
-								   ExplainState *es);
+extern TSDLLEXPORT void ts_show_scan_qual(List *qual, const char *qlabel, PlanState *planstate,
+										  List *ancestors, ExplainState *es);
+
+extern TSDLLEXPORT void ts_show_instrumentation_count(const char *qlabel, int which,
+													  PlanState *planstate, ExplainState *es);
diff --git a/tsl/src/CMakeLists.txt b/tsl/src/CMakeLists.txt
@@ -61,6 +61,5 @@ add_subdirectory(bgw_policy)
 add_subdirectory(compression)
 add_subdirectory(continuous_aggs)
 add_subdirectory(fdw)
-add_subdirectory(import)
 add_subdirectory(nodes)
 add_subdirectory(remote)
diff --git a/tsl/src/import/CMakeLists.txt b/tsl/src/import/CMakeLists.txt