Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Python: Integration tests - #6398

Merged
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests
Mar 15, 2023
Merged

Python: Integration tests#6398
Fokko merged 29 commits into
apache:masterfrom
Fokko:fd-integration-tests

Conversation

@Fokko

@FokkoFokko commented Dec 9, 2022

Copy link
Copy Markdown
Contributor

This is the first version of a framework to read Iceberg tables, produced by Spark, using PyIceberg. This makes it easier to run end-to-end tests and also validate the behavior of PyArrow and DuckDB.

@Fokko
Fokkoforce-pushed the fd-integration-tests branch from ad9dae5 to 05b8aedCompareDecember 9, 2022 22:11
@Fokko
Fokkoforce-pushed the fd-integration-tests branch from e8fc9e1 to 79b8e36CompareDecember 11, 2022 21:12
@FokkoFokko mentioned this pull request Dec 21, 2022
@FokkoFokko mentioned this pull request Jan 11, 2023
4 tasks
@FokkoFokko added this to the Python 0.4.0 release milestone Jan 30, 2023
python-version: '3.9'
cache: poetry
cache-dependency-path: |
./python/poetry.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be more than just the lock file?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you change the dependencies, you need to regenerate the lock file. So that should be enough

Comment threadpython/dev/spark-defaults.conf Outdated

spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.demo org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.demo.catalog-impl org.apache.iceberg.rest.RESTCatalog

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type=rest?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less is more, thanks!

- minio:minio
rest:
image: tabulario/iceberg-rest:0.2.0
container_name: pyiceberg-rest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this store the underlying catalog metadata?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An in-memory SQLite

def visit_is_nan(self, term: BoundTerm[Any]) -> pc.Expression:
ref = pc.field(term.ref().field.name)
return ref.is_null(nan_is_null=True) & ref.is_valid()
return pc.is_nan(ref)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably shouldn't be in this PR right? Seems like an update with a new version of pyarrow?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually to make the CI pass. I've created a PR to allow ref.is_nan() as well, but this is not released yet.

table: Table,
row_filter: Union[str, BooleanExpression] = ALWAYS_TRUE,
selected_fields: Tuple[str] = ("*",),
selected_fields: Tuple[str, ...] = ("*",),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also seems like a separate PR change, but good cleanup.

Comment threadpython/tests/test_integration.py Outdated
arrow_table = table_test_null_nan.scan(row_filter=IsNaN("col_numeric"), selected_fields=("idx", "col_numeric")).to_arrow()
assert len(arrow_table) == 1
assert arrow_table[0][0].as_py() == 1
assert math.isnan(arrow_table[1][0].as_py())

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be easier to read these tests if you called as_py() to produce rows and validated the rows. It looks like there's just one row, but the row/column indexes are backward because this is columnar?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me rewrite those tests a bit

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed it into assert math.isnan(arrow_table["col_numeric"][0].as_py())

Comment threadpython/tests/test_integration.py Outdated
def test_duckdb_nan(table_test_null_nan_rewritten: Table) -> None:
con = table_test_null_nan_rewritten.scan().to_duckdb("table_test_null_nan")
result = con.query("SELECT idx FROM table_test_null_nan WHERE isnan(col_numeric)").fetchone()
assert result == (1,)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't return NaN?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it does :)

@rdbluerdblue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall the changes look like a good start.

@Fokko
Fokko merged commit 0807857 into apache:masterMar 15, 2023
@Fokko
Fokko deleted the fd-integration-tests branch March 15, 2023 19:04
@Fokko

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review @rdblue we can more tests later on

krvikash pushed a commit to krvikash/iceberg that referenced this pull request Mar 16, 2023
* Integration tests
* First version
* Add caching
* Add caching
* Restore pyproject
* WIP
* NaN seems to be broken
* WIP
* Coming along
* Cleanup
* Install duckdb
* Cleanup
* Revert changes to poetry
* Make it even nicer
* Revert unneeded change
* Update Spark version
* Make test passing
* comments
@FokkoFokko mentioned this pull request Oct 2, 2023
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@Fokko@rdblue