Skip to content

Commit

Permalink
Revert "Merge pull request #3516 from MaideCa/thirdparty_sqlite_386"
Browse files Browse the repository at this point in the history 
This reverts commit eb5a264, reversing
changes made to 8a9a63d.
  • Loading branch information
@fredemmott
fredemmott committed Aug 20, 2014
1 parent 51d6456 commit 5bf9f05
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion third-party
Submodule third-party updated 3 files
+16,785 −28,253 libsqlite3/sqlite3.c
+181 −515 libsqlite3/sqlite3.h
+2 −42 libsqlite3/sqlite3ext.h

8 comments on commit 5bf9f05

@fredemmott
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@MaideCa: Sorry for the revert; this is broken on a Centos 6.5 build (which we use to generate hhvm.com/frameworks)

@ptarjan: Did you do anything special on the machine you tested on? Mine is clean + the OSS chef recipe

I get:

Failed to initialize central HHBC repository:
Failed to initialize connection to /data/fio/hhvm/verify.hhbc: RepoQuery::step(repo=0x78ea800) error: 'COMMIT;' --> (5) cannot commit transaction - SQL statements in progress

Or similar message for every test. Have tried removing the bytecode cache files, does not help.

@fredemmott
Copy link
Contributor Author

Choose a reason for hiding this comment

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

refs hhvm/hhvm-third-party#27

@auroraeosrose
Copy link

Choose a reason for hiding this comment

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

@fredemmott That is the error everyone else was getting with sqlite 3.8.4 and 3.8.5 related to a bug in sqlite - which is fixed on sqlite 3.8.6 - something seems fishy here that you'd suddenly start getting that...

If this does still exist in 3.8.6 probably needs to be a code workaround for this - simply forcing people back to 3.7.x isn't the best :(

@fredemmott
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'm definitely linking against ../../third-party/libsqlite3/libsqlite3.a, and:

grep 'define SQLITE_VERSION' third-party/libsqlite3/*.h
third-party/libsqlite3/sqlite3.h:#define SQLITE_VERSION        "3.8.6"
third-party/libsqlite3/sqlite3.h:#define SQLITE_VERSION_NUMBER 3008006

@fredemmott
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Have that on a clean github clone. Trying our hybrid setup on the same machine to see if it has the same problem.

@auroraeosrose
Copy link

Choose a reason for hiding this comment

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

Might be still broken with 3.8.6 - but in that case it's been broken with all of the 3.8.x releases and probably needs a better fix...

@fredemmott
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's broken with debug builds. Release builds are fine.

@fredemmott
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Currently suspect it's the if (debug) in Repo::begin()

Please sign in to comment.