[incubator-datasketches-postgresql] 04/04: small fix

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alsay pushed a commit to branch theta
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-postgresql.git

commit d8e4a320e7a95a3493943d7d0aaf96a49b514759
Author: AlexanderSaydakov <Al...@users.noreply.github.com>
AuthorDate: Wed Jun 5 18:44:09 2019 -0700

    small fix
---
 src/allocator.h                 | 2 +-
 src/theta_sketch_pg_functions.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/allocator.h b/src/allocator.h
index 9711bda..2a1f1ef 100644
--- a/src/allocator.h
+++ b/src/allocator.h
@@ -40,7 +40,7 @@ public:
     return static_cast<pointer>(p);
   }
 
-  void deallocate(pointer p, size_type) { pfree(p); }
+  void deallocate(pointer p, size_type) { if (p) pfree(p); }
 
   size_type max_size() const {
     return static_cast<size_type>(-1) / sizeof(T);
diff --git a/src/theta_sketch_pg_functions.c b/src/theta_sketch_pg_functions.c
index 2c19264..52747ab 100644
--- a/src/theta_sketch_pg_functions.c
+++ b/src/theta_sketch_pg_functions.c
@@ -15,7 +15,7 @@
 PG_FUNCTION_INFO_V1(pg_theta_sketch_add_item);
 PG_FUNCTION_INFO_V1(pg_theta_sketch_get_estimate);
 PG_FUNCTION_INFO_V1(pg_theta_sketch_to_string);
-PG_FUNCTION_INFO_V1(pg_theta_sketch_merge);
+PG_FUNCTION_INFO_V1(pg_theta_sketch_union);
 PG_FUNCTION_INFO_V1(pg_theta_sketch_from_internal);
 PG_FUNCTION_INFO_V1(pg_theta_sketch_get_estimate_from_internal);
 PG_FUNCTION_INFO_V1(pg_theta_union_get_result);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org