Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Glue:get_table_version() - Add VersionId/UpdateTime fields (#5940)

Browse Source
This commit is contained in:
Bert Blommers 2023-02-17 10:35:15 -01:00 committed by GitHub
parent 418c69f477
commit 768a8884ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
moto/glue/models.py
View File

@ -130,7 +130,7 @@ class GlueBackend(BaseBackend):
database.tables[table_name] = table database.tables[table_name] = table
return table return table
def get_table(self, database_name, table_name): def get_table(self, database_name: str, table_name: str) -> "FakeTable":
database = self.get_database(database_name) database = self.get_database(database_name)
try: try:
return database.tables[table_name] return database.tables[table_name]
@ -165,6 +165,10 @@ class GlueBackend(BaseBackend):
raise TableNotFoundException(table_name) raise TableNotFoundException(table_name)
return {} return {}
def update_table(self, database_name, table_name: str, table_input) -> None:
table = self.get_table(database_name, table_name)
table.update(table_input)
def get_partitions(self, database_name, table_name, expression): def get_partitions(self, database_name, table_name, expression):
""" """
See https://docs.aws.amazon.com/glue/latest/webapi/API_GetPartitions.html See https://docs.aws.amazon.com/glue/latest/webapi/API_GetPartitions.html
@ -769,16 +773,17 @@ class FakeDatabase(BaseModel):
class FakeTable(BaseModel): class FakeTable(BaseModel):
def __init__(self, database_name, table_name, table_input): def __init__(self, database_name: str, table_name: str, table_input):
self.database_name = database_name self.database_name = database_name
self.name = table_name self.name = table_name
self.partitions = OrderedDict() self.partitions = OrderedDict()
self.created_time = datetime.utcnow() self.created_time = datetime.utcnow()
self.versions = [] self.updated_time = None
self.update(table_input) self.versions = [table_input]
def update(self, table_input): def update(self, table_input):
self.versions.append(table_input) self.versions.append(table_input)
self.updated_time = datetime.utcnow()
def get_version(self, ver): def get_version(self, ver):
try: try:
@ -798,8 +803,12 @@ class FakeTable(BaseModel):
"DatabaseName": self.database_name, "DatabaseName": self.database_name,
"Name": self.name, "Name": self.name,
"CreateTime": unix_time(self.created_time), "CreateTime": unix_time(self.created_time),
**self.get_version(version),
# Add VersionId after we get the version-details, just to make sure that it's a valid version (int)
"VersionId": str(int(version) + 1),
} }
obj.update(self.get_version(version)) if self.updated_time is not None:
obj["UpdateTime"] = unix_time(self.updated_time)
return obj return obj
def create_partition(self, partiton_input): def create_partition(self, partiton_input):

3
moto/glue/responses.py
View File

@ -66,8 +66,7 @@ class GlueResponse(BaseResponse):
database_name = self.parameters.get("DatabaseName") database_name = self.parameters.get("DatabaseName")
table_input = self.parameters.get("TableInput") table_input = self.parameters.get("TableInput")
table_name = table_input.get("Name") table_name = table_input.get("Name")
table = self.glue_backend.get_table(database_name, table_name) self.glue_backend.update_table(database_name, table_name, table_input)
table.update(table_input)
return "" return ""
def get_table_versions(self): def get_table_versions(self):

2
tests/test_glue/test_datacatalog.py
View File

@ -339,11 +339,13 @@ def test_get_table_versions():
for n, ver in enumerate(vers): for n, ver in enumerate(vers):
n = str(n + 1) n = str(n + 1)
ver["VersionId"].should.equal(n) ver["VersionId"].should.equal(n)
ver["Table"]["VersionId"].should.equal(n)
ver["Table"]["Name"].should.equal(table_name) ver["Table"]["Name"].should.equal(table_name)
ver["Table"]["StorageDescriptor"].should.equal( ver["Table"]["StorageDescriptor"].should.equal(
version_inputs[n]["StorageDescriptor"] version_inputs[n]["StorageDescriptor"]
) )
ver["Table"]["PartitionKeys"].should.equal(version_inputs[n]["PartitionKeys"]) ver["Table"]["PartitionKeys"].should.equal(version_inputs[n]["PartitionKeys"])
ver["Table"].should.have.key("UpdateTime")
response = helpers.get_table_version(client, database_name, table_name, "3") response = helpers.get_table_version(client, database_name, table_name, "3")
ver = response["TableVersion"] ver = response["TableVersion"]