.

t/neo/storage/fs1/url.go

+// Copyright (C) 2017  Nexedi SA and Contributors.
+//                     Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Open Source Initiative approved licenses and Convey
+// the resulting work. Corresponding source of such a combination shall include
+// the source code for all other software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+
+package fs1
+// URL support
+
+import (
+	"net/url"
+
+	"../../zodb"
+)
+
+// TODO read-only support
+func openByURL(u *url.URL) (zodb.IStorage, error) {
+	// TODO handle query
+	// XXX u.Path is not always raw path - recheck and fix
+	return Open(u.Path)
+}
+
+func init() {
+	zodb.RegisterStorage("file://", openByURL)
+}

t/neo/zodb/cmd/zodb/.gitignore

+/zodb

t/neo/zodb/cmd/zodb/zodb.go

@@ -24,8 +24,9 @@ import (
 	"os"
 
 	"../../zodbtools"
-)
 
+	_ "../../../zodb/wks"
+)
 
 func usage() {
 	w := os.Stderr

t/neo/zodb/open.go

+// Copyright (C) 2017  Nexedi SA and Contributors.
+//                     Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Open Source Initiative approved licenses and Convey
+// the resulting work. Corresponding source of such a combination shall include
+// the source code for all other software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+
+package zodb
+// logic to open storages by URL
+
+import (
+	"net/url"
+	"strings"
+)
+
+
+// OpenStorage opens ZODB storage by URL
+// Only URL schemes registered to zodb package are handled.
+// Users should user import in storage packages they use or zodb/wks package to
+// get support work well-known storages.
+// Storage authors should register their storages with RegisterStorage
+//
+// TODO readonly
+func OpenStorageURL(storageURL string) (IStorage, error) {
+	// no scheme -> file://
+	if !strings.Contains(storageURL, "://") {
+		storageURL = "file://" + storageURL
+	}
+
+	return nil, nil
+}
+
+
+// StorageOpener is a function to open a storage
+type StorageOpener func (u *url.URL) (IStorage, error)
+
+// RegisterStorage registers handler to be used for URLs with scheme
+func RegisterStorage(scheme string, handler StorageOpener) {
+	// TODO
+}

t/neo/zodb/wks/wks.go

+// Copyright (C) 2017  Nexedi SA and Contributors.
+//                     Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Open Source Initiative approved licenses and Convey
+// the resulting work. Corresponding source of such a combination shall include
+// the source code for all other software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+
+// Package wks links-in well-known ZODB storages
+// The only purpose of this package is so that users import it
+//
+//	import _ ".../zodb/wks"		XXX fixme import path
+//
+// and this way automatically link in support for file:// neo:// ... storages.
+package wks
+
+import (
+	_ "../../storage/fs1"
+)

t/neo/zodb/zodb.go

@@ -158,11 +158,3 @@ type IStorageRecordIterator interface {         // XXX naming -> IRecordIterator
 	// end of iteration is indicated with io.EOF
 	NextData() (*StorageRecordInformation, error)
 }
-
-
-
-// TODO readonly
-func Open(storageURL string) (IStorage, error) {
-	// TODO
-	return nil, nil
-}

t/neo/zodb/zodbtools/.gitignore

-/zodbdump

t/neo/zodb/zodbtools/command.go

@@ -18,9 +18,7 @@
 package zodbtools
 // registry for all commands
 
-import (
-	"io"
-)
+import "io"
 
 // Command describes one zodb subcommand
 type Command struct {

t/neo/zodb/zodbtools/dump.go

@@ -47,7 +47,6 @@ import (
 	"lab.nexedi.com/kirr/go123/xfmt"
 
 	"../../zodb"
-//	"../../storage/fs1"
 )
 
 
@@ -246,7 +245,7 @@ func dumpMain(argv []string) {
 		log.Fatal(err)	// XXX recheck
 	}
 
-	stor, err := zodb.Open(storUrl)	// TODO read-only
+	stor, err := zodb.OpenStorageURL(storUrl)	// TODO read-only
 	if err != nil {
 		log.Fatal(err)
 	}

t/neo/zodb/zodbtools/dump_test.go

@@ -86,7 +86,7 @@ func TestZodbDump(t *testing.T) {
 	withTestdata1Fs(t, func(fs *fs1.FileStorage) {
 		buf := bytes.Buffer{}
 
-		err := zodbDump(&buf, fs, 0, zodb.TidMax, false)
+		err := Dump(&buf, fs, 0, zodb.TidMax, false)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -106,7 +106,7 @@ func BenchmarkZodbDump(b *testing.B) {
 		b.ResetTimer()
 
 		for i := 0; i < b.N; i++ {
-			err := zodbDump(ioutil.Discard, fs, 0, zodb.TidMax, false)
+			err := Dump(ioutil.Discard, fs, 0, zodb.TidMax, false)
 			if err != nil {
 				b.Fatal(err)
 			}

t/neo/zodb/zodbtools/info.go

@@ -35,6 +35,7 @@ type paramFunc func(stor zodb.IStorage) (string, error)
 var infov = []struct {name string; getParam paramFunc} {
 	// XXX e.g. stor.LastTid() should return err itself
 	{"name", func(stor zodb.IStorage) (string, error) { return stor.StorageName(), nil }},
+// TODO reenable size
 //	{"size", func(stor zodb.IStorage) (string, error) { return stor.StorageSize(), nil }},
 	{"last_tid", func(stor zodb.IStorage) (string, error) {return stor.LastTid().String(), nil }},
 }
@@ -112,7 +113,7 @@ func infoMain(argv []string) {
 	}
 	storUrl := argv[0]
 
-	stor, err := zodb.Open(storUrl)	// TODO read-only
+	stor, err := zodb.OpenStorageURL(storUrl)	// TODO read-only
 	if err != nil {
 		log.Fatal(err)
 	}