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.

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

code.google.com is shutting down so update the dep #16054

Merged
merged 1 commit into from Sep 4, 2015

Conversation

jessfraz
Copy link
Contributor

@jessfraz jessfraz commented Sep 3, 2015

ping @tianon

@cpuguy83
Copy link
Member

cpuguy83 commented Sep 3, 2015

Or review #16032 :)

@@ -18,7 +18,7 @@ clone git github.com/microsoft/hcsshim 7f646aa6b26bcf90caee91e93cde4a80d0d8a83e
clone git github.com/mistifyio/go-zfs v2.1.1
clone git github.com/tchap/go-patricia v2.1.0
clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
clone hg code.google.com/p/gosqlite 74691fb6f837
clone git github.com/mxk/go-sqlite 167da9432e1f4602e95ea67b67051cfa34412e3f
Copy link
Contributor

Choose a reason for hiding this comment

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

is there a commit that's closer to the original? there's a lot of code change.

Copy link
Member

Choose a reason for hiding this comment

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

As far as time is concerned, mxk/go-sqlite@1ad6fca is pretty close to what we were using before. (May 30, 2013 vs May 25, 2013; https://code.google.com/p/gosqlite/source/detail?r=74691fb6f83716190870cde1b658538dd4b18eb0)

Not sure if that actually means anything, and haven't had a chance to check the code diff yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ya i dont think it does :/ i tried to see the commits to the hq repo, but they dont align, however they were pointing people to use this repo, so its semi weird...

Copy link
Member

Choose a reason for hiding this comment

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

Do you happen to have a link to where they suggest using this particular repo? I can't find any suggestion like that myself. 😢

Alternatively, we could switch over to go-sqlite3 completely (#15387 (comment)).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://code.google.com/p/go-sqlite/

On Thu, Sep 3, 2015 at 5:18 PM, Tianon Gravi notifications@github.com
wrote:

In hack/vendor.sh
#16054 (comment):

@@ -18,7 +18,7 @@ clone git github.com/microsoft/hcsshim 7f646aa6b26bcf90caee91e93cde4a80d0d8a83e
clone git github.com/mistifyio/go-zfs v2.1.1
clone git github.com/tchap/go-patricia v2.1.0
clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
-clone hg code.google.com/p/gosqlite 74691fb6f837
+clone git github.com/mxk/go-sqlite 167da9432e1f4602e95ea67b67051cfa34412e3f

Do you happen to have a link to where they suggest using this particular
repo? I can't find any suggestion like that myself. [image: 😢]

Alternatively, we could switch over to go-sqlite3 completely (#15387
(comment)
#15387 (comment)).


Reply to this email directly or view it on GitHub
https://github.com/docker/docker/pull/16054/files#r38711350.

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 tryinng that sha tho

On Thu, Sep 3, 2015 at 5:19 PM, Jessie Frazelle jess@docker.com wrote:

https://code.google.com/p/go-sqlite/

On Thu, Sep 3, 2015 at 5:18 PM, Tianon Gravi notifications@github.com
wrote:

In hack/vendor.sh
#16054 (comment):

@@ -18,7 +18,7 @@ clone git github.com/microsoft/hcsshim 7f646aa6b26bcf90caee91e93cde4a80d0d8a83e
clone git github.com/mistifyio/go-zfs v2.1.1
clone git github.com/tchap/go-patricia v2.1.0
clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
-clone hg code.google.com/p/gosqlite 74691fb6f837
+clone git github.com/mxk/go-sqlite 167da9432e1f4602e95ea67b67051cfa34412e3f

Do you happen to have a link to where they suggest using this particular
repo? I can't find any suggestion like that myself. [image: 😢]

Alternatively, we could switch over to go-sqlite3 completely (#15387
(comment)
#15387 (comment)).


Reply to this email directly or view it on GitHub
https://github.com/docker/docker/pull/16054/files#r38711350.

Copy link
Member

Choose a reason for hiding this comment

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

Wow, I obviously can't read. 😳

Copy link
Member

Choose a reason for hiding this comment

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

It is really crazy that it doesn't have the proper hg history imported though. I can't imagine why they wouldn't.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right its so weird!

On Thu, Sep 3, 2015 at 5:24 PM, Tianon Gravi notifications@github.com
wrote:

In hack/vendor.sh
#16054 (comment):

@@ -18,7 +18,7 @@ clone git github.com/microsoft/hcsshim 7f646aa6b26bcf90caee91e93cde4a80d0d8a83e
clone git github.com/mistifyio/go-zfs v2.1.1
clone git github.com/tchap/go-patricia v2.1.0
clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
-clone hg code.google.com/p/gosqlite 74691fb6f837
+clone git github.com/mxk/go-sqlite 167da9432e1f4602e95ea67b67051cfa34412e3f

It is really crazy that it doesn't have the proper hg history imported
though. I can't imagine why they wouldn't.


Reply to this email directly or view it on GitHub
https://github.com/docker/docker/pull/16054/files#r38711689.

@jessfraz jessfraz force-pushed the update-sqlite3-dep branch 2 times, most recently from 510e1a6 to 6705943 Compare September 4, 2015 00:29
@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

the diff is so completely different idk

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

maybe we should just use something else :/

@tianon
Copy link
Member

tianon commented Sep 4, 2015 via email

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

ooo yeah i will pop it out i didnt know if there is a reson we werent using it already

@tianon
Copy link
Member

tianon commented Sep 4, 2015 via email

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

cool! updated!

@@ -3,5 +3,5 @@
package graphdb

import (
_ "code.google.com/p/gosqlite/sqlite3" // registers sqlite
_ "github.com/github.com/mattn/go-sqlite3" // registers sqlite
Copy link
Member

Choose a reason for hiding this comment

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

github.com/github.com

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah i was too slow to fix and you saw it :ashamed:

On Thu, Sep 3, 2015 at 5:40 PM, Tianon Gravi notifications@github.com
wrote:

In pkg/graphdb/conn_sqlite3_unix.go
#16054 (comment):

@@ -3,5 +3,5 @@
package graphdb

import (

  • _ "code.google.com/p/gosqlite/sqlite3" // registers sqlite
  • _ "github.com/github.com/mattn/go-sqlite3" // registers sqlite

github.com/github.com


Reply to this email directly or view it on GitHub
https://github.com/docker/docker/pull/16054/files#r38712452.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

it works!

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 4, 2015

omg @LK4D4 will be excited we only have 1 sqlite package now 🎊

@tianon
Copy link
Member

tianon commented Sep 4, 2015

LGTM

@diogomonica
Copy link
Contributor

LGTM

jessfraz pushed a commit that referenced this pull request Sep 4, 2015
code.google.com is shutting down so update the dep
@jessfraz jessfraz merged commit 38ecc7f into moby:master Sep 4, 2015
@jessfraz jessfraz deleted the update-sqlite3-dep branch September 4, 2015 02:20
@mountkin
Copy link
Contributor

mountkin commented Sep 6, 2015

There's a warning when running make binary.

---> Making bundle: binary (in bundles/1.9.0-dev/binary)
Building: bundles/1.9.0-dev/binary/docker-1.9.0-dev
# github.com/docker/docker/docker
/var/tmp/go-link-pJY0ZF/000006.o: In function `unixDlOpen':
/go/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/code/sqlite3-binding.c:29925: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 6, 2015

It's fixed in another pr

On Sat, Sep 5, 2015 at 9:07 PM -0700, "Shijiang Wei" notifications@github.com wrote:

There's a warning when running make binary.

---> Making bundle: binary (in bundles/1.9.0-dev/binary)
Building: bundles/1.9.0-dev/binary/docker-1.9.0-dev

github.com/docker/docker/docker

/var/tmp/go-link-pJY0ZF/000006.o: In function `unixDlOpen':
/go/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/code/sqlite3-binding.c:29925: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking


Reply to this email directly or view it on GitHub.

@jessfraz
Copy link
Contributor Author

jessfraz commented Sep 6, 2015

It is just a warning tho we do not use dlopen

On Sat, Sep 5, 2015 at 9:07 PM -0700, "Shijiang Wei" notifications@github.com wrote:

There's a warning when running make binary.

---> Making bundle: binary (in bundles/1.9.0-dev/binary)
Building: bundles/1.9.0-dev/binary/docker-1.9.0-dev

github.com/docker/docker/docker

/var/tmp/go-link-pJY0ZF/000006.o: In function `unixDlOpen':
/go/src/github.com/docker/docker/vendor/src/github.com/mattn/go-sqlite3/code/sqlite3-binding.c:29925: warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking


Reply to this email directly or view it on GitHub.

@mountkin
Copy link
Contributor

mountkin commented Sep 6, 2015

I see. It's #16094
Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants