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

Normalization with empty catalog #4020

Merged
merged 3 commits into from
Jun 10, 2021
Merged

Normalization with empty catalog #4020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c3bec4
Normalization with empty catalog
ChristopheDuong Jun 10, 2021
c50e75a
bumpversion normalization
ChristopheDuong Jun 10, 2021
e00a60f
Fix test on empty streams
ChristopheDuong Jun 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-integrations/bases/base-normalization/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ WORKDIR /airbyte
ENV AIRBYTE_ENTRYPOINT "/airbyte/entrypoint.sh"
ENTRYPOINT ["/airbyte/entrypoint.sh"]

LABEL io.airbyte.version=0.1.32
LABEL io.airbyte.version=0.1.33
LABEL io.airbyte.name=airbyte/normalization
3 changes: 1 addition & 2 deletions airbyte-integrations/bases/base-normalization/integration_tests/test_ephemeral.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ def test_destination_failure_over_limits(integration_type: str, column_count: in


def test_empty_streams(setup_test_path):
with pytest.raises(EOFError):
run_test(DestinationType.POSTGRES, 0)
run_test(DestinationType.POSTGRES, 0)


def test_stream_with_1_airbyte_column(setup_test_path):
Expand Down
7 changes: 0 additions & 7 deletions ...ntegrations/bases/base-normalization/normalization/transform_catalog/catalog_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ def process(self, catalog_file: str, json_column_name: str, default_schema: str)
tables_registry=tables_registry,
)
for stream_processor in stream_processors:
# Check properties
if not stream_processor.properties:
raise EOFError("Invalid Catalog: Unexpected empty properties in catalog")
stream_processor.collect_table_names()
for conflict in tables_registry.resolve_names():
print(
Expand Down Expand Up @@ -143,10 +140,6 @@ def build_stream_processor(

from_table = "source('{}', '{}')".format(schema_name, raw_table_name)

# Check properties
if not properties:
raise EOFError("Invalid Catalog: Unexpected empty properties in catalog")

stream_processor = StreamProcessor.create(
stream_name=stream_name,
destination_type=destination_type,
Expand Down
2 changes: 1 addition & 1 deletion ...integrations/bases/base-normalization/normalization/transform_catalog/stream_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def process(self) -> List["StreamProcessor"]:
"""
# Check properties
if not self.properties:
print(f" Ignoring substream '{self.stream_name}' from {self.current_json_path()} because properties list is empty")
print(f" Ignoring stream '{self.stream_name}' from {self.current_json_path()} because properties list is empty")
return []

column_names = self.extract_column_names()
Expand Down
2 changes: 1 addition & 1 deletion ...te-workers/src/main/java/io/airbyte/workers/normalization/DefaultNormalizationRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class DefaultNormalizationRunner implements NormalizationRunner {

private static final Logger LOGGER = LoggerFactory.getLogger(DefaultNormalizationRunner.class);

public static final String NORMALIZATION_IMAGE_NAME = "airbyte/normalization:0.1.32";
public static final String NORMALIZATION_IMAGE_NAME = "airbyte/normalization:0.1.33";

private final DestinationType destinationType;
private final ProcessFactory processFactory;
Expand Down