Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,6 @@ public JdbcConnectionContext(GridKernalContext ctx, GridNioSession ses, GridSpin
dataPageScanEnabled, updateBatchSize,
concurrency, isolation, timeout, lb,
ver, this);

handler.start();
}

/** {@inheritDoc} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,6 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler, ClientT
/** Busy lock. */
private final GridSpinBusyLock busyLock;

/** Worker. */
private final JdbcRequestHandlerWorker worker;

/** Maximum allowed cursors. */
private final int maxCursors;

Expand Down Expand Up @@ -248,10 +245,6 @@ public JdbcRequestHandler(
this.protocolVer = protocolVer;

log = connCtx.kernalContext().log(getClass());

// TODO IGNITE-9484 Do not create worker if there is a possibility to unbind TX from threads.
worker = new JdbcRequestHandlerWorker(connCtx.kernalContext().igniteInstanceName(), log, this,
connCtx.kernalContext());
}

/** {@inheritDoc} */
Expand Down Expand Up @@ -288,14 +281,6 @@ public JdbcRequestHandler(
}
}

/**
* Start worker, if it's present.
*/
void start() {
if (worker != null)
worker.start();
}

/**
* Actually handle the request.
* @param req Request.
Expand Down Expand Up @@ -552,17 +537,6 @@ private JdbcResponse processBulkLoadFileBatch(JdbcBulkLoadBatchRequest req) {
* or due to {@code IOException} during network operations.
*/
public void onDisconnect() {
if (worker != null) {
worker.cancel();

try {
worker.join();
}
catch (InterruptedException e) {
// No-op.
}
}

for (JdbcCursor cursor : jdbcCursors.values())
U.close(cursor, log);

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ public OdbcConnectionContext(GridKernalContext ctx, GridNioSession ses, GridSpin
replicatedOnly, collocated, skipReducerOnUpdate, qryEngine, ver, this);

parser = new OdbcMessageParser(ctx, ver);

handler.start();
}

/** {@inheritDoc} */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ public class OdbcRequestHandler implements ClientListenerRequestHandler {
/** Busy lock. */
private final GridSpinBusyLock busyLock;

/** Worker. */
private final OdbcRequestHandlerWorker worker;

/** Maximum allowed cursors. */
private final int maxCursors;

Expand Down Expand Up @@ -176,9 +173,6 @@ public OdbcRequestHandler(
this.ver = ver;

log = ctx.log(getClass());

// TODO IGNITE-9484 Do not create worker if there is a possibility to unbind TX from threads.
worker = new OdbcRequestHandlerWorker(ctx.igniteInstanceName(), log, this, ctx);
}

/** {@inheritDoc} */
Expand All @@ -190,14 +184,6 @@ public OdbcRequestHandler(
return doHandle((OdbcRequest)req);
}

/**
* Start worker, if it's present.
*/
void start() {
if (worker != null)
worker.start();
}

/**
* Handle ODBC request.
* @param req ODBC request.
Expand Down Expand Up @@ -264,17 +250,6 @@ public ClientListenerResponse doHandle(OdbcRequest req) {
*/
public void onDisconnect() {
if (busyLock.enterBusy()) {
if (worker != null) {
worker.cancel();

try {
worker.join();
}
catch (InterruptedException e) {
// No-op.
}
}

try {
for (OdbcQueryResults res : qryResults.values())
res.closeAll();
Expand Down

This file was deleted.

Loading