2011-03-23 03:08:53 +00:00
|
|
|
/*
|
|
|
|
Copyright 2011 Google Inc.
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2011-08-07 01:46:37 +00:00
|
|
|
package fs
|
2011-03-23 03:08:53 +00:00
|
|
|
|
|
|
|
import (
|
2011-03-24 22:33:15 +00:00
|
|
|
"bytes"
|
Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.
The directory tree has been rearranged now too. Go libraries are now
under "pkg". Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".
The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.
For now, put the camlistore root under $GOPATH/src. Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.
Then you can:
$ go build ./server/camlistored
... etc
The build.pl script is currently disabled. It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).
Many things are certainly broken.
Many things are disabled. (MySQL, all indexing, etc).
Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.
The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.
Help wanted.
Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-19 05:53:06 +00:00
|
|
|
"encoding/json"
|
2011-03-23 03:08:53 +00:00
|
|
|
"fmt"
|
2011-03-24 22:33:15 +00:00
|
|
|
"io"
|
Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.
The directory tree has been rearranged now too. Go libraries are now
under "pkg". Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".
The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.
For now, put the camlistore root under $GOPATH/src. Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.
Then you can:
$ go build ./server/camlistored
... etc
The build.pl script is currently disabled. It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).
Many things are certainly broken.
Many things are disabled. (MySQL, all indexing, etc).
Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.
The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.
Help wanted.
Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-19 05:53:06 +00:00
|
|
|
"log"
|
2011-03-23 03:08:53 +00:00
|
|
|
"os"
|
2012-04-28 07:55:46 +00:00
|
|
|
"sync"
|
2012-03-19 06:14:34 +00:00
|
|
|
"syscall"
|
2011-03-23 03:08:53 +00:00
|
|
|
|
Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.
The directory tree has been rearranged now too. Go libraries are now
under "pkg". Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".
The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.
For now, put the camlistore root under $GOPATH/src. Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.
Then you can:
$ go build ./server/camlistored
... etc
The build.pl script is currently disabled. It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).
Many things are certainly broken.
Many things are disabled. (MySQL, all indexing, etc).
Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.
The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.
Help wanted.
Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-19 05:53:06 +00:00
|
|
|
"camlistore.org/pkg/blobref"
|
|
|
|
"camlistore.org/pkg/lru"
|
|
|
|
"camlistore.org/pkg/schema"
|
2012-03-19 06:14:34 +00:00
|
|
|
|
|
|
|
"camlistore.org/third_party/code.google.com/p/rsc/fuse"
|
2011-03-23 03:08:53 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
var _ = fmt.Println
|
|
|
|
var _ = log.Println
|
2012-03-19 06:54:20 +00:00
|
|
|
var _ = bytes.NewReader
|
2011-03-23 03:08:53 +00:00
|
|
|
|
2012-03-19 06:14:34 +00:00
|
|
|
var errNotDir = fuse.Errno(syscall.ENOTDIR)
|
2011-03-24 02:14:04 +00:00
|
|
|
|
2012-03-19 06:14:34 +00:00
|
|
|
type CamliFileSystem struct {
|
2011-06-04 15:56:03 +00:00
|
|
|
fetcher blobref.SeekFetcher
|
2011-03-25 02:20:22 +00:00
|
|
|
root *blobref.BlobRef
|
2011-03-23 05:11:27 +00:00
|
|
|
|
2011-03-26 04:21:24 +00:00
|
|
|
blobToSchema *lru.Cache // ~map[blobstring]*schema.Superset
|
|
|
|
nameToBlob *lru.Cache // ~map[string]*blobref.BlobRef
|
2011-03-26 04:36:52 +00:00
|
|
|
nameToAttr *lru.Cache // ~map[string]*fuse.Attr
|
2011-03-23 03:08:53 +00:00
|
|
|
}
|
|
|
|
|
2012-03-19 06:54:20 +00:00
|
|
|
type CamliFile struct {
|
|
|
|
fs *CamliFileSystem
|
|
|
|
blob *blobref.BlobRef
|
|
|
|
ss *schema.Superset
|
|
|
|
|
|
|
|
size uint64 // memoized
|
|
|
|
}
|
|
|
|
|
2012-03-19 06:14:34 +00:00
|
|
|
var _ fuse.FS = (*CamliFileSystem)(nil)
|
|
|
|
|
2011-06-04 15:56:03 +00:00
|
|
|
func NewCamliFileSystem(fetcher blobref.SeekFetcher, root *blobref.BlobRef) *CamliFileSystem {
|
2011-03-23 05:11:27 +00:00
|
|
|
return &CamliFileSystem{
|
2011-03-26 04:21:24 +00:00
|
|
|
fetcher: fetcher,
|
|
|
|
blobToSchema: lru.New(1024), // arbitrary; TODO: tunable/smarter?
|
|
|
|
root: root,
|
|
|
|
nameToBlob: lru.New(1024), // arbitrary: TODO: tunable/smarter?
|
2011-03-26 04:36:52 +00:00
|
|
|
nameToAttr: lru.New(1024), // arbitrary: TODO: tunable/smarter?
|
2011-03-23 05:11:27 +00:00
|
|
|
}
|
2011-03-23 03:08:53 +00:00
|
|
|
}
|
|
|
|
|
2012-04-27 02:44:04 +00:00
|
|
|
type node struct {
|
|
|
|
fs *CamliFileSystem
|
|
|
|
blobref *blobref.BlobRef
|
2012-04-28 07:55:46 +00:00
|
|
|
|
2012-04-28 11:15:45 +00:00
|
|
|
dmu sync.Mutex // guards dirents. acquire before mu.
|
|
|
|
dirents []fuse.Dirent // nil until populated once
|
|
|
|
|
2012-04-28 07:55:46 +00:00
|
|
|
mu sync.Mutex // guards rest
|
2012-04-28 01:57:24 +00:00
|
|
|
attr fuse.Attr
|
|
|
|
ss *schema.Superset
|
2012-04-28 07:55:46 +00:00
|
|
|
lookMap map[string]*blobref.BlobRef
|
2012-03-19 06:14:34 +00:00
|
|
|
}
|
|
|
|
|
2012-04-27 02:44:04 +00:00
|
|
|
func (n *node) Attr() (attr fuse.Attr) {
|
2012-04-28 07:55:46 +00:00
|
|
|
_, err := n.schema()
|
|
|
|
if err != nil {
|
|
|
|
// Hm, can't return it. Just log it I guess.
|
|
|
|
log.Printf("error fetching schema superset for %v: %v", n.blobref, err)
|
|
|
|
}
|
2012-04-27 08:46:31 +00:00
|
|
|
return n.attr
|
|
|
|
}
|
|
|
|
|
2012-04-28 07:55:46 +00:00
|
|
|
func (n *node) addLookupEntry(name string, ref *blobref.BlobRef) {
|
|
|
|
n.mu.Lock()
|
|
|
|
defer n.mu.Unlock()
|
|
|
|
if n.lookMap == nil {
|
|
|
|
n.lookMap = make(map[string]*blobref.BlobRef)
|
|
|
|
}
|
|
|
|
n.lookMap[name] = ref
|
|
|
|
}
|
|
|
|
|
2012-04-28 01:57:24 +00:00
|
|
|
func (n *node) Lookup(name string, intr fuse.Intr) (fuse.Node, fuse.Error) {
|
|
|
|
if name == ".quitquitquit" {
|
|
|
|
// TODO: only in dev mode
|
|
|
|
log.Fatalf("Shutting down due to .quitquitquit lookup.")
|
|
|
|
}
|
2012-04-28 07:55:46 +00:00
|
|
|
|
2012-04-28 11:15:45 +00:00
|
|
|
// If we haven't done Readdir yet (dirents isn't set), then force a Readdir
|
|
|
|
// call to populate lookMap.
|
|
|
|
n.dmu.Lock()
|
|
|
|
loaded := n.dirents != nil
|
|
|
|
n.dmu.Unlock()
|
|
|
|
if !loaded {
|
|
|
|
n.ReadDir(nil)
|
|
|
|
}
|
|
|
|
|
2012-04-28 07:55:46 +00:00
|
|
|
n.mu.Lock()
|
|
|
|
defer n.mu.Unlock()
|
|
|
|
ref, ok := n.lookMap[name]
|
|
|
|
if !ok {
|
|
|
|
return nil, fuse.ENOENT
|
|
|
|
}
|
|
|
|
return &node{fs: n.fs, blobref: ref}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (n *node) schema() (*schema.Superset, error) {
|
|
|
|
// TODO: use singleflight library here instead of a lock?
|
|
|
|
n.mu.Lock()
|
|
|
|
defer n.mu.Unlock()
|
|
|
|
if n.ss != nil {
|
|
|
|
return n.ss, nil
|
|
|
|
}
|
|
|
|
ss, err := n.fs.fetchSchemaSuperset(n.blobref)
|
|
|
|
if err == nil {
|
|
|
|
n.ss = ss
|
|
|
|
n.populateAttr()
|
|
|
|
}
|
|
|
|
return ss, err
|
2012-04-28 01:57:24 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 11:15:45 +00:00
|
|
|
func (n *node) Open(req *fuse.OpenRequest, res *fuse.OpenResponse, intr fuse.Intr) (fuse.Handle, fuse.Error) {
|
|
|
|
log.Printf("CAMLI Open on %v: %#v", n.blobref, req)
|
2012-04-28 11:47:02 +00:00
|
|
|
ss, err := n.schema()
|
|
|
|
if err != nil {
|
|
|
|
log.Printf("open of %v: %v", n.blobref, err)
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
if ss.Type == "directory" {
|
|
|
|
return n, nil
|
|
|
|
}
|
|
|
|
return &nodeReader{n: n, ss: ss}, nil
|
2012-04-28 11:15:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
type nodeReader struct {
|
2012-04-28 11:47:02 +00:00
|
|
|
n *node
|
|
|
|
ss *schema.Superset // not nil, always of type "file" or "bytes"
|
2012-04-28 11:15:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (nr *nodeReader) Read(req *fuse.ReadRequest, res *fuse.ReadResponse, intr fuse.Intr) fuse.Error {
|
2012-04-28 11:47:02 +00:00
|
|
|
log.Printf("CAMLI nodeReader READ on %v: %#v", nr.n.blobref, req)
|
|
|
|
|
|
|
|
// TODO: this isn't incredibly efficient, creating a new
|
|
|
|
// FileReader for each read chunk. We could do better here
|
|
|
|
// and re-use a locked pool of readers, trying to find the one
|
|
|
|
// with a current offset <= req.Offset first.
|
|
|
|
fr, err := nr.ss.NewFileReader(nr.n.fs.fetcher)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
fr.Skip(uint64(req.Offset))
|
|
|
|
buf := make([]byte, req.Size)
|
|
|
|
n, err := fr.Read(buf)
|
|
|
|
if err != nil && err != io.EOF {
|
|
|
|
log.Printf("camli read on %v at %d: %v", nr.n.blobref, req.Offset, err)
|
|
|
|
return fuse.EIO
|
|
|
|
}
|
|
|
|
res.Data = buf[:n]
|
|
|
|
return nil
|
2012-04-28 11:15:45 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 01:57:24 +00:00
|
|
|
func (n *node) ReadDir(intr fuse.Intr) ([]fuse.Dirent, fuse.Error) {
|
2012-04-28 11:15:45 +00:00
|
|
|
log.Printf("CAMLI ReadDir on %v", n.blobref)
|
|
|
|
n.dmu.Lock()
|
|
|
|
defer n.dmu.Unlock()
|
|
|
|
if n.dirents != nil {
|
|
|
|
return n.dirents, nil
|
|
|
|
}
|
2012-04-28 07:55:46 +00:00
|
|
|
|
|
|
|
ss, err := n.schema()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
setRef := blobref.Parse(ss.Entries)
|
2012-04-28 01:57:24 +00:00
|
|
|
if setRef == nil {
|
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
log.Printf("fetching setref: %v...", setRef)
|
|
|
|
setss, err := n.fs.fetchSchemaSuperset(setRef)
|
2012-04-28 07:55:46 +00:00
|
|
|
if err != nil {
|
|
|
|
log.Printf("fetching %v for readdir on %v: %v", setRef, n.blobref, err)
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
if setss.Type != "static-set" {
|
|
|
|
log.Printf("%v is not a static-set in readdir; is a %q", setRef, setss.Type)
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
|
|
|
|
// res is the result of fetchSchemaSuperset. the ssc slice of channels keeps them ordered
|
|
|
|
// the same as they're listed in the schema's Members.
|
|
|
|
type res struct {
|
|
|
|
*blobref.BlobRef
|
|
|
|
*schema.Superset
|
|
|
|
error
|
|
|
|
}
|
|
|
|
var ssc []chan res
|
|
|
|
for _, member := range setss.Members {
|
|
|
|
memberRef := blobref.Parse(member)
|
|
|
|
if memberRef == nil {
|
|
|
|
log.Printf("invalid blobref of %q in static set %s", member, setRef)
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
ch := make(chan res, 1)
|
|
|
|
ssc = append(ssc, ch)
|
|
|
|
// TODO: move the cmd/camput/chanworker.go into its own package, and use it here. only
|
|
|
|
// have 10 or so of these loading at once. for now we do them all.
|
|
|
|
go func() {
|
|
|
|
mss, err := n.fs.fetchSchemaSuperset(memberRef)
|
|
|
|
if err != nil {
|
|
|
|
log.Printf("error reading entry %v in readdir: %v", memberRef, err)
|
|
|
|
}
|
|
|
|
ch <- res{memberRef, mss, err}
|
|
|
|
}()
|
|
|
|
}
|
|
|
|
|
2012-04-28 11:15:45 +00:00
|
|
|
n.dirents = make([]fuse.Dirent, 0)
|
2012-04-28 07:55:46 +00:00
|
|
|
for _, ch := range ssc {
|
|
|
|
r := <-ch
|
|
|
|
memberRef, mss, err := r.BlobRef, r.Superset, r.error
|
|
|
|
if err != nil {
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
|
|
|
if filename := mss.FileNameString(); filename != "" {
|
|
|
|
n.addLookupEntry(filename, memberRef)
|
2012-04-28 11:15:45 +00:00
|
|
|
n.dirents = append(n.dirents, fuse.Dirent{
|
2012-04-28 07:55:46 +00:00
|
|
|
Name: mss.FileNameString(),
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2012-04-28 11:15:45 +00:00
|
|
|
return n.dirents, nil
|
2012-04-28 01:57:24 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 07:55:46 +00:00
|
|
|
// populateAttr should only be called once n.ss is known to be set and
|
|
|
|
// non-nil
|
|
|
|
func (n *node) populateAttr() error {
|
|
|
|
ss := n.ss
|
2012-04-27 08:46:31 +00:00
|
|
|
// TODO: common stuff:
|
|
|
|
// Uid uint32
|
|
|
|
// Gid uint32
|
|
|
|
// Mtime time.Time
|
|
|
|
// inode?
|
|
|
|
|
2012-04-28 08:35:45 +00:00
|
|
|
n.attr.Mode = ss.FileMode()
|
|
|
|
n.attr.Mtime = ss.ModTime()
|
|
|
|
|
2012-04-27 08:46:31 +00:00
|
|
|
switch ss.Type {
|
|
|
|
case "directory":
|
|
|
|
n.attr.Mode = os.ModeDir
|
|
|
|
case "file":
|
|
|
|
n.attr.Size = ss.SumPartsSize()
|
2012-04-28 08:35:45 +00:00
|
|
|
n.attr.Blocks = 0 // TODO: set?
|
|
|
|
case "symlink":
|
2012-04-27 08:46:31 +00:00
|
|
|
default:
|
2012-04-28 08:35:45 +00:00
|
|
|
log.Printf("unknown attr ss.Type %q in populateAttr", ss.Type)
|
2012-04-27 08:46:31 +00:00
|
|
|
}
|
|
|
|
return nil
|
2012-04-27 02:44:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (fs *CamliFileSystem) Root() (fuse.Node, fuse.Error) {
|
2012-04-27 08:46:31 +00:00
|
|
|
ss, err := fs.fetchSchemaSuperset(fs.root)
|
|
|
|
if err != nil {
|
|
|
|
// TODO: map these to fuse.Error better
|
|
|
|
log.Printf("Error fetching root: %v", err)
|
|
|
|
return nil, fuse.EIO
|
|
|
|
}
|
2012-04-28 01:57:24 +00:00
|
|
|
n := &node{fs: fs, blobref: fs.root, ss: ss}
|
2012-04-28 07:55:46 +00:00
|
|
|
n.populateAttr()
|
2012-04-27 08:46:31 +00:00
|
|
|
return n, nil
|
2011-03-23 05:11:27 +00:00
|
|
|
}
|
|
|
|
|
2012-04-28 01:57:24 +00:00
|
|
|
func (fs *CamliFileSystem) Statfs(req *fuse.StatfsRequest, res *fuse.StatfsResponse, intr fuse.Intr) fuse.Error {
|
|
|
|
log.Printf("CAMLI StatFS")
|
|
|
|
// Make some stuff up, just to see if it makes "lsof" happy.
|
|
|
|
res.Blocks = 1 << 35
|
|
|
|
res.Bfree = 1 << 34
|
|
|
|
res.Files = 1 << 29
|
|
|
|
res.Ffree = 1 << 28
|
|
|
|
res.Namelen = 2048
|
|
|
|
res.Bsize = 1024
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2011-03-24 05:04:50 +00:00
|
|
|
// Errors returned are:
|
2012-03-19 06:14:34 +00:00
|
|
|
// os.ErrNotExist -- blob not found
|
|
|
|
// os.ErrInvalid -- not JSON or a camli schema blob
|
Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.
The directory tree has been rearranged now too. Go libraries are now
under "pkg". Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".
The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.
For now, put the camlistore root under $GOPATH/src. Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.
Then you can:
$ go build ./server/camlistored
... etc
The build.pl script is currently disabled. It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).
Many things are certainly broken.
Many things are disabled. (MySQL, all indexing, etc).
Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.
The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.
Help wanted.
Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-19 05:53:06 +00:00
|
|
|
func (fs *CamliFileSystem) fetchSchemaSuperset(br *blobref.BlobRef) (*schema.Superset, error) {
|
2011-03-26 04:21:24 +00:00
|
|
|
blobStr := br.String()
|
|
|
|
if ss, ok := fs.blobToSchema.Get(blobStr); ok {
|
|
|
|
return ss.(*schema.Superset), nil
|
|
|
|
}
|
|
|
|
|
2011-03-23 05:11:27 +00:00
|
|
|
rsc, _, err := fs.fetcher.Fetch(br)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2011-03-23 03:35:04 +00:00
|
|
|
}
|
2011-03-23 05:11:27 +00:00
|
|
|
defer rsc.Close()
|
|
|
|
jd := json.NewDecoder(rsc)
|
|
|
|
ss := new(schema.Superset)
|
2011-03-25 02:20:22 +00:00
|
|
|
err = jd.Decode(ss)
|
|
|
|
if err != nil {
|
2011-03-23 05:11:27 +00:00
|
|
|
log.Printf("Error parsing %s as schema blob: %v", br, err)
|
2012-03-19 06:14:34 +00:00
|
|
|
return nil, os.ErrInvalid
|
2011-03-25 02:20:22 +00:00
|
|
|
}
|
2011-03-24 05:04:50 +00:00
|
|
|
if ss.Type == "" {
|
|
|
|
log.Printf("blob %s is JSON but lacks camliType", br)
|
2012-03-19 06:14:34 +00:00
|
|
|
return nil, os.ErrInvalid
|
2011-03-24 05:04:50 +00:00
|
|
|
}
|
|
|
|
ss.BlobRef = br
|
2011-03-26 04:21:24 +00:00
|
|
|
fs.blobToSchema.Add(blobStr, ss)
|
2011-03-23 05:11:27 +00:00
|
|
|
return ss, nil
|
|
|
|
}
|
|
|
|
|
Update from r60 to [almost] Go 1.
A lot is still broken, but most stuff at least compiles now.
The directory tree has been rearranged now too. Go libraries are now
under "pkg". Fully qualified, they are e.g. "camlistore.org/pkg/jsonsign".
The go tool cannot yet fetch from arbitrary domains, but discussion is
happening now on which mechanism to use to allow that.
For now, put the camlistore root under $GOPATH/src. Typically $GOPATH
is $HOME, so Camlistore should be at $HOME/src/camlistore.org.
Then you can:
$ go build ./server/camlistored
... etc
The build.pl script is currently disabled. It'll be resurrected at
some point, but with a very different role (helping create a fake
GOPATH and running the go build command, if things are installed at
the wrong place, and/or running fileembed generators).
Many things are certainly broken.
Many things are disabled. (MySQL, all indexing, etc).
Many things need to be moved into
camlistore.org/third_party/{code.google.com,github.com} and updated
from their r60 to Go 1 versions, where applicable.
The GoMySQL stuff should be updated to use database/sql and the ziutek
library implementing database/sql/driver.
Help wanted.
Change-Id: If71217dc5c8f0e70dbe46e9504ca5131c6eeacde
2012-02-19 05:53:06 +00:00
|
|
|
func (file *CamliFile) GetReader() (io.ReadCloser, error) {
|
2011-08-07 01:46:37 +00:00
|
|
|
return file.ss.NewFileReader(file.fs.fetcher)
|
|
|
|
}
|