Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate vfs2 #661

Closed
wants to merge 20 commits into from
Closed

Integrate vfs2 #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6efb06c
format version changes
cole-miller Jun 21, 2024
f41e053
Removing references to DQLITE_NEXT; format_version
cole-miller Jun 21, 2024
3d8cf3b
removing the rest of DQLITE_NEXT
cole-miller Jun 21, 2024
dbe5914
remove DQLITE_NEXT from build system
cole-miller Jun 21, 2024
caf7a00
initialization changes
cole-miller Jun 24, 2024
2344e7c
fsm changes
cole-miller Jun 24, 2024
fc9fb8b
vfs2 fixes
cole-miller Jun 24, 2024
21c66d2
further raft changes
cole-miller Jun 24, 2024
40a22af
leader changes
cole-miller Jun 24, 2024
2b4bf32
raft header changes
cole-miller Jun 24, 2024
36d2bba
server header changes for initialization
cole-miller Jun 24, 2024
7d14991
utils
cole-miller Jun 24, 2024
1328c5f
gateway
cole-miller Jun 24, 2024
0aa9cbc
test fixes
cole-miller Jun 24, 2024
1854700
temporary vfs2 fix
cole-miller Jun 24, 2024
9ba88fb
test fixes
cole-miller Jun 24, 2024
3d3fb62
Update many tests that expect working snapshots in disk mode
cole-miller Jun 24, 2024
f355066
Temporarily skip a test that requires vfs2 digging
cole-miller Jun 25, 2024
5f72382
Remove stray debugging
cole-miller Jun 25, 2024
86ef5cd
Guard initial_barrier_cb
cole-miller Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ AM_CFLAGS += $(CODE_COVERAGE_CFLAGS)
AM_CFLAGS += $(SQLITE_CFLAGS) $(UV_CFLAGS) $(PTHREAD_CFLAGS)
AM_LDFLAGS = $(UV_LIBS) $(PTHREAD_LIBS)

if DQLITE_NEXT_ENABLED
AM_CFLAGS += -DDQLITE_NEXT
endif

if !BUILD_RAFT_ENABLED
AM_CFLAGS += $(RAFT_CFLAGS) -DUSE_SYSTEM_RAFT
AM_LDFLAGS += $(RAFT_LIBS)
Expand Down
4 changes: 0 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ AM_CONDITIONAL(BUILD_SQLITE_ENABLED, test "x$enable_build_sqlite" = "xyes")
AC_ARG_ENABLE(build-raft, AS_HELP_STRING([--enable-build-raft[=ARG]], [use the bundled raft sources instead of linking to libraft [default=no]]))
AM_CONDITIONAL(BUILD_RAFT_ENABLED, test "x$enable_build_raft" = "xyes")

AC_ARG_ENABLE(dqlite-next, AS_HELP_STRING([--enable-dqlite-next[=ARG]], [build with the experimental dqlite backend [default=no]]))
AM_CONDITIONAL(DQLITE_NEXT_ENABLED, test "x$enable_dqlite_next" = "xyes")
AS_IF([test "x$enable_build_raft" != "xyes" -a "x$enable_dqlite_next" = "xyes"], [AC_MSG_ERROR([dqlite-next requires bundled raft])], [])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If dqlite next needs to bundle raft, shouldn't we remove the option enable_build_raft as well and make it a default?

EDIT: we discussed this in the daily but now I think it makes more sense to do it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should do this for the next release but need to make sure first that our known downstreams are ready to move to bundled raft (or have already done so).


# Whether to enable code coverage.
AX_CODE_COVERAGE

Expand Down
Loading
Loading