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

DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc #2542

Merged
merged 1 commit into from
May 10, 2022
Merged

DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc #2542

merged 1 commit into from
May 10, 2022

Conversation

jnturton
Copy link
Contributor

DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc

Description

DB2 is another DBMS in which clients must connect to a named database, not just to the DBMS. A JDBC connection that does the same will receive a single record containing a null string from a call to Connection::getMetaData::getCatalogs. We need to ignore such a record in order to query DB2 correctly.

Documentation

N/A

Testing

Install DB2 using the Docker container ibmcom/db2. Create a test schema and table in the existing testdb. Configure a new Drill JDBC storage config to connect to the DB2 testdb database. Test info schema queries and direct querying of the test table.

@jnturton jnturton added bug backport-to-stable This bug fix is applicable to the latest stable release and should be considered for inclusion there labels May 10, 2022
@jnturton jnturton requested a review from vdiravka May 10, 2022 10:47
@jnturton jnturton self-assigned this May 10, 2022
cgivre
cgivre approved these changes May 10, 2022
View reviewed changes
Copy link
Contributor

@cgivre cgivre left a comment

Choose a reason for hiding this comment

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

LGTM +1
This is really a minor update, but is it worth adding a unit test? We can skip it if it is a major hassle.

@jnturton
Copy link
Contributor Author

LGTM +1
This is really a minor update, but is it worth adding a unit test? We can skip it if it is a major hassle.

I think a unit test would need a new DB2 testcontainer or a mocked JDBC Connection that returns a null like DB2 does. The cost/benefit of doing those to exercise a null test doesn't look good to me, but there may be some tricks I don't know.

@cgivre
Copy link
Contributor

cgivre commented May 10, 2022

Ok... Let's just merge then.

