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

Enhancement/131 refactor metadata reading #153

Merged
merged 76 commits into from
May 2, 2019
Merged

Enhancement/131 refactor metadata reading #153

merged 76 commits into from
May 2, 2019

Conversation

redcatbear
Copy link
Collaborator

This is a major refactoring of the way SQL dialects and metadata reading are handled.

redcatbear and others added 30 commits March 21, 2019 15:27
@redcatbear
#121: Added UML model for request dispatching.
d315b79
@redcatbear
#45: Rewrote parts of the JDBC adapter to use the new commons code.
d13ba72
@AnastasiiaSergienko
#121: fixed compilation errors
5603a10
@redcatbear
Merge remote-tracking branch 'origin/master' into
a0bfe21 
enhancement/121_Request_dispatching_and_remote_logging

Conflicts:
	jdbc-adapter/pom.xml
	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java
	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/JdbcAdapterTest.java
@redcatbear
#121: Updated version to 1.9.0
0537db2
@redcatbear
#121: Fixed VS common version so that it's configured in only one place.
9a1b6c0
@redcatbear
#124: Started rework on metadata reading.
a453c9c
@AnastasiiaSergienko
#121: created ColumnMetadata through builder
a86a3da
@redcatbear
#124: Split of ColumnMetadataReader.
30ab0dc
@redcatbear
Merge branch 'feature/124_Read_Redshift_Spectrum_metadata' of https:/…
b65959b 
…/github.com/EXASOL/virtual-schemas into feature/124_Read_Redshift_Spectrum_metadata
@redcatbear
#124: Integrating with Dialects.
645573e
@redcatbear
#124: Covered ColumunMetadataReader by unit tests and refactored it.
89108ef
@redcatbear
Merge remote-tracking branch 'origin/master' into
77616b9 
enhancement/131_Refactor_metadata_reading

Conflicts:
	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java
	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcMetadataReader.java
@redcatbear
#131: Fixed handling and test for original column type name.
b3f33b9
@AnastasiiaSergienko
#131: created RemoteMetadataReader interface
7b25a37
@AnastasiiaSergienko
#131: implemented part of new logic
62f26e9
@redcatbear
#131: Intermediate check-in.
e2ec244
@AnastasiiaSergienko
added create sql dialect uml model
1914791
@redcatbear
#131: Fixed compiler errors (still 12 left).
e0a6865
@redcatbear
Merge branch 'enhancement/131_Refactor_metadata_reading' of https://g…
9216998 
…ithub.com/EXASOL/virtual-schemas into enhancement/131_Refactor_metadata_reading
@redcatbear
#131: Removed .settings from .gitignore to enable project specifi…
1d090f2 
…c formatter settings
@AnastasiiaSergienko
Merge branch 'master' into enhancement/131_Refactor_metadata_reading
6a5b284 
# Conflicts:
#	jdbc-adapter/pom.xml
#	jdbc-adapter/virtualschema-jdbc-adapter-dist/pom.xml
#	jdbc-adapter/virtualschema-jdbc-adapter/pom.xml
#	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/impl/GenericSqlDialect.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcMetadataReader.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/CustomSqlGenerationVisitorTest.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/FileBasedIntegrationTest.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/SqlDialectTest.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impl/DialectTestData.java
#	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/dialects/impl/OracleSqlDialectTest.java
@redcatbear
#131: Started adapter note creation.
66b6035
@redcatbear
Merge branch 'enhancement/131_Refactor_metadata_reading' of https://g…
f11b090 
…ithub.com/EXASOL/virtual-schemas into enhancement/131_Refactor_metadata_reading
@redcatbear
#131: Added basic create of schema adapter notes.
b031824
@redcatbear
#131: Fixed compiler errors.
5833b50
@AnastasiiaSergienko
#131: finished BasedRemoteMetadataReaderTest
17e3c99
@redcatbear
#131: Got all unit tests green. Introduced JUnit5 extension to skip
7ce9628 
integration tests.
@redcatbear
Merge branch 'enhancement/131_Refactor_metadata_reading' of https://g…
56ada31 
…ithub.com/EXASOL/virtual-schemas into enhancement/131_Refactor_metadata_reading

Conflicts:
	jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReader.java
	jdbc-adapter/virtualschema-jdbc-adapter/src/test/java/com/exasol/adapter/jdbc/BaseRemoteMetadataReaderTest.java
@AnastasiiaSergienko
#131: extended IT with IntegrationTestConfigurationCondition
9d7cff3
morazow
morazow suggested changes Apr 18, 2019
View reviewed changes
...irtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/JdbcTypeDescription.java Show resolved Hide resolved
.../virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/SqlDialectFactory.java Outdated Show resolved Hide resolved
...dbc-adapter/src/main/java/com/exasol/adapter/dialects/exasol/ExasolColumnMetadataReader.java Show resolved Hide resolved
...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java Outdated Show resolved Hide resolved
...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java Outdated Show resolved Hide resolved
...adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftColumnMetadataReader.java Show resolved Hide resolved
...hema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/redshift/RedshiftSqlDialect.java Outdated Show resolved Hide resolved
...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java Outdated Show resolved Hide resolved
...alschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/sybase/SybaseSqlDialect.java Outdated Show resolved Hide resolved
...adapter/src/main/java/com/exasol/adapter/dialects/teradata/TeradataColumnMetadataReader.java Show resolved Hide resolved
snehlsen
snehlsen suggested changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@snehlsen snehlsen left a comment

Choose a reason for hiding this comment

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

I like the refactored version, it is much more modular now!

jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java
final VirtualSchemaAdapter adapter = new JdbcAdapter();
registerAdapterForSqlDialect(adapter, "DB2"); // FIXME: replace this hard-coded registration
registerAdapterForSqlDialect(adapter, "EXASOL"); // FIXME: replace this hard-coded registration
registerAdapterForSqlDialect(adapter, "GENERIC"); // FIXME: replace this hard-coded registration
Copy link
Contributor

Choose a reason for hiding this comment

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

The HIVE dialect is not yet registered here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed.

...adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/dialects/SqlDialect.java Outdated Show resolved Hide resolved
jdbc-adapter/virtualschema-jdbc-adapter/src/main/java/com/exasol/adapter/jdbc/JdbcAdapter.java
return new AdapterProperties(request.getSchemaMetadataInfo().getProperties());
}

private SchemaMetadata readMetadata(final AdapterProperties properties, final ExaMetadata exasolMetadata)
Copy link
Contributor

Choose a reason for hiding this comment

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

There are still some helper methods in the JbdcAdapter class. I would like the JdbcAdapter just to implement the VirtualSchemaAdapter. Don't know if that is feasible.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

A lot actually. But I think we tackle those in the next refactoring round.

@morazow
Copy link
Contributor

morazow commented Apr 29, 2019

Looks good from my side!

This was referenced Apr 29, 2019
Closed
Closed
@redcatbear redcatbear merged commit adbc826 into master May 2, 2019
@AnastasiiaSergienko AnastasiiaSergienko deleted the enhancement/131_Refactor_metadata_reading branch May 13, 2019 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morazow morazow morazow approved these changes

@snehlsen snehlsen snehlsen approved these changes

@AnastasiiaSergienko AnastasiiaSergienko Awaiting requested review from AnastasiiaSergienko

Assignees

@redcatbear redcatbear

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@redcatbear @morazow @snehlsen @AnastasiiaSergienko