Skip to content

Commit 05bb838

Browse files
author
zhilingc
committed
Remove status and created timestamp from constructor
1 parent 438e4ac commit 05bb838

6 files changed

Lines changed: 16 additions & 24 deletions

File tree

‎.prow/scripts/test-end-to-end-batch.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ nohup /tmp/kafka/bin/zookeeper-server-start.sh /tmp/kafka/config/zookeeper.prope
7676
sleep 5
7777
tail -n10 /var/log/zookeeper.log
7878
nohup /tmp/kafka/bin/kafka-server-start.sh /tmp/kafka/config/server.properties &> /var/log/kafka.log 2>&1 &
79-
sleep 15
79+
sleep 20
8080
tail -n10 /var/log/kafka.log
8181

8282
echo "
@@ -143,7 +143,7 @@ EOF
143143
nohup java -jar core/target/feast-core-0.3.2-SNAPSHOT.jar \
144144
--spring.config.location=file:///tmp/core.application.yml \
145145
&> /var/log/feast-core.log &
146-
sleep 30
146+
sleep 35
147147
tail -n10 /var/log/feast-core.log
148148
echo "
149149
============================================================

‎.prow/scripts/test-end-to-end.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ nohup /tmp/kafka/bin/zookeeper-server-start.sh /tmp/kafka/config/zookeeper.prope
5959
sleep 5
6060
tail -n10 /var/log/zookeeper.log
6161
nohup /tmp/kafka/bin/kafka-server-start.sh /tmp/kafka/config/server.properties &> /var/log/kafka.log 2>&1 &
62-
sleep 15
62+
sleep 20
6363
tail -n10 /var/log/kafka.log
6464

6565
echo "
@@ -126,7 +126,7 @@ EOF
126126
nohup java -jar core/target/feast-core-0.3.2-SNAPSHOT.jar \
127127
--spring.config.location=file:///tmp/core.application.yml \
128128
&> /var/log/feast-core.log &
129-
sleep 30
129+
sleep 35
130130
tail -n10 /var/log/feast-core.log
131131

132132
echo "

‎sdk/python/feast/feature_set.py‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ def __init__(
4545
features: List[Feature] = None,
4646
entities: List[Entity] = None,
4747
source: Source = None,
48-
max_age: Optional[Duration] = None,
49-
status: FeatureSetStatus = None,
50-
created_timestamp: Optional[Timestamp] = None,
48+
max_age: Optional[Duration] = None
5149
):
5250
self._name = name
5351
self._fields = OrderedDict() # type: Dict[str, Field]
@@ -62,8 +60,8 @@ def __init__(
6260
self._max_age = max_age
6361
self._version = None
6462
self._client = None
65-
self._status = status
66-
self._created_timestamp = created_timestamp
63+
self._status = None
64+
self._created_timestamp = None
6765

6866
def __eq__(self, other):
6967
if not isinstance(other, FeatureSet):
@@ -511,15 +509,11 @@ def from_proto(cls, feature_set_proto: FeatureSetProto):
511509
None
512510
if feature_set_proto.spec.source.type == 0
513511
else Source.from_proto(feature_set_proto.spec.source)
514-
),
515-
status=(
516-
None
517-
if feature_set_proto.meta.status == 0
518-
else feature_set_proto.meta.status
519-
),
520-
created_timestamp=feature_set_proto.meta.created_timestamp,
512+
)
521513
)
522514
feature_set._version = feature_set_proto.spec.version
515+
feature_set._status = feature_set_proto.meta.status
516+
feature_set._created_timestamp = feature_set_proto.meta.created_timestamp
523517
return feature_set
524518

525519
def to_proto(self) -> FeatureSetProto:

‎tests/e2e/basic-ingest-redis-serving.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def basic_dataframe():
7070
)
7171

7272

73-
@pytest.mark.timeout(300)
73+
@pytest.mark.timeout(45)
7474
@pytest.mark.run(order=10)
7575
def test_basic_register_feature_set_success(client):
7676
# Load feature set from file
@@ -96,7 +96,7 @@ def test_basic_register_feature_set_success(client):
9696
)
9797

9898

99-
@pytest.mark.timeout(45)
99+
@pytest.mark.timeout(300)
100100
@pytest.mark.run(order=11)
101101
def test_basic_ingest_success(client, basic_dataframe):
102102
cust_trans_fs = client.get_feature_set(name="customer_transactions")
@@ -202,7 +202,7 @@ def all_types_dataframe():
202202
)
203203

204204

205-
@pytest.mark.timeout(300)
205+
@pytest.mark.timeout(45)
206206
@pytest.mark.run(order=20)
207207
def test_all_types_register_feature_set_success(client):
208208
all_types_fs_expected = FeatureSet(
@@ -246,7 +246,7 @@ def test_all_types_register_feature_set_success(client):
246246
)
247247

248248

249-
@pytest.mark.timeout(45)
249+
@pytest.mark.timeout(300)
250250
@pytest.mark.run(order=21)
251251
def test_all_types_ingest_success(client, all_types_dataframe):
252252
# Get all_types feature set
@@ -322,7 +322,7 @@ def large_volume_dataframe():
322322
return customer_data
323323

324324

325-
@pytest.mark.timeout(300)
325+
@pytest.mark.timeout(45)
326326
@pytest.mark.run(order=30)
327327
def test_large_volume_register_feature_set_success(client):
328328
cust_trans_fs_expected = FeatureSet.from_yaml(

‎tests/e2e/bq-batch-retrieval.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,9 @@ def test_multiple_featureset_joins(client):
174174
)
175175

176176
client.apply(fs1)
177-
time.sleep(10)
178177
fs1 = client.get_feature_set(name="feature_set_1", version=1)
179178

180179
client.apply(fs2)
181-
time.sleep(10)
182180
fs2 = client.get_feature_set(name="feature_set_2", version=1)
183181

184182
N_ROWS = 10

‎tests/e2e/large_volume/cust_trans_large_fs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
kind: feature_set
12
spec:
23
name: customer_transactions_large
3-
kind: feature_set
44
entities:
55
- name: customer_id
66
valueType: INT64

0 commit comments

Comments
 (0)