@cgivre cgivre merged commit 151d88c into apache:master May 10, 2022
jnturton added a commit to jnturton/drill that referenced this pull request May 11, 2022
@jnturton
DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc. (
c42868b 
apache#2542)
jnturton added a commit to jnturton/drill that referenced this pull request May 11, 2022
@jnturton
DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc. (
c27d891 
apache#2542)
jnturton added a commit that referenced this pull request May 12, 2022
@jnturton @pseudomo
@rymarm @pjfanning @vvysotskyi @vdiravka @cgivre @luocooong @wojustme
DRILL-8221: Collect bug fixes from master for Drill 1.20.1 (#2545)
2fa849d 
* Prepare for the next bugfix iteration.

* SAS Reader fixes (#2472)

Co-authored-by: pseudomo <pseudomo@yandex.ru>

* Add jackson-bom (#2454)

* [DRILL-8150] log4j 2.17.2 in format-excel (#2476)

* DRILL-8151: Add support for more ElasticSearch and Cassandra data types (#2477)

* DRILL-8154: Upgrade to poi 5.2.1 (#2480)

* DRILL-8145: Fix flaky TestDrillbitResilience#memoryLeaksWhenCancelled test case (#2471)

* Set Brotli codec jar and test to occur only on Linux amd64.

* DRILL-8145: Fix flaky TestDrillbitResilience#memoryLeaksWhenCancelled test case

- changing timeout for TestDrillbitResilience tests
- timing tuning for memoryLeaksWhenCancelled
- update TestContainers version
- -DforkCount=1 for Travis Maven build
- directMemoryMb: 2500 -> 4500 leads to less occasinal test failures

Co-authored-by: James Turton <james@somecomputer.xyz>

* [MINOR UPDATE] Add Stalebot Config (#2487)

* [MINOR UPDATE] Fix license for Stalebot Config (#2488)

* DRILL-8156: Declare and chown a /data VOLUME in the Drill Dockerfile (#2491)

* Add a mountpoint and VOLUME for local storage to Dockerfile.

* Address review comments concerning layer ordering.

* Fix image size blowup by moving chmod to intermediate container.

* Combine RUN commands in Dockerfile.

* DRILL-8168: Do not duplicate attempts to impersonate a user in the REST API (#2495)

* DRILL-8172: Use the specified memory usage for Travis CI (#2500)

* DRILL-8165: Upgrade liquibase because of CVE-2022-0839 (#2497)

* Create codeql-analysis.yml

* Update codeql-analysis.yml

Removed cpp from code analysis

* [MINOR UPDATE] Add license to CodeQL YAML (#2501)

* DRILL-8176: Upgrade Jackson Due to CVE-2020-36518 (#2504)

* DRILL-8164: Upgrade metadata-extractor because of CVE-2022-24613 (#2493)

* DRILL-8164: Upgrade metadata-extractor because of CVE-2022-24613

* Update the ProfileCopyright tag name

* Update the mov format name

* Add the QuickTime.Rotation tag

* Bump metadata-extractor to 2.17.0

* DRILL-8178: Bump AWS Libraries to Latest Version (#2506)

* DRILL-8175: Update Drill release script after 1.20 (#2503)

* Set DRILL_PID_DIR in Dockerfile to writable location for distributed mode.

Some users of the images built from this Dockerfile customise
them so that they launch Drill in distributed mode instead of
embedded mode.  This change saves them from having to set
DRILL_PID_DIR themselves in order to succeed.

* Update release script and instructions after the release of 1.20.

- Add support for specifying a build profile such as "hadoop-2".
- Update instuctions for the Drill web site.
- Update instructions for uploading RCs (no more home.apache)
- Some fixes.

* DRILL-8176: minor issue in previous jackson bom (#2508)

* minor issue in previous jackson bom

* Update pom.xml

* DRILL-8187: Dialect factory returns ANSI SQL dialect for BigQuery (#2513)

* DRILL-8192: Cassandra queries fail when enabled Mongo plugin (#2518)

* DRILL-8013: Drill attempts to push "$SUM0" to JDBC storage plugin for AVG (#2521)

* DRILL-8194: Fix the function of REPLACE throws IndexOutOfBoundsException If text's length is more than previously applied (#2522)

* DRILL-8200: Update Hadoop libs to ≥ 3.2.3 for CVE-2022-26612 (#2525)

* Remove pointless Buffer casts.

Compiling Drill with JDK > 8 will still result in ByteBuffer <-> Buffer cast
exceptions at runtime when running on JDK 8 even though maven.target.version
is set to 8. Setting maven.compiler.release to 8 solves the Buffer casts
but raises a compilation error of package sun.security.jgss does not exist
for JDK 8. There were a few handwritten casts to avoid the Buffer casting
issue but many instances are not covered so the few reverted in this commit
achieve nothing.

* Update Hadoop to 3.2.3.

* [MINOR UPDATE] Update AWS Java SDK to 1.12.211

* DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc. (#2542)

Co-authored-by: pseudomo <yura_levchenko@mail.ru>
Co-authored-by: pseudomo <pseudomo@yandex.ru>
Co-authored-by: Rymar Maksym <rim.maxim+dev@gmail.com>
Co-authored-by: PJ Fanning <pjfanning@users.noreply.github.com>
Co-authored-by: Volodymyr Vysotskyi <vvovyk@gmail.com>
Co-authored-by: Vitalii Diravka <vitalii@apache.org>
Co-authored-by: Charles S. Givre <cgivre@apache.org>
Co-authored-by: luoc <luoc@apache.org>
Co-authored-by: xurenhe <xurenhe19910131@gmail.com>
jnturton added a commit to jnturton/drill that referenced this pull request Jul 11, 2022
@jnturton
DRILL-8219: Handle null catalog names returned by DB2 in storage-jdbc. (
def6fdf 
apache#2542)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgivre cgivre cgivre approved these changes

@vdiravka vdiravka Awaiting requested review from vdiravka

Assignees

@jnturton jnturton

Labels
backport-to-stable This bug fix is applicable to the latest stable release and should be considered for inclusion there bug minor-update
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jnturton @cgivre