summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorTom Lane2014-05-09 00:49:38 +0000
committerTom Lane2014-05-09 00:49:38 +0000
commita16d421ca4fc639929bc964b2585e8382cf16e33 (patch)
treec67fe19b554dc2da53cbacc0349ce58ac2bf8514 /src/include
parent08c8e8962f56c23c6799178d52d3b31350a0708f (diff)
Revert "Auto-tune effective_cache size to be 4x shared buffers"
This reverts commit ee1e5662d8d8330726eaef7d3110cb7add24d058, as well as a remarkably large number of followup commits, which were mostly concerned with the fact that the implementation didn't work terribly well. It still doesn't: we probably need some rather basic work in the GUC infrastructure if we want to fully support GUCs whose default varies depending on the value of another GUC. Meanwhile, it also emerged that there wasn't really consensus in favor of the definition the patch tried to implement (ie, effective_cache_size should default to 4 times shared_buffers). So whack it all back to where it was. In a followup commit, I'll do what was recently agreed to, which is to simply change the default to a higher value.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/optimizer/cost.h2
-rw-r--r--src/include/utils/guc.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index ec1605d1c9d..3c3c63ae100 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -27,6 +27,8 @@
#define DEFAULT_CPU_INDEX_TUPLE_COST 0.005
#define DEFAULT_CPU_OPERATOR_COST 0.0025
+#define DEFAULT_EFFECTIVE_CACHE_SIZE 16384 /* measured in pages */
+
typedef enum
{
CONSTRAINT_EXCLUSION_OFF, /* do not use c_e */
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 686a6a1d443..c15a5bbb7b3 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -389,8 +389,4 @@ extern void assign_search_path(const char *newval, void *extra);
extern bool check_wal_buffers(int *newval, void **extra, GucSource source);
extern void assign_xlog_sync_method(int new_sync_method, void *extra);
-/* in optimizer/path/costsize.c */
-extern bool check_effective_cache_size(int *newval, void **extra, GucSource source);
-extern void set_default_effective_cache_size(void);
-
#endif /* GUC_H */