[lmdb-clib] Pull out LMDB code into a separate package

Author: simonmar

cabal.project

@@ -12,6 +12,7 @@ packages:
     glean.cabal
     glean/lang/clang/glean-clang.cabal
     glean/lsp
+    glean/lmdb-clib
 
 optional-packages:
     hsthrift/folly-clib/folly-clib.cabal
@@ -52,6 +53,9 @@ package thrift-http
 package glean
     flags: -opt
 
+package lmdb-clib
+    flags: -opt
+
 package fb-util
     flags: +folly
 

glean.cabal.in

@@ -437,6 +437,7 @@ library lmdb
     build-depends:
         glean:storage,
         glean:rts,
+        lmdb-clib,
 
 library util
     import: fb-haskell, fb-cpp, deps, thrift-client

glean/lmdb-clib/LICENSE

@@ -0,0 +1,47 @@
+The OpenLDAP Public License
+  Version 2.8, 17 August 2003
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions in source form must retain copyright statements
+   and notices,
+
+2. Redistributions in binary form must reproduce applicable copyright
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and
+
+3. Redistributions must contain a verbatim copy of this document.
+
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with copyright
+holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
+California, USA.  All Rights Reserved.  Permission to copy and
+distribute verbatim copies of this document is granted.

glean/lmdb-clib/lmdb-clib.cabal

@@ -0,0 +1,56 @@
+cabal-version:      3.4
+name:               lmdb-clib
+version:            0.1.0.0
+synopsis:           Lightning Memory-Mapped Database
+author:             Howard Chu, Symas Corporation.
+maintainer:         Simon Marlow <marlowsd@gmail.com>
+copyright:          Copyright 2011-2021 Howard Chu, Symas Corp.
+homepage:           https://www.symas.com/mdb
+license:            BSD-3-Clause
+license-files:      LICENSE
+build-type:         Simple
+
+Description:
+  Cabal wrapper around the LMDB C library, with one tweak to increase
+  the default max key size from 511 bytes to ~2kB.
+
+source-repository head
+  type: git
+  location: https://git.openldap.org/openldap/openldap/tree/mdb.master
+
+-- Note: if you import a new version, copy the local change to
+-- #define PAGEBASE that is needed to increase the max key size.
+
+common fb-cpp
+  cxx-options: -std=c++20 -Wno-nullability-completeness -fno-omit-frame-pointer
+  if !flag(clang)
+     cxx-options: -fcoroutines
+  if arch(x86_64)
+     cxx-options: -march=haswell
+  if flag(opt) && !flag(asan)
+     cxx-options: -O3 -DNDEBUG
+  else
+     cc-options: -g
+     cxx-options: -g
+
+flag clang
+     default: False
+
+flag asan
+     default: False
+
+flag opt
+     default: True
+
+library
+    import: fb-cpp
+    default-language: Haskell2010
+    c-sources:
+        mdb.c
+        midl.c
+    cc-options: -DMDB_MAXKEYSIZE=0
+    include-dirs: .
+    install-includes:
+        lmdb.h
+        midl.h
+

glean/lmdb/lmdb.h glean/lmdb-clib/lmdb.hglean/lmdb/lmdb.h renamed to glean/lmdb-clib/lmdb.h

@@ -69,11 +69,7 @@ CXX_SOURCES_glean_cpp_lmdb = \
     glean/lmdb/ffi.cpp \
     glean/lmdb/glean_lmdb.cpp
 
-C_SOURCES_glean_cpp_lmdb = \
-    glean/lmdb/mdb.c \
-    glean/lmdb/midl.c
-
-CXX_FLAGS_glean_cpp_lmdb = -DOSS=1 -DMDB_MAXKEYSIZE=0
+CXX_FLAGS_glean_cpp_lmdb = -DOSS=1
 
 CXX_SOURCES_glean_cpp_client = \
     glean/cpp/filewriter.cpp \