mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-09 10:38:10 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity

Remove Ref.SetTargetValue

Browse Source
This commit is contained in:
Rafael Weinstein
2016-04-11 17:25:56 -07:00
parent 8315071088
commit 4006746b21
20 changed files with 6 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clients/common/incident.noms.go
View File

@@ -511,7 +511,3 @@ func builderForRefOfIncident(r ref.Ref) types.RefBase {
func (r RefOfIncident) TargetValue(vr types.ValueReader) Incident {
return vr.ReadValue(r.target).(Incident)
}
func (r RefOfIncident) SetTargetValue(val Incident, vw types.ValueWriter) RefOfIncident {
return vw.WriteValue(val).(RefOfIncident)
}

8
clients/common/quad_tree.noms.go
View File

@@ -581,10 +581,6 @@ func (r RefOfValue) TargetValue(vr types.ValueReader) types.Value {
return vr.ReadValue(r.target)
}
func (r RefOfValue) SetTargetValue(val types.Value, vw types.ValueWriter) RefOfValue {
return vw.WriteValue(val).(RefOfValue)
}
// ListOfNode
type ListOfNode struct {
@@ -1191,7 +1187,3 @@ func builderForRefOfSQuadTree(r ref.Ref) types.RefBase {
func (r RefOfSQuadTree) TargetValue(vr types.ValueReader) SQuadTree {
return vr.ReadValue(r.target).(SQuadTree)
}
func (r RefOfSQuadTree) SetTargetValue(val SQuadTree, vw types.ValueWriter) RefOfSQuadTree {
return vw.WriteValue(val).(RefOfSQuadTree)
}

8
clients/crunchbase/importer/importer.noms.go
View File

@@ -212,10 +212,6 @@ func (r RefOfMapOfStringToRefOfCompany) TargetValue(vr types.ValueReader) MapOfS
return vr.ReadValue(r.target).(MapOfStringToRefOfCompany)
}
func (r RefOfMapOfStringToRefOfCompany) SetTargetValue(val MapOfStringToRefOfCompany, vw types.ValueWriter) RefOfMapOfStringToRefOfCompany {
return vw.WriteValue(val).(RefOfMapOfStringToRefOfCompany)
}
// MapOfStringToRefOfCompany
type MapOfStringToRefOfCompany struct {
@@ -405,7 +401,3 @@ func builderForRefOfCompany(r ref.Ref) types.RefBase {
func (r RefOfCompany) TargetValue(vr types.ValueReader) Company {
return vr.ReadValue(r.target).(Company)
}
func (r RefOfCompany) SetTargetValue(val Company, vw types.ValueWriter) RefOfCompany {
return vw.WriteValue(val).(RefOfCompany)
}

4
clients/crunchbase/importer/sha1_91ae65b.go
View File

@@ -956,7 +956,3 @@ func builderForRefOfRound(r ref.Ref) types.RefBase {
func (r RefOfRound) TargetValue(vr types.ValueReader) Round {
return vr.ReadValue(r.target).(Round)
}
func (r RefOfRound) SetTargetValue(val Round, vw types.ValueWriter) RefOfRound {
return vw.WriteValue(val).(RefOfRound)
}

4
clients/crunchbase/index/index.noms.go
View File

@@ -660,7 +660,3 @@ func builderForRefOfKey(r ref.Ref) types.RefBase {
func (r RefOfKey) TargetValue(vr types.ValueReader) Key {
return vr.ReadValue(r.target).(Key)
}
func (r RefOfKey) SetTargetValue(val Key, vw types.ValueWriter) RefOfKey {
return vw.WriteValue(val).(RefOfKey)
}

8
clients/crunchbase/index/sha1_6c64b08.go
View File

@@ -212,10 +212,6 @@ func (r RefOfMapOfStringToRefOfCompany) TargetValue(vr types.ValueReader) MapOfS
return vr.ReadValue(r.target).(MapOfStringToRefOfCompany)
}
func (r RefOfMapOfStringToRefOfCompany) SetTargetValue(val MapOfStringToRefOfCompany, vw types.ValueWriter) RefOfMapOfStringToRefOfCompany {
return vw.WriteValue(val).(RefOfMapOfStringToRefOfCompany)
}
// MapOfStringToRefOfCompany
type MapOfStringToRefOfCompany struct {
@@ -405,7 +401,3 @@ func builderForRefOfCompany(r ref.Ref) types.RefBase {
func (r RefOfCompany) TargetValue(vr types.ValueReader) Company {
return vr.ReadValue(r.target).(Company)
}
func (r RefOfCompany) SetTargetValue(val Company, vw types.ValueWriter) RefOfCompany {
return vw.WriteValue(val).(RefOfCompany)
}

4
clients/crunchbase/index/sha1_91ae65b.go
View File

@@ -956,7 +956,3 @@ func builderForRefOfRound(r ref.Ref) types.RefBase {
func (r RefOfRound) TargetValue(vr types.ValueReader) Round {
return vr.ReadValue(r.target).(Round)
}
func (r RefOfRound) SetTargetValue(val Round, vw types.ValueWriter) RefOfRound {
return vw.WriteValue(val).(RefOfRound)
}

8
clients/facebook/facebook.noms.go
View File

@@ -210,10 +210,6 @@ func (r RefOfUser) TargetValue(vr types.ValueReader) User {
return vr.ReadValue(r.target).(User)
}
func (r RefOfUser) SetTargetValue(val User, vw types.ValueWriter) RefOfUser {
return vw.WriteValue(val).(RefOfUser)
}
// SetOfRefOfRemotePhoto
type SetOfRefOfRemotePhoto struct {
@@ -415,7 +411,3 @@ func builderForRefOfRemotePhoto(r ref.Ref) types.RefBase {
func (r RefOfRemotePhoto) TargetValue(vr types.ValueReader) RemotePhoto {
return vr.ReadValue(r.target).(RemotePhoto)
}
func (r RefOfRemotePhoto) SetTargetValue(val RemotePhoto, vw types.ValueWriter) RefOfRemotePhoto {
return vw.WriteValue(val).(RefOfRemotePhoto)
}

12
clients/flickr/types.noms.go
View File

@@ -343,10 +343,6 @@ func (r RefOfUser) TargetValue(vr types.ValueReader) User {
return vr.ReadValue(r.target).(User)
}
func (r RefOfUser) SetTargetValue(val User, vw types.ValueWriter) RefOfUser {
return vw.WriteValue(val).(RefOfUser)
}
// MapOfStringToRefOfAlbum
type MapOfStringToRefOfAlbum struct {
@@ -682,10 +678,6 @@ func (r RefOfAlbum) TargetValue(vr types.ValueReader) Album {
return vr.ReadValue(r.target).(Album)
}
func (r RefOfAlbum) SetTargetValue(val Album, vw types.ValueWriter) RefOfAlbum {
return vw.WriteValue(val).(RefOfAlbum)
}
// RefOfRemotePhoto
type RefOfRemotePhoto struct {
@@ -742,7 +734,3 @@ func builderForRefOfRemotePhoto(r ref.Ref) types.RefBase {
func (r RefOfRemotePhoto) TargetValue(vr types.ValueReader) RemotePhoto {
return vr.ReadValue(r.target).(RemotePhoto)
}
func (r RefOfRemotePhoto) SetTargetValue(val RemotePhoto, vw types.ValueWriter) RefOfRemotePhoto {
return vw.WriteValue(val).(RefOfRemotePhoto)
}

12
clients/picasa/picasa.noms.go
View File

@@ -343,10 +343,6 @@ func (r RefOfUser) TargetValue(vr types.ValueReader) User {
return vr.ReadValue(r.target).(User)
}
func (r RefOfUser) SetTargetValue(val User, vw types.ValueWriter) RefOfUser {
return vw.WriteValue(val).(RefOfUser)
}
// ListOfRefOfAlbum
type ListOfRefOfAlbum struct {
@@ -691,10 +687,6 @@ func (r RefOfAlbum) TargetValue(vr types.ValueReader) Album {
return vr.ReadValue(r.target).(Album)
}
func (r RefOfAlbum) SetTargetValue(val Album, vw types.ValueWriter) RefOfAlbum {
return vw.WriteValue(val).(RefOfAlbum)
}
// RefOfRemotePhoto
type RefOfRemotePhoto struct {
@@ -751,7 +743,3 @@ func builderForRefOfRemotePhoto(r ref.Ref) types.RefBase {
func (r RefOfRemotePhoto) TargetValue(vr types.ValueReader) RemotePhoto {
return vr.ReadValue(r.target).(RemotePhoto)
}
func (r RefOfRemotePhoto) SetTargetValue(val RemotePhoto, vw types.ValueWriter) RefOfRemotePhoto {
return vw.WriteValue(val).(RefOfRemotePhoto)
}

8
clients/pitchmap/index/types.noms.go
View File

@@ -462,10 +462,6 @@ func (r RefOfMapOfStringToValue) TargetValue(vr types.ValueReader) MapOfStringTo
return vr.ReadValue(r.target).(MapOfStringToValue)
}
func (r RefOfMapOfStringToValue) SetTargetValue(val MapOfStringToValue, vw types.ValueWriter) RefOfMapOfStringToValue {
return vw.WriteValue(val).(RefOfMapOfStringToValue)
}
// MapOfStringToValue
type MapOfStringToValue struct {
@@ -797,7 +793,3 @@ func builderForRefOfListOfPitch(r ref.Ref) types.RefBase {
func (r RefOfListOfPitch) TargetValue(vr types.ValueReader) ListOfPitch {
return vr.ReadValue(r.target).(ListOfPitch)
}
func (r RefOfListOfPitch) SetTargetValue(val ListOfPitch, vw types.ValueWriter) RefOfListOfPitch {
return vw.WriteValue(val).(RefOfListOfPitch)
}

4
clients/util/types.noms.go
View File

@@ -206,10 +206,6 @@ func (r RefOfMapOfStringToValue) TargetValue(vr types.ValueReader) MapOfStringTo
return vr.ReadValue(r.target).(MapOfStringToValue)
}
func (r RefOfMapOfStringToValue) SetTargetValue(val MapOfStringToValue, vw types.ValueWriter) RefOfMapOfStringToValue {
return vw.WriteValue(val).(RefOfMapOfStringToValue)
}
// MapOfStringToValue
type MapOfStringToValue struct {

4
datas/types.noms.go
View File

@@ -466,7 +466,3 @@ func builderForRefOfCommit(r ref.Ref) types.RefBase {
func (r RefOfCommit) TargetValue(vr types.ValueReader) Commit {
return vr.ReadValue(r.target).(Commit)
}
func (r RefOfCommit) SetTargetValue(val Commit, vw types.ValueWriter) RefOfCommit {
return vw.WriteValue(val).(RefOfCommit)
}

4
nomdl/codegen/go/ref.tmpl
View File

@@ -56,7 +56,3 @@ func builderFor{{.Name}}(r ref.Ref) {{$typesPackage}}RefBase {
func (r {{.Name}}) TargetValue(vr {{$typesPackage}}ValueReader) {{userType .ElemType}} {
return {{valueToUser "vr.ReadValue(r.target)" .ElemType}}
}
func (r {{.Name}}) SetTargetValue(val {{userType .ElemType}}, vw {{$typesPackage}}ValueWriter) {{.Name}} {
return vw.WriteValue({{userToValue "val" .ElemType}}).({{.Name}})
}

12
nomdl/codegen/test/gen/ref.noms.go
View File

@@ -168,10 +168,6 @@ func (r RefOfListOfString) TargetValue(vr types.ValueReader) ListOfString {
return vr.ReadValue(r.target).(ListOfString)
}
func (r RefOfListOfString) SetTargetValue(val ListOfString, vw types.ValueWriter) RefOfListOfString {
return vw.WriteValue(val).(RefOfListOfString)
}
// ListOfRefOfFloat32
type ListOfRefOfFloat32 struct {
@@ -371,10 +367,6 @@ func (r RefOfSetOfFloat32) TargetValue(vr types.ValueReader) SetOfFloat32 {
return vr.ReadValue(r.target).(SetOfFloat32)
}
func (r RefOfSetOfFloat32) SetTargetValue(val SetOfFloat32, vw types.ValueWriter) RefOfSetOfFloat32 {
return vw.WriteValue(val).(RefOfSetOfFloat32)
}
// ListOfString
type ListOfString struct {
@@ -574,10 +566,6 @@ func (r RefOfFloat32) TargetValue(vr types.ValueReader) float32 {
return float32(vr.ReadValue(r.target).(types.Float32))
}
func (r RefOfFloat32) SetTargetValue(val float32, vw types.ValueWriter) RefOfFloat32 {
return vw.WriteValue(types.Float32(val)).(RefOfFloat32)
}
// SetOfFloat32
type SetOfFloat32 struct {

6
nomdl/codegen/test/gen/struct_with_dup_list.noms.js
View File

@@ -8,8 +8,10 @@ import {
Package as _Package,
createStructClass as _createStructClass,
makeCompoundType as _makeCompoundType,
makeListType as _makeListType,
makeStructType as _makeStructType,
makeType as _makeType,
newList as _newList,
registerPackage as _registerPackage,
uint8Type as _uint8Type,
} from '@attic/noms';
@@ -53,3 +55,7 @@ interface StructWithDupList$Interface extends _Struct {
}
export const StructWithDupList: Class<StructWithDupList$Interface> = _createStructClass(StructWithDupList$type, StructWithDupList$typeDef);
export function newListOfUint8(values: Array<_uint8>): Promise<_NomsList<_uint8>> {
return _newList(values, _makeListType(_uint8Type));
}

6
nomdl/codegen/test/gen/struct_with_list.noms.js
View File

@@ -10,10 +10,8 @@ import {
createStructClass as _createStructClass,
int64Type as _int64Type,
makeCompoundType as _makeCompoundType,
makeListType as _makeListType,
makeStructType as _makeStructType,
makeType as _makeType,
newList as _newList,
registerPackage as _registerPackage,
stringType as _stringType,
uint8Type as _uint8Type,
@@ -74,7 +72,3 @@ interface StructWithList$Interface extends _Struct {
}
export const StructWithList: Class<StructWithList$Interface> = _createStructClass(StructWithList$type, StructWithList$typeDef);
export function newListOfUint8(values: Array<_uint8>): Promise<_NomsList<_uint8>> {
return _newList(values, _makeListType(_uint8Type));
}

31
nomdl/codegen/test/ref_test.go
View File

@@ -10,34 +10,8 @@ import (
"github.com/stretchr/testify/assert"
)
func SkipTestRef(t *testing.T) {
assert := assert.New(t)
ds := datas.NewDataStore(chunks.NewMemoryStore())
l := gen.ListOfStringDef{"a", "b", "c"}.New()
l2 := gen.ListOfStringDef{"d", "e", "f"}.New()
lRef := l.Ref()
r := gen.NewRefOfListOfString(lRef)
v := ds.ReadValue(l.Ref())
assert.Nil(v)
assert.Panics(func() { r.TargetValue(ds) })
r2 := r.SetTargetValue(l, ds)
assert.True(r.Equals(r2))
v2 := r2.TargetValue(ds)
v3 := r.TargetValue(ds)
assert.True(v2.Equals(v3))
r3 := r2.SetTargetValue(l2, ds)
assert.False(r.Equals(r3))
}
func TestListOfRef(t *testing.T) {
assert := assert.New(t)
ds := datas.NewDataStore(chunks.NewMemoryStore())
a := types.Float32(0)
ra := a.Ref()
@@ -49,11 +23,6 @@ func TestListOfRef(t *testing.T) {
def := l.Def()
assert.EqualValues(ra, def[0])
l = l.Set(0, r.SetTargetValue(1, ds))
r3 := l.Get(0)
assert.False(r.Equals(r3))
assert.Panics(func() { r.TargetValue(ds) })
}
func TestStructWithRef(t *testing.T) {

5
types/ref.go
View File

@@ -54,8 +54,3 @@ func (r Ref) Less(other OrderedValue) bool {
func (r Ref) TargetValue(vr ValueReader) Value {
return vr.ReadValue(r.target)
}
func (r Ref) SetTargetValue(val Value, vw ValueWriter) Ref {
assertType(r.t.Desc.(CompoundDesc).ElemTypes[0], val)
return newRef(vw.WriteValue(val).TargetRef(), r.t)
}

24
types/ref_test.go
View File

@@ -39,30 +39,6 @@ func TestRefInMap(t *testing.T) {
assert.Equal(int32(1), int32(i.(Int32)))
}
func TestRefType(t *testing.T) {
assert := assert.New(t)
vs := NewTestValueStore()
tr := MakeCompoundType(RefKind, MakePrimitiveType(ValueKind))
l := NewList()
r := NewRef(l.Ref())
assert.True(r.Type().Equals(tr))
m := NewMap()
r2 := r.SetTargetValue(m, vs)
assert.True(r2.Type().Equals(tr))
b := Bool(true)
r2 = r.SetTargetValue(b, vs)
r2.t = MakeCompoundType(RefKind, b.Type())
r3 := r2.SetTargetValue(Bool(false), vs)
assert.True(r2.Type().Equals(r3.Type()))
assert.Panics(func() { r2.SetTargetValue(Int16(1), vs) })
}
func TestRefChunks(t *testing.T) {
assert := assert.New(t)