Skip to content

Handle exception for empty tables in elasticsearch #23850

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

Merged
tdcmeehan merged 1 commit into from
Nov 1, 2024
Merged

Handle exception for empty tables in elasticsearch #23850

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
4 changes: 4 additions & 0 deletions ...ticsearch/src/main/java/com/facebook/presto/elasticsearch/client/ElasticsearchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,10 @@ public IndexMetadata getIndexMetadata(String index)
// Older versions of ElasticSearch supported multiple "type" mappings
// for a given index. Newer versions support only one and don't
// expose it in the document. Here we skip it if it's present.

if (!mappings.elements().hasNext()) {
return new IndexMetadata(new IndexMetadata.ObjectType(ImmutableList.of()));
}
mappings = mappings.elements().next();
}

Expand Down
8 changes: 8 additions & 0 deletions ...rc/test/java/com/facebook/presto/elasticsearch/TestElasticsearchIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,4 +805,12 @@ private void createIndex(String indexName, @Language("JSON") String mapping)
client.getLowLevelClient()
.performRequest("PUT", "/" + indexName, ImmutableMap.of(), new NStringEntity(mapping, ContentType.APPLICATION_JSON));
}

@Test
public void testEmptyIndexNoMappings()
throws IOException
{
client.getLowLevelClient().performRequest("PUT", "/emptyindex");
assertQueryFails("SELECT * FROM emptyindex", "line 1:8: SELECT \\* not allowed from relation that has no columns");
}
}