Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Directory structure changes #7

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Directory structure changes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
.PHONY: go
VERSION_FILE=VERSION
FEAST_VERSION=`cat $(VERSION_FILE)`

build-deps:
$(MAKE) -C protos gen-go
dep ensure

build-cli:
$(MAKE) build-deps
$(MAKE) -C cli build-all

install-cli:
@$(MAKE) build-deps
cd cli/feast && go install
build-java:
mvn clean verify -Drevision=$(FEAST_VERSION)

build-docker:
docker build -t $(registry)/feast-core:$(version) -f docker/core/Dockerfile .
Expand Down
1 change: 1 addition & 0 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.3.0
10 changes: 8 additions & 2 deletions cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.PHONY: go
VERSION_FILE=../VERSION
FEAST_VERSION=`cat $(VERSION_FILE)`

build-all:
@$(MAKE) cli-linux cli-darwin
Expand All @@ -8,10 +10,14 @@ cli-linux:
mkdir -p bin
export GOOS=linux; \
export GOARCH=amd64; \
mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
mkdir -p bin/$$GOOS-$$GOARCH && go build \
-ldflags "-X main.Version=$(FEAST_VERSION)" \
-o bin/$$GOOS-$$GOARCH/feast feast/main.go

.PHONY: cli-darwin
cli-darwin:
export GOOS=darwin; \
export GOARCH=amd64; \
mkdir -p bin/$$GOOS-$$GOARCH && go build -o bin/$$GOOS-$$GOARCH/feast feast/main.go
mkdir -p bin/$$GOOS-$$GOARCH && go build \
-ldflags "-X main.Version=$(FEAST_VERSION)" \
-o bin/$$GOOS-$$GOARCH/feast feast/main.go
2 changes: 1 addition & 1 deletion cli/feast/cmd/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"path/filepath"

"github.com/gojektech/feast/cli/feast/pkg/parse"
"github.com/gojektech/feast/go-feast-proto/feast/core"
"github.com/gojektech/feast/protos/generated/go/feast/core"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/feast/cmd/jobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/gojektech/feast/cli/feast/pkg/parse"
"github.com/gojektech/feast/cli/feast/pkg/printer"
"github.com/gojektech/feast/go-feast-proto/feast/core"
"github.com/gojektech/feast/protos/generated/go/feast/core"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/feast/cmd/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"text/tabwriter"

"github.com/gojektech/feast/cli/feast/pkg/util"
"github.com/gojektech/feast/go-feast-proto/feast/core"
"github.com/gojektech/feast/protos/generated/go/feast/core"

"github.com/golang/protobuf/ptypes/empty"
"github.com/spf13/cobra"
Expand Down
10 changes: 8 additions & 2 deletions cli/feast/cmd/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@ import (
"github.com/spf13/cobra"
)

var version = "0.3.0"
// Version is the cli version, injected at compile time
var version string

var versionCmd = &cobra.Command{
Use: "version",
Short: "feast cli version",
Run: func(cmd *cobra.Command, args []string) {
fmt.Printf("CLI version: %s\n", version)
fmt.Println(version)
},
}

func init() {
rootCmd.AddCommand(versionCmd)
}

// SetVersion sets the version to the given version.
func SetVersion(v string) {
version = v
}
8 changes: 7 additions & 1 deletion cli/feast/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@

package main

import "github.com/gojektech/feast/cli/feast/cmd"
import (
"github.com/gojektech/feast/cli/feast/cmd"
)

// Version is the Feast version
var Version string

func main() {
cmd.SetVersion(Version)
cmd.Execute()
}
4 changes: 2 additions & 2 deletions cli/feast/pkg/parse/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/ghodss/yaml"

"github.com/gojektech/feast/go-feast-proto/feast/specs"
"github.com/gojektech/feast/go-feast-proto/feast/types"
"github.com/gojektech/feast/protos/generated/go/feast/specs"
"github.com/gojektech/feast/protos/generated/go/feast/types"
)

// YamlToFeatureSpec parses the given yaml and outputs the corresponding
Expand Down
4 changes: 2 additions & 2 deletions cli/feast/pkg/parse/yaml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"github.com/golang/protobuf/ptypes/timestamp"

