Skip to content

Commit 30a219a

Browse files
authored
#58: Added option to keep original column name for auto inference (#59)
* #58: Update dependencies * Upgrade azurite
1 parent 40350a8 commit 30a219a

10 files changed

Lines changed: 75 additions & 51 deletions

File tree

.github/workflows/dependencies_update.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vscode/settings.json

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
{
2-
"editor.formatOnSave": true,
3-
"editor.codeActionsOnSave": {
4-
"source.organizeImports": "explicit",
5-
"source.generate.finalModifiers": "explicit",
6-
"source.fixAll": "explicit"
7-
},
8-
"java.codeGeneration.useBlocks": true,
9-
"java.saveActions.organizeImports": true,
10-
"java.sources.organizeImports.starThreshold": 3,
11-
"java.sources.organizeImports.staticStarThreshold": 3,
12-
"java.test.config": {
13-
"vmArgs": [
14-
"-Djava.util.logging.config.file=src/test/resources/logging.properties",
15-
"-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"
16-
]
17-
},
18-
"[json]": {
19-
"editor.indentSize": 2
20-
},
21-
"sonarlint.connectedMode.project": {
22-
"connectionId": "exasol",
23-
"projectKey": "com.exasol:azure-blob-storage-document-files-virtual-schema"
24-
}
2+
"editor.formatOnSave": true,
3+
"editor.codeActionsOnSave": {
4+
"source.organizeImports": "explicit",
5+
"source.generate.finalModifiers": "explicit",
6+
"source.fixAll": "explicit"
7+
},
8+
"java.codeGeneration.useBlocks": true,
9+
"java.saveActions.organizeImports": true,
10+
"java.sources.organizeImports.starThreshold": 3,
11+
"java.sources.organizeImports.staticStarThreshold": 3,
12+
"java.test.config": {
13+
"vmArgs": [
14+
"-Djava.util.logging.config.file=src/test/resources/logging.properties",
15+
"-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
16+
"-Dcom.exasol.dockerdb.image=8.27.0"
17+
]
18+
},
19+
"sonarlint.connectedMode.project": {
20+
"connectionId": "exasol",
21+
"projectKey": "com.exasol:azure-blob-storage-document-files-virtual-schema"
22+
}
2523
}

