MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-03-16 22:41:46 +01:00
Code Issues Releases Wiki Activity

deps: RocksDB to v5.15.10.

Browse source
This commit is contained in:
Jason Volk 2018-10-15 22:11:14 -07:00
parent ec9157367f
commit a24270d2bb
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1171,7 +1171,7 @@ AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources
AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"])
fi
bash tools/buildrocks.sh $rocksdb_linkage "v5.14.3"
bash tools/buildrocks.sh $rocksdb_linkage "v5.15.10"
AS_IF([ test $? != 0 ],
[
AC_MSG_ERROR([Failed to build RocksDB])

2
deps/rocksdb vendored

@ -1 +1 @@
Subproject commit 626550343f861ab19d4fdcb74fde728a6c043e6a
Subproject commit 7e1f37eb4fc711dbf3ecc9610178931f00754de8

2
include/ircd/db/database/txn.h
View file

@ -32,7 +32,7 @@ struct ircd::db::txn::handler
Status MarkRollback(const Slice &xid) noexcept override;
Status MarkCommit(const Slice &xid) noexcept override;
Status MarkEndPrepare(const Slice &xid) noexcept override;
Status MarkBeginPrepare() noexcept override;
Status MarkBeginPrepare(bool = false) noexcept override;
Status MergeCF(const uint32_t cfid, const Slice &, const Slice &) noexcept override;
Status SingleDeleteCF(const uint32_t cfid, const Slice &) noexcept override;

6
ircd/db.cc
View file

@ -6355,9 +6355,10 @@ noexcept
}
rocksdb::Status
ircd::db::txn::handler::MarkBeginPrepare()
ircd::db::txn::handler::MarkBeginPrepare(bool b)
noexcept
{
ircd::assertion("not implemented");
return Status::OK();
}
@ -6365,6 +6366,7 @@ rocksdb::Status
ircd::db::txn::handler::MarkEndPrepare(const Slice &xid)
noexcept
{
ircd::assertion("not implemented");
return Status::OK();
}
@ -6372,6 +6374,7 @@ rocksdb::Status
ircd::db::txn::handler::MarkCommit(const Slice &xid)
noexcept
{
ircd::assertion("not implemented");
return Status::OK();
}
@ -6379,6 +6382,7 @@ rocksdb::Status
ircd::db::txn::handler::MarkRollback(const Slice &xid)
noexcept
{
ircd::assertion("not implemented");
return Status::OK();
}