"github.com/gojektech/feast/go-feast-proto/feast/specs"
"github.com/gojektech/feast/go-feast-proto/feast/types"
"github.com/gojektech/feast/protos/generated/go/feast/specs"
"github.com/gojektech/feast/protos/generated/go/feast/types"

"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/feast/pkg/printer/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"strings"

"github.com/gojektech/feast/cli/feast/pkg/util"
"github.com/gojektech/feast/go-feast-proto/feast/core"
"github.com/gojektech/feast/protos/generated/go/feast/core"
)

// PrintJobDetail pretty prints the given job detail
Expand Down
1 change: 0 additions & 1 deletion core/src/main/proto
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions core/src/main/proto/feast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../protos/feast
1 change: 1 addition & 0 deletions core/src/main/proto/third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../protos/third_party
1 change: 0 additions & 1 deletion ingestion/src/main/proto
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ingestion/src/main/proto/feast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../protos/feast
1 change: 1 addition & 0 deletions ingestion/src/main/proto/third_party
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../protos/third_party
2 changes: 1 addition & 1 deletion protos/feast/core/CoreService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import "google/protobuf/empty.proto";

option java_package = "feast.core";
option java_outer_classname = "CoreServiceProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";

service CoreService {
/*
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/JobService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto";

option java_package = "feast.core";
option java_outer_classname = "JobServiceProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";

service JobService {
// Submit a job to feast to run. Returns the job id.
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/core/UIService.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import "google/protobuf/timestamp.proto";

option java_package = "feast.core";
option java_outer_classname = "UIServiceProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/core";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/core";

service UIService {
/*
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/serving/Serving.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import "feast/types/Value.proto";

option java_package = "feast.serving";
option java_outer_classname = "ServingAPIProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/serving";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/serving";

service ServingAPI {
// Query features from Feast
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/specs/EntitySpec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package feast.specs;

option java_package = "feast.specs";
option java_outer_classname = "EntitySpecProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";

message EntitySpec {
string name = 1;
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/specs/FeatureGroupSpec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package feast.specs;

option java_package = "feast.specs";
option java_outer_classname = "FeatureGroupSpecProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";

message FeatureGroupSpec {
string id = 1;
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/specs/FeatureSpec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package feast.specs;

option java_package = "feast.specs";
option java_outer_classname = "FeatureSpecProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";

message FeatureSpec {
string id = 1;
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/specs/ImportSpec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package feast.specs;

option java_package = "feast.specs";
option java_outer_classname = "ImportSpecProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";

import "feast/types/Value.proto";
import "google/protobuf/timestamp.proto";
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/specs/StorageSpec.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package feast.specs;

option java_package = "feast.specs";
option java_outer_classname = "StorageSpecProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/specs";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/specs";

message StorageSpec {
// unique identifier for this instance
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/storage/BigTable.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package feast.storage;

option java_outer_classname = "BigTableProto";
option java_package = "feast.storage";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/storage";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/storage";

message BigTableRowKey {
// This should be the first 7 characters of a sha1 of the entityKey proto encoded
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/storage/Redis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package feast.storage;

option java_outer_classname = "RedisProto";
option java_package = "feast.storage";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/storage";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/storage";

message RedisBucketKey {
// Field number 1 is reserved for a future distributing hash if needed
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/types/Feature.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package feast.types;

option java_package = "feast.types";
option java_outer_classname = "FeatureProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";

message Feature {
string id = 1;
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/types/FeatureRow.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package feast.types;

option java_package = "feast.types";
option java_outer_classname = "FeatureRowProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";


message FeatureRow {
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/types/FeatureRowExtended.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package feast.types;

option java_package = "feast.types";
option java_outer_classname = "FeatureRowExtendedProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";

message Error {
string cause = 1; // exception class name
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/types/Granularity.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package feast.types;

option java_package = "feast.types";
option java_outer_classname = "GranularityProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";

message Granularity {
enum Enum {
Expand Down
2 changes: 1 addition & 1 deletion protos/feast/types/Value.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package feast.types;

option java_package = "feast.types";
option java_outer_classname = "ValueProto";
option go_package = "github.com/gojektech/feast/go-feast-proto/feast/types";
option go_package = "github.com/gojektech/feast/protos/generated/go/feast/types";

message ValueType {
enum Enum {
Expand Down
Loading