Revert incompatible with 9.6 change introduced in afb30c1

kulaginm · kulaginm · commit 12fa76a21b89 · 2020-11-17T13:36:45.000+03:00
diff --git a/cardinality_estimation.c b/cardinality_estimation.c
@@ -16,7 +16,6 @@
  */
 
 #include "aqo.h"
-#include "optimizer/optimizer.h"
 
 /*
  * General method for prediction the cardinality of given relation.
diff --git a/path_utils.c b/path_utils.c
@@ -13,7 +13,6 @@
  */
 
 #include "aqo.h"
-#include "optimizer/optimizer.h"
 
 /*
  * Returns list of marginal selectivities using as an arguments for each clause
diff --git a/postprocessing.c b/postprocessing.c
@@ -18,8 +18,6 @@
 
 #include "aqo.h"
 #include "access/parallel.h"
-#include "optimizer/optimizer.h"
-#include "utils/queryenvironment.h"
 
 static double cardinality_sum_errors;
 static int	cardinality_num_objects;
diff --git a/preprocessing.c b/preprocessing.c
@@ -58,7 +58,6 @@
 
 #include "aqo.h"
 #include "access/parallel.h"
-#include "access/table.h"
 #include "commands/extension.h"
 
 #define CREATE_EXTENSION_STARTSTRING_0 \
diff --git a/storage.c b/storage.c
@@ -18,8 +18,6 @@
 #include "aqo.h"
 
 #include "access/heapam.h"
-#include "access/table.h"
-#include "access/tableam.h"
 
 HTAB *deactivated_queries = NULL;
 
