diff options
| author | jiangph <jiangph@cn.ibm.com> | 2020-03-24 10:32:06 +0800 |
|---|---|---|
| committer | jiangph <jiangph@cn.ibm.com> | 2020-03-24 10:32:06 +0800 |
| commit | c92e4ade6def3d9020807881d2cc026c844c5b30 (patch) | |
| tree | 70839aa5c24c0621d97f0334b08f25f3135e42da | |
| parent | 23487807dea165e878e78c0435acd946ce6293a7 (diff) | |
| download | couchdb-set-DbPrefix-with-hca.tar.gz | |
fixup: simplify creation of AllocPrefixset-DbPrefix-with-hca
| -rw-r--r-- | src/fabric/include/fabric2.hrl | 3 | ||||
| -rw-r--r-- | src/fabric/src/fabric2_fdb.erl | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/fabric/include/fabric2.hrl b/src/fabric/include/fabric2.hrl index 2d7711fdb..0c0757567 100644 --- a/src/fabric/include/fabric2.hrl +++ b/src/fabric/include/fabric2.hrl @@ -17,12 +17,11 @@ % Prefix Definitions --define(DEFAULT_DB_PREFIX, <<16#FD>>). - % Layer Level: (LayerPrefix, X, ...) -define(CLUSTER_CONFIG, 0). -define(ALL_DBS, 1). +-define(DB_HCA, 2). -define(DBS, 15). -define(TX_IDS, 255). diff --git a/src/fabric/src/fabric2_fdb.erl b/src/fabric/src/fabric2_fdb.erl index 632694927..14a649d50 100644 --- a/src/fabric/src/fabric2_fdb.erl +++ b/src/fabric/src/fabric2_fdb.erl @@ -178,11 +178,8 @@ create(#{} = Db0, Options) -> } = Db = ensure_current(Db0, false), DbKey = erlfdb_tuple:pack({?ALL_DBS, DbName}, LayerPrefix), - DefDbPref = ?DEFAULT_DB_PREFIX, - AllDbPrefix = erlfdb_util:get(Options, db_prefix, DefDbPref), - DbId = erlfdb_tuple:pack({AllDbPrefix}, AllDbPrefix), - DbPrefixAllocator = erlfdb_hca:create(erlfdb_tuple:pack({DbId}, <<"hca">>)), - AllocPrefix = erlfdb_hca:allocate(DbPrefixAllocator, Tx), + HCA = erlfdb_hca:create(erlfdb_tuple:pack({?DB_HCA}, LayerPrefix)), + AllocPrefix = erlfdb_hca:allocate(HCA, Tx), DbPrefix = erlfdb_tuple:pack({?DBS, AllocPrefix}, LayerPrefix), erlfdb:set(Tx, DbKey, DbPrefix), |