Remove mergeHyperLogLog.

It's buggy.  If somebody needs this later, they'll need to put back
a non-buggy vesion of it.

Discussion: CAM3SWZT-i6R9JU5YXa8MJUou2_r3LfGJZpQ9tYa1BYxfkj0=cQ@mail.gmail.com
Discussion: CAM3SWZRUOLsYoTT83QgdUy9D8ehYWm_nvbrrfcOOzikiRfFY7g@mail.gmail.com

Peter Geoghegan

diff --git a/src/backend/lib/hyperloglog.c b/src/backend/lib/hyperloglog.c
index fa7f05a2411fd502a3576905ad580ab5cd1b1d87..6d246ce77bc545cf8d5941ca7667d0f1dd6b7ace 100644 (file)
--- a/src/backend/lib/hyperloglog.c
+++ b/src/backend/lib/hyperloglog.c
@@ -220,28 +220,6 @@ estimateHyperLogLog(hyperLogLogState *cState)
    return result;
 }
 
-/*
- * Merges the estimate from one HyperLogLog state to another, returning the
- * estimate of their union.
- *
- * The number of registers in each must match.
- */
-void
-mergeHyperLogLog(hyperLogLogState *cState, const hyperLogLogState *oState)
-{
-   int         r;
-
-   if (cState->nRegisters != oState->nRegisters)
-       elog(ERROR, "number of registers mismatch: %zu != %zu",
-            cState->nRegisters, oState->nRegisters);
-
-   for (r = 0; r < cState->nRegisters; ++r)
-   {
-       cState->hashesArr[r] = Max(cState->hashesArr[r], oState->hashesArr[r]);
-   }
-}
-
-
 /*
  * Worker for addHyperLogLog().
  *

diff --git a/src/include/lib/hyperloglog.h b/src/include/lib/hyperloglog.h
index b999b3056a679777681c13a3754d6bfe2e010645..ee88f8f781a24503f3f4b8d0ecfe0a0515b26b90 100644 (file)
--- a/src/include/lib/hyperloglog.h
+++ b/src/include/lib/hyperloglog.h
@@ -63,7 +63,6 @@ extern void initHyperLogLog(hyperLogLogState *cState, uint8 bwidth);
 extern void initHyperLogLogError(hyperLogLogState *cState, double error);
 extern void addHyperLogLog(hyperLogLogState *cState, uint32 hash);
 extern double estimateHyperLogLog(hyperLogLogState *cState);
-extern void mergeHyperLogLog(hyperLogLogState *cState, const hyperLogLogState *oState);
 extern void freeHyperLogLog(hyperLogLogState *cState);
 
 #endif   /* HYPERLOGLOG_H */