Mercurial > gemma
changeset 5020:e4ab338e7ba9
Removed unnecessary creatings of empty slices in expressing read dependencies in imports.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Sat, 14 Mar 2020 20:11:10 +0100 |
parents | dc3d648bdf4a |
children | 6fe3662aafeb 81fb077cd3f8 |
files | pkg/imports/dma.go pkg/imports/dmv.go pkg/imports/dsec.go pkg/imports/dst.go pkg/imports/fm.go pkg/imports/stsh.go pkg/imports/wa.go pkg/imports/wx.go |
diffstat | 8 files changed, 20 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/dma.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/dma.go Sat Mar 14 20:11:10 2020 +0100 @@ -62,10 +62,7 @@ func (dmaJobCreator) Create() Job { return new(DistanceMarksAshore) } func (dmaJobCreator) Depends() [2][]string { - return [2][]string{ - {"distance_marks"}, - {}, - } + return [2][]string{{"distance_marks"}} } // StageDone is a NOP for distance marks imports.
--- a/pkg/imports/dmv.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/dmv.go Sat Mar 14 20:11:10 2020 +0100 @@ -55,10 +55,7 @@ func (dmvJobCreator) Create() Job { return new(DistanceMarksVirtual) } func (dmvJobCreator) Depends() [2][]string { - return [2][]string{ - {"distance_marks_virtual"}, - {}, - } + return [2][]string{{"distance_marks_virtual"}} } // StageDone does nothing as there is no staging for distance marks virtual.
--- a/pkg/imports/dsec.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/dsec.go Sat Mar 14 20:11:10 2020 +0100 @@ -40,10 +40,7 @@ func (dsecJobCreator) Create() Job { return new(DeleteSection) } func (dsecJobCreator) Depends() [2][]string { - return [2][]string{ - {"sections"}, - {}, - } + return [2][]string{{"sections"}} } const (
--- a/pkg/imports/dst.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/dst.go Sat Mar 14 20:11:10 2020 +0100 @@ -39,10 +39,7 @@ func (dstJobCreator) Create() Job { return new(DeleteStretch) } func (dstJobCreator) Depends() [2][]string { - return [2][]string{ - {"stretches"}, - {}, - } + return [2][]string{{"stretches"}} } const (
--- a/pkg/imports/fm.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/fm.go Sat Mar 14 20:11:10 2020 +0100 @@ -211,7 +211,7 @@ RegisterJobCreator(BCNLATHYDROJobKind, &WFSFeatureJobCreator{ description: "fairway marks bcnlat (HYDRO)", - depends: [2][]string{{"fairway_marks_bcnlat_hydro"}, {}}, + depends: [2][]string{{"fairway_marks_bcnlat_hydro"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("bcnlat_hydro", @@ -226,7 +226,7 @@ RegisterJobCreator(BCNLATIENCJobKind, &WFSFeatureJobCreator{ description: "fairway marks bcnlat (IENC)", - depends: [2][]string{{"fairway_marks_bcnlat_ienc"}, {}}, + depends: [2][]string{{"fairway_marks_bcnlat_ienc"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("bcnlat_ienc", @@ -242,7 +242,7 @@ RegisterJobCreator(BOYLATHYDROJobKind, &WFSFeatureJobCreator{ description: "fairway marks boylat (HYDRO)", - depends: [2][]string{{"fairway_marks_boylat_hydro"}, {}}, + depends: [2][]string{{"fairway_marks_boylat_hydro"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("boylat_hydro", @@ -258,7 +258,7 @@ RegisterJobCreator(BOYLATIENCJobKind, &WFSFeatureJobCreator{ description: "fairway marks boylat (IENC)", - depends: [2][]string{{"fairway_marks_boylat_ienc"}, {}}, + depends: [2][]string{{"fairway_marks_boylat_ienc"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("boylat_ienc", @@ -274,7 +274,7 @@ RegisterJobCreator(BOYCARJobKind, &WFSFeatureJobCreator{ description: "fairway marks boycar", - depends: [2][]string{{"fairway_marks_boycar"}, {}}, + depends: [2][]string{{"fairway_marks_boycar"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("boycar", @@ -290,7 +290,7 @@ RegisterJobCreator(BOYSAWJobKind, &WFSFeatureJobCreator{ description: "fairway marks boysaw", - depends: [2][]string{{"fairway_marks_boysaw"}, {}}, + depends: [2][]string{{"fairway_marks_boysaw"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("boysaw", @@ -305,7 +305,7 @@ RegisterJobCreator(BOYSPPJobKind, &WFSFeatureJobCreator{ description: "fairway marks boyspp", - depends: [2][]string{{"fairway_marks_boyspp"}, {}}, + depends: [2][]string{{"fairway_marks_boyspp"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("boyspp", @@ -321,7 +321,7 @@ RegisterJobCreator(DAYMARHYDROJobKind, &WFSFeatureJobCreator{ description: "fairway marks daymar (HYDRO)", - depends: [2][]string{{"fairway_marks_daymar_hydro"}, {}}, + depends: [2][]string{{"fairway_marks_daymar_hydro"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("daymar_hydro", @@ -336,7 +336,7 @@ RegisterJobCreator(DAYMARIENCJobKind, &WFSFeatureJobCreator{ description: "fairway marks daymar (IENC)", - depends: [2][]string{{"fairway_marks_daymar_ienc"}, {}}, + depends: [2][]string{{"fairway_marks_daymar_ienc"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("daymar_ienc", @@ -352,7 +352,7 @@ RegisterJobCreator(LIGHTSJobKind, &WFSFeatureJobCreator{ description: "fairway marks lights", - depends: [2][]string{{"fairway_marks_lights"}, {}}, + depends: [2][]string{{"fairway_marks_lights"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("lights", @@ -371,7 +371,7 @@ RegisterJobCreator(NOTMRKJobKind, &WFSFeatureJobCreator{ description: "fairway marks notmrk", - depends: [2][]string{{"fairway_marks_lights"}, {}}, + depends: [2][]string{{"fairway_marks_lights"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("notmrk", @@ -390,7 +390,7 @@ RegisterJobCreator(RTPBCNJobKind, &WFSFeatureJobCreator{ description: "fairway marks rtpbcn", - depends: [2][]string{{"fairway_marks_rtpbcn"}, {}}, + depends: [2][]string{{"fairway_marks_rtpbcn"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("rtpbcn", @@ -405,7 +405,7 @@ RegisterJobCreator(TOPMARJobKind, &WFSFeatureJobCreator{ description: "fairway marks topmar", - depends: [2][]string{{"fairway_marks_topmar"}, {}}, + depends: [2][]string{{"fairway_marks_topmar"}}, newConsumer: newSQLConsumer( prepareStmnts( createInsertFMSQL("topmar",
--- a/pkg/imports/stsh.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/stsh.go Sat Mar 14 20:11:10 2020 +0100 @@ -50,10 +50,7 @@ func (stshJobCreator) Create() Job { return new(StretchShape) } func (stshJobCreator) Depends() [2][]string { - return [2][]string{ - {"stretches", "stretch_countries"}, - {}, - } + return [2][]string{{"stretches", "stretch_countries"}} } const (
--- a/pkg/imports/wa.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/wa.go Sat Mar 14 20:11:10 2020 +0100 @@ -66,10 +66,7 @@ func (waJobCreator) Create() Job { return new(WaterwayArea) } func (waJobCreator) Depends() [2][]string { - return [2][]string{ - {"waterway_area"}, - {}, - } + return [2][]string{{"waterway_area"}} } // StageDone is a NOP for waterway area imports.
--- a/pkg/imports/wx.go Fri Mar 13 19:14:45 2020 +0100 +++ b/pkg/imports/wx.go Sat Mar 14 20:11:10 2020 +0100 @@ -21,7 +21,7 @@ RegisterJobCreator(WXJobKind, &WFSFeatureJobCreator{ description: "waterway axis", - depends: [2][]string{{"waterway_axis"}, {}}, + depends: [2][]string{{"waterway_axis"}}, newConsumer: newSQLConsumer( prepareStmnts(insertWaterwayAxisSQL), consume,