dependencies.md

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/changes/changes_2.1.0.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Virtual Schema for Document Data in Files on Azure Blob Storage 2.1.0, released 2024-06-17
2+
3+
Code name: Configure column names for automatic mapping inference
4+
5+
## Summary
6+
7+
This release allows configuring the mapping of column names for the automatic mapping inference in Parquet and CSV files. Before, the virtual schema always converted source column names to `UPPER_SNAKE_CASE` to create the Exasol column names. This is now configurable with EDML property `autoInferenceColumnNames`. This property supports the following values:
8+
* `CONVERT_TO_UPPER_SNAKE_CASE`: Convert column names to `UPPER_SNAKE_CASE` (default).
9+
* `KEEP_ORIGINAL_NAME`: Do not convert column names, use column name from source.
10+
11+
See the [EDML user guide](https://github.com/exasol/virtual-schema-common-document/blob/main/doc/user_guide/edml_user_guide.md#column-name-conversion) for details.
12+
13+
## Features
14+
15+
* #58: Added option to keep original column name for auto inference
16+
17+
## Dependency Updates
18+
19+
### Compile Dependency Updates
20+
21+
* Updated `com.azure:azure-storage-blob:12.25.3` to `12.26.1`
22+
* Updated `com.exasol:virtual-schema-common-document-files:8.0.4` to `8.1.0`
23+
* Updated `org.slf4j:slf4j-jdk14:2.0.12` to `2.0.13`
24+
25+
### Runtime Dependency Updates
26+
27+
* Removed `com.azure:azure-core-http-netty:1.14.2`
28+
29+
### Test Dependency Updates
30+
31+
* Updated `com.exasol:exasol-test-setup-abstraction-java:2.1.2` to `2.1.4`
32+
* Updated `com.exasol:virtual-schema-common-document-files:8.0.4` to `8.1.0`
33+
* Updated `org.mockito:mockito-core:5.11.0` to `5.12.0`
34+
* Updated `org.testcontainers:junit-jupiter:1.19.7` to `1.19.8`
35+
36+
### Plugin Dependency Updates
37+
38+
* Updated `com.exasol:project-keeper-maven-plugin:4.3.2` to `4.3.3`

doc/user_guide/user_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Next create the Adapter Script:
1717
```sql
1818
CREATE OR REPLACE JAVA ADAPTER SCRIPT ADAPTER.AZURE_BLOB_STORAGE_FILES_ADAPTER AS
1919
%scriptclass com.exasol.adapter.RequestDispatcher;
20-
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.0.4-azure-blob-storage-2.0.5.jar;
20+
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar;
2121
/
2222
```
2323

@@ -30,7 +30,7 @@ CREATE OR REPLACE JAVA SET SCRIPT ADAPTER.IMPORT_FROM_AZURE_BLOB_STORAGE_DOCUMEN
3030
CONNECTION_NAME VARCHAR(500))
3131
EMITS(...) AS
3232
%scriptclass com.exasol.adapter.document.UdfEntryPoint;
33-
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.0.4-azure-blob-storage-2.0.5.jar;
33+
%jar /buckets/bfsdefault/default/document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar;
3434
/
3535
```
3636

pk_generated_parent.pom

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>azure-blob-storage-document-files-virtual-schema</artifactId>
5-
<version>2.0.5</version>
5+
<version>2.1.0</version>
66
<name>Virtual Schema for document data in files on Azure Blob Storage</name>
77
<description>Adapter for document data access from files from Azure Blob Storage.</description>
88
<url>https://github.com/exasol/azure-blob-storage-document-files-virtual-schema/</url>
99
<properties>
10-
<vs-common-document-files.version>8.0.4</vs-common-document-files.version>
10+
<vs-common-document-files.version>8.1.0</vs-common-document-files.version>
1111
</properties>
1212
<profiles>
1313
<profile>
@@ -40,14 +40,7 @@
4040
<dependency>
4141
<groupId>com.azure</groupId>
4242
<artifactId>azure-storage-blob</artifactId>
43-
<version>12.25.3</version>
44-
</dependency>
45-
<dependency>
46-
<!-- Fix CVE-2024-29025 in io.netty:netty-codec-http via azure-storage-blob -->
47-
<groupId>com.azure</groupId>
48-
<artifactId>azure-core-http-netty</artifactId>
49-
<version>1.14.2</version>
50-
<scope>runtime</scope>
43+
<version>12.26.1</version>
5144
</dependency>
5245
<!-- Test dependencies -->
5346
<dependency>
@@ -72,13 +65,13 @@
7265
<dependency>
7366
<groupId>org.mockito</groupId>
7467
<artifactId>mockito-core</artifactId>
75-
<version>5.11.0</version>
68+
<version>5.12.0</version>
7669
<scope>test</scope>
7770
</dependency>
7871
<dependency>
7972
<groupId>org.testcontainers</groupId>
8073
<artifactId>junit-jupiter</artifactId>
81-
<version>1.19.7</version>
74+
<version>1.19.8</version>
8275
<scope>test</scope>
8376
</dependency>
8477
<dependency>
@@ -102,7 +95,7 @@
10295
<dependency>
10396
<groupId>com.exasol</groupId>
10497
<artifactId>exasol-test-setup-abstraction-java</artifactId>
105-
<version>2.1.2</version>
98+
<version>2.1.4</version>
10699
<scope>test</scope>
107100
</dependency>
108101
<dependency>
@@ -115,7 +108,7 @@
115108
<!-- Enable log output for integration tests -->
116109
<groupId>org.slf4j</groupId>
117110
<artifactId>slf4j-jdk14</artifactId>
118-
<version>2.0.12</version>
111+
<version>2.0.13</version>
119112
</dependency>
120113
</dependencies>
121114
<build>
@@ -153,7 +146,7 @@
153146
<plugin>
154147
<groupId>com.exasol</groupId>
155148
<artifactId>project-keeper-maven-plugin</artifactId>
156-
<version>4.3.2</version>
149+
<version>4.3.3</version>
157150
<executions>
158151
<execution>
159152
<goals>
@@ -188,7 +181,7 @@
188181
<parent>
189182
<artifactId>azure-blob-storage-document-files-virtual-schema-generated-parent</artifactId>
190183
<groupId>com.exasol</groupId>
191-
<version>2.0.5</version>
184+
<version>2.1.0</version>
192185
<relativePath>pk_generated_parent.pom</relativePath>
193186
</parent>
194187
</project>

src/test/java/com/exasol/adapter/document/files/IntegrationTestSetup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import jakarta.json.*;
2727

2828
public class IntegrationTestSetup implements AutoCloseable {
29-
private static final String ADAPTER_JAR = "document-files-virtual-schema-dist-8.0.4-azure-blob-storage-2.0.5.jar";
29+
private static final String ADAPTER_JAR = "document-files-virtual-schema-dist-8.1.0-azure-blob-storage-2.1.0.jar";
3030
private final ExasolTestSetup exasolTestSetup;
3131
private final Connection exasolConnection;
3232
private final Statement exasolStatement;

src/test/java/com/exasol/adapter/document/files/abstestsetup/LocalAbsTestSetup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class LocalAbsTestSetup implements AbsTestSetup {
2121

2222
public LocalAbsTestSetup() {
2323
// https://mcr.microsoft.com/en-us/product/azure-storage/azurite/tags
24-
this.azuriteContainer = new GenericContainer<>("mcr.microsoft.com/azure-storage/azurite:3.29.0");
24+
this.azuriteContainer = new GenericContainer<>("mcr.microsoft.com/azure-storage/azurite:3.30.0");
2525
this.azuriteContainer.addExposedPort(PORT_IN_CONTAINER);
2626
this.azuriteContainer.start();
2727
createAzuriteBlobServiceClient();

0 commit comments

Comments
 (0)