PHOENIX-6002 : Resolve connection leak through QueryUtil.getConnectionOnServer()

phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java

@@ -276,24 +276,22 @@ private InternalScanner getRepairScanner(RegionCoprocessorEnvironment env, Store
  scan.addFamily(s.getColumnFamilyDescriptor().getName());
  }
  }
- try {
- PhoenixConnection conn = QueryUtil.getConnectionOnServer(env.getConfiguration())
- .unwrap(PhoenixConnection.class);
+ try (PhoenixConnection conn = QueryUtil.getConnectionOnServer(
+ env.getConfiguration()).unwrap(PhoenixConnection.class)) {
  PTable dataPTable = IndexUtil.getPDataTable(conn, env.getRegion().getTableDescriptor());
  final List<IndexMaintainer> maintainers = Lists
-.newArrayListWithExpectedSize(dataPTable.getIndexes().size());
+ .newArrayListWithExpectedSize(dataPTable.getIndexes().size());
  for (PTable index : dataPTable.getIndexes()) {
  if (index.getIndexType() == IndexType.LOCAL) {
  maintainers.add(index.getIndexMaintainer(dataPTable, conn));
  }
  }
- return new DataTableLocalIndexRegionScanner(env.getRegion().getScanner(scan), env.getRegion(),
- maintainers, store.getColumnFamilyDescriptor().getName(),env.getConfiguration());
-
-
+ return new DataTableLocalIndexRegionScanner(
+env.getRegion().getScanner(scan), env.getRegion(), maintainers,
+ store.getColumnFamilyDescriptor().getName(),
+ env.getConfiguration());
  } catch (SQLException e) {
  throw new IOException(e);
-
  }
  }
 }

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DropColumnMutator.java

@@ -132,23 +132,27 @@ public MetaDataMutationResult validateWithChildViews(PTable table, List<PTable>
  if (existingViewColumn != null && view.getViewStatement() != null) {
  ParseNode viewWhere =
  new SQLParser(view.getViewStatement()).parseQuery().getWhere();
- PhoenixConnection conn = QueryUtil.getConnectionOnServer(conf).unwrap(
- PhoenixConnection.class);
- PhoenixStatement statement = new PhoenixStatement(conn);
- TableRef baseTableRef = new TableRef(view);
- ColumnResolver columnResolver = FromCompiler.getResolver(baseTableRef);
- StatementContext context = new StatementContext(statement, columnResolver);
- Expression whereExpression = WhereCompiler.compile(context, viewWhere);
- Expression colExpression =
- new ColumnRef(baseTableRef, existingViewColumn.getPosition())
- .newColumnExpression();
- MetaDataEndpointImpl.ColumnFinder columnFinder =
- new MetaDataEndpointImpl.ColumnFinder(colExpression);
- whereExpression.accept(columnFinder);
- if (columnFinder.getColumnFound()) {
- return new MetaDataProtocol.MetaDataMutationResult(
+ try (PhoenixConnection conn =
+ QueryUtil.getConnectionOnServer(conf)
+ .unwrap(PhoenixConnection.class)) {
+ PhoenixStatement statement = new PhoenixStatement(conn);
+ TableRef baseTableRef = new TableRef(view);
+ ColumnResolver columnResolver =
+ FromCompiler.getResolver(baseTableRef);
+ StatementContext context =
+ new StatementContext(statement, columnResolver);
+ Expression whereExpression =
+ WhereCompiler.compile(context, viewWhere);
+ Expression colExpression = new ColumnRef(baseTableRef,
+ existingViewColumn.getPosition()).newColumnExpression();
+ MetaDataEndpointImpl.ColumnFinder columnFinder =
+ new MetaDataEndpointImpl.ColumnFinder(colExpression);
+ whereExpression.accept(columnFinder);
+ if (columnFinder.getColumnFound()) {
+ return new MetaDataProtocol.MetaDataMutationResult(
  MetaDataProtocol.MutationCode.UNALLOWED_TABLE_MUTATION,
  EnvironmentEdgeManager.currentTimeMillis(), table);
+ }
  }
  }
 

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java

@@ -2290,16 +2290,16 @@ public void dropTable(RpcController controller, DropTableRequest request,
  && (clientVersion >= MIN_SPLITTABLE_SYSTEM_CATALOG ||
  SchemaUtil.getPhysicalTableName(SYSTEM_CHILD_LINK_NAME_BYTES,
  env.getConfiguration()).equals(hTable.getName()))) {
- try {
- PhoenixConnection conn =
- QueryUtil.getConnectionOnServer(env.getConfiguration())
- .unwrap(PhoenixConnection.class);
+ try (PhoenixConnection conn =
+ QueryUtil.getConnectionOnServer(env.getConfiguration())
+ .unwrap(PhoenixConnection.class)) {
  Task.addTask(conn, PTable.TaskType.DROP_CHILD_VIEWS,
- Bytes.toString(tenantIdBytes), Bytes.toString(schemaName),
- Bytes.toString(tableOrViewName),
- PTable.TaskStatus.CREATED.toString(),
- null, null, null, null,
- this.accessCheckEnabled);
+ Bytes.toString(tenantIdBytes),
+ Bytes.toString(schemaName),
+ Bytes.toString(tableOrViewName),
+ PTable.TaskStatus.CREATED.toString(),
+ null, null, null, null,
+ this.accessCheckEnabled);
  } catch (Throwable t) {
  LOGGER.error("Adding a task to drop child views failed!", t);
  }
@@ -3201,6 +3201,9 @@ else if (isCoveredColumn) {
  invalidateList.add(new ImmutableBytesPtr(indexKey));
  }
  }
+ if (connection != null) {
+ connection.close();
+ }
  return null;
  }
 
@@ -3268,6 +3271,9 @@ else if (isCoveredColumn) {
  index.getSchemaName().getBytes() : ByteUtil.EMPTY_BYTE_ARRAY, index.getTableName().getBytes());
  }
  }
+ if (connection != null) {
+ connection.close();
+ }
  return null;
  }
 

phoenix-core/src/main/java/org/apache/phoenix/mapreduce/FormatToKeyValueReducer.java

@@ -77,8 +77,8 @@ protected void setup(Context context) throws IOException, InterruptedException {
  for (Map.Entry<String, String> entry : conf) {
  clientInfos.setProperty(entry.getKey(), entry.getValue());
  }
- try {
-PhoenixConnection conn = (PhoenixConnection) QueryUtil.getConnectionOnServer(clientInfos, conf);
+ try (PhoenixConnection conn = (PhoenixConnection) QueryUtil
+.getConnectionOnServer(clientInfos, conf)) {
  builder = conn.getKeyValueBuilder();
  final String tableNamesConf = conf.get(FormatToBytesWritableMapper.TABLE_NAMES_CONFKEY);
  final String logicalNamesConf = conf.get(FormatToBytesWritableMapper.LOGICAL_NAMES_CONFKEY);