Remove usage of merkledag.Link.Node pointer outside of merkledag #1916

mildred · 2015-10-30T18:54:01Z

This prepares for inclusion of IPLD where the Node pointer might not be publicly accessible of even be there. We should probably move away from using the struct attributes and use functions to access them instead. This will make it easier to plug in IPLD in place of merkledag.

Obsoletes #1902 (PR on the wrong branch, and this can't be changed)

see also discussion in ipld/go-ipld-deprecated#14

mildred · 2015-10-30T19:04:17Z

From there, we might want to split the Node type in two separate types for different use cases:

ipld.Node which contains the raw Node object (possibly still encoded), and the logic to decode it
merkledag.Node (or any other name) which contains just the decoded links of the node, not anything extra. Plus a reference to ipld.Node.
more types as we need to do more things. Like unixfs, IPNS/IPRS...

The data flow would be different. Instead of decoding everything of the IPLD node in a generic and unoptimized data structure (recursive maps basically), we could get both a non decoded data structure (the ipld.Node) and an optimized data structure (merkledag.Node) that would be efficient for link traversing.

The drawback of this approach is that we could not directly encode the optimized data structure back to the wire format (JSON, CBOR or ProtoBuf) because we would lose the bits we didn't decode first. This would apply only to modifying existing nodes, not to creating new nodes.

@whyrusleeping this might explain a bit of the discussion we had in ipld/go-ipld-deprecated#14

rht · 2015-11-17T13:55:59Z

@mildred needs a rebase

GitCop · 2015-11-27T07:08:31Z

There were the following issues with your Pull Request

Commit: a1dc966
- Invalid signoff. Commit message must end with
  License: MIT
  Signed-off-by: .* <.*>

Guidelines and a script are available to help. Your feedback on GitCop is welcome on this issue.

This message was auto-generated by https://gitcop.com

whyrusleeping · 2015-11-27T18:21:17Z

core/commands/ls.go

@@ -78,12 +78,13 @@ it contains, with the following format:
 				Links: make([]LsLink, len(dagnode.Links)),
 			}
 			for j, link := range dagnode.Links {
-				link.Node, err = link.GetNode(req.Context(), node.DAG)
+				var linkNode *merkledag.Node
+				linkNode, err = link.GetNode(req.Context(), node.DAG)


keep it as one line, using the := instead of a var declaration.

I didn't want to override the err variable. using := is not equivalent because it creates a new err variable scoped in the for loop.

I fail to see the reason for reusing the err var here:
if an err happens inside the loop, the function returns right away, and if the loop is done, it means the err is nil -- same behavior for both reused / scoped errs.

yeah, theres no reason not to create a new err in the inner scope. thats what we want to do.

reusing err values across scopes causes a lot of errors, has bitten us in the past already

mildred · 2015-11-27T19:31:08Z

See also ipld/go-ipld-deprecated#17 which is where I'd like to go next to fit IPLD within IPFS in terms of API.

License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>

Dev0.4.0

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

See ipfs#1296 License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

@whyrusleeping

Need to publish to https://github.com/ipfs/npm-go-ipfs cc @whyrusleeping this did not happen for 0.3.11

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

combine multiple bootstrap addrs into single peer info

License: MIT Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

docs: improve windows.md

Do not install gx if user explicitly didn't ask for it

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

add a pause to fix timing on t0065

Capitalized Merkle, added single quotes, periods

Normalised Example heading, added dollar sign to examples

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

Add information about installing gx into readme

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

@dignifiedquire

See @dignifiedquire comments in ipfs-inactive/http-api-spec#45 License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Capped IPFS, added period

Removed double space, hyphen

Fixed spelling error

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

fix panic in cli arg parsing

This prepares for inclusion of IPLD where the Node pointer won't be there. License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

This function work only with protocol buffer encoding. To make this clear, rename the function. License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

mildred · 2016-02-18T07:00:05Z

Just to be sure, you asked me to rebase on master. Unfortunately this PR is set to merge in dev0.4.0. Either I close this PR and reopen one that merges to master, or I should rebase to dev0.4.0.

That's why we see all the commits here.

chriscool · 2016-02-18T09:58:13Z

These days there are some v0.4.0 related tags on master. It looks like the last one is v0.4.0-rc2, so there should not be a big difference and I think it's better to rebase on master.

mildred · 2016-02-18T12:55:37Z

Closed in favor of #2359

jbenet added the status/in-progress In progress label Oct 30, 2015

whyrusleeping force-pushed the dev0.4.0 branch 3 times, most recently from 764bef9 to 1bbc472 Compare November 11, 2015 18:04

mildred force-pushed the ipld branch from 268258d to a1dc966 Compare November 27, 2015 07:08

whyrusleeping reviewed Nov 27, 2015
View reviewed changes

ghost added need_signoff topic/merkledag Topic merkledag labels Dec 22, 2015

whyrusleeping force-pushed the dev0.4.0 branch 2 times, most recently from 68b9745 to b0a8591 Compare December 28, 2015 14:36

ci: remove dead jenkins code

711b95e

License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>

whyrusleeping force-pushed the dev0.4.0 branch from cf514d8 to 3224ae0 Compare January 12, 2016 16:23

whyrusleeping and others added 11 commits January 12, 2016 18:02

Merge pull request ipfs#1381 from ipfs/dev0.4.0

04914ac

Dev0.4.0

remove failed merge tag from pin ls help

3c6a40a

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Edited following @chriscool feedback

48353a7

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Added env var info to init, dameon help

6f22271

See ipfs#1296 License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Update release-checklist.md with npm publish note

c242660

Need to publish to https://github.com/ipfs/npm-go-ipfs cc @whyrusleeping this did not happen for 0.3.11

combine multiple bootstrap addrs into single peer info

1649b44

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

do resolve operations concurrently

19b2f89

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Fixes setuo_commit_msg_hook.sh link.

38a600b

Merge pull request ipfs#2199 from ipfs/feat/multi-multiaddr-bootstrap

a28e02b

combine multiple bootstrap addrs into single peer info

test-lib: fix test_str_contains

7e8052e

License: MIT Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

t0081: fix greping pin type

e620115

License: MIT Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

Kubuxu and others added 10 commits February 14, 2016 23:45

Fix bin/check_gx_program on Windows where gx -v outputs full path

a59b47e

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

Merge pull request ipfs#2337 from ipfs/improve-windows-doc

7d59baa

docs: improve windows.md

Merge pull request ipfs#2321 from Kubuxu/feat/there-is-gx

d3b467f

Do not install gx if user explicitly didn't ask for it

Add information about installing gx into readme

91250c8

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

add a pause to fix timing on t0065

11f9e7f

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Merge pull request ipfs#2346 from ipfs/fix/t0065-timing

40c4d85

add a pause to fix timing on t0065

Merge pull request ipfs#2299 from ipfs/feature/small-changes-rebase

5ebfd71

Capitalized Merkle, added single quotes, periods

Merge pull request ipfs#2298 from ipfs/feature/example-name-change

58a6085

Normalised Example heading, added dollar sign to examples

Update README gx section according to suggestions

ed3cf18

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@gmail.com>

Merge pull request ipfs#2342 from Kubuxu/feat/gx-in-readme

e19dbba

Add information about installing gx into readme

mildred force-pushed the ipld branch from 1ac1fb9 to a9a022c Compare February 17, 2016 17:03

RichardLitt and others added 12 commits February 17, 2016 13:12

Capped IPFS, added period

b1b4ac4

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Removed double space, hyphen

f3f568f

See @dignifiedquire comments in ipfs-inactive/http-api-spec#45 License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Fixed spelling error

84446f8

License: MIT Signed-off-by: Richard Littauer <richard.littauer@gmail.com>

Merge pull request ipfs#2351 from ipfs/docs/tar

f7126bb

Capped IPFS, added period

Merge pull request ipfs#2352 from ipfs/docs/file-ls

7866a72

Removed double space, hyphen

Merge pull request ipfs#2353 from ipfs/docs/achieve

ef7b373

Fixed spelling error

fix panic in cli arg parsing

dbf0185

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>

Merge pull request ipfs#2354 from ipfs/fix/stdin-arg-parse

f8eefba

fix panic in cli arg parsing

Remove usage of merkledag.Link.Node pointer outside of merkledag

798c57f

This prepares for inclusion of IPLD where the Node pointer won't be there. License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

path/resolver.go: Handle timeout here

d0bdd56

License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

merkledag: Make Node.Unmarshal() private

7e8d8e4

License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

Rename Decoded into DecodeProtobuf

dfc0df0

This function work only with protocol buffer encoding. To make this clear, rename the function. License: MIT Signed-off-by: Mildred Ki'Lya <mildred-pub.git@mildred.fr>

mildred force-pushed the ipld branch from a9a022c to dfc0df0 Compare February 18, 2016 06:54

mildred mentioned this pull request Feb 18, 2016

Simplify merkledag package interface to ease IPLD inclusion #2359

Merged

mildred closed this Feb 18, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove usage of merkledag.Link.Node pointer outside of merkledag #1916

Remove usage of merkledag.Link.Node pointer outside of merkledag #1916

mildred commented Oct 30, 2015

mildred commented Oct 30, 2015

rht commented Nov 17, 2015

GitCop commented Nov 27, 2015

whyrusleeping Nov 27, 2015

mildred Nov 27, 2015

rht Nov 28, 2015

whyrusleeping Nov 28, 2015

jbenet Dec 1, 2015

mildred commented Nov 27, 2015

mildred commented Feb 18, 2016

chriscool commented Feb 18, 2016

mildred commented Feb 18, 2016

Remove usage of merkledag.Link.Node pointer outside of merkledag #1916

Remove usage of merkledag.Link.Node pointer outside of merkledag #1916

Conversation

mildred commented Oct 30, 2015

mildred commented Oct 30, 2015

rht commented Nov 17, 2015

GitCop commented Nov 27, 2015

whyrusleeping Nov 27, 2015

Choose a reason for hiding this comment

mildred Nov 27, 2015

Choose a reason for hiding this comment

rht Nov 28, 2015

Choose a reason for hiding this comment

whyrusleeping Nov 28, 2015

Choose a reason for hiding this comment

jbenet Dec 1, 2015

Choose a reason for hiding this comment

mildred commented Nov 27, 2015

mildred commented Feb 18, 2016

chriscool commented Feb 18, 2016

mildred commented Feb 18, 2016