From 8ccec2c7ef64bb5e6f9d74329b31df3453a77efc Mon Sep 17 00:00:00 2001 From: Ryan D. Brooks Date: Mon, 8 May 2017 14:35:47 -0700 Subject: refactor: Improve memory efficiency of BranchQueryBuilder Change-Id: I71854000c856bae72fe400e471958e4064dba78c --- .../db/internal/search/handlers/BranchIdsSqlHandler.java | 15 ++++++++------- .../internal/search/handlers/SqlHandlerFactoryUtil.java | 4 ++-- .../osee/orcs/db/internal/sql/AbstractSqlWriter.java | 11 ----------- 3 files changed, 10 insertions(+), 20 deletions(-) (limited to 'plugins/org.eclipse.osee.orcs.db') diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java index 2ad89bc5352..463b3ee94eb 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/BranchIdsSqlHandler.java @@ -12,8 +12,9 @@ package org.eclipse.osee.orcs.db.internal.search.handlers; import java.util.Collection; import java.util.List; +import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; -import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchUuids; +import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchIds; import org.eclipse.osee.orcs.db.internal.sql.AbstractSqlWriter; import org.eclipse.osee.orcs.db.internal.sql.SqlHandler; import org.eclipse.osee.orcs.db.internal.sql.TableEnum; @@ -22,21 +23,21 @@ import org.eclipse.osee.orcs.db.internal.sql.join.AbstractJoinQuery; /** * @author Roberto E. Escobar */ -public class BranchIdsSqlHandler extends SqlHandler { +public class BranchIdsSqlHandler extends SqlHandler { - private CriteriaBranchUuids criteria; + private CriteriaBranchIds criteria; private String brAlias; private String jIdAlias; @Override - public void setData(CriteriaBranchUuids criteria) { + public void setData(CriteriaBranchIds criteria) { this.criteria = criteria; } @Override public void addTables(AbstractSqlWriter writer) { - if (criteria.getUuids().size() > 1) { + if (criteria.getIds().size() > 1) { jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE); } List branchAliases = writer.getAliases(TableEnum.BRANCH_TABLE); @@ -49,9 +50,9 @@ public class BranchIdsSqlHandler extends SqlHandler { @Override public boolean addPredicates(AbstractSqlWriter writer) throws OseeCoreException { - Collection ids = criteria.getUuids(); + Collection ids = criteria.getIds(); if (ids.size() > 1) { - AbstractJoinQuery joinQuery = writer.writeIdJoin(ids); + AbstractJoinQuery joinQuery = writer.writeJoin(ids); writer.write(brAlias); writer.write(".branch_id = "); writer.write(jIdAlias); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java index 21e8ce32d5e..6ff6ac616a9 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/SqlHandlerFactoryUtil.java @@ -32,7 +32,7 @@ import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchChildOf; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchName; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchState; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchType; -import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchUuids; +import org.eclipse.osee.orcs.core.ds.criteria.CriteriaBranchIds; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaCommitIds; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateRange; import org.eclipse.osee.orcs.core.ds.criteria.CriteriaDateWithOperator; @@ -116,7 +116,7 @@ public final class SqlHandlerFactoryUtil { private static void addBranchHandlers(Map, Class>> handleMap) { handleMap.put(CriteriaBranchArchived.class, BranchArchivedSqlHandler.class); - handleMap.put(CriteriaBranchUuids.class, BranchIdsSqlHandler.class); + handleMap.put(CriteriaBranchIds.class, BranchIdsSqlHandler.class); handleMap.put(CriteriaBranchName.class, BranchNameSqlHandler.class); handleMap.put(CriteriaBranchState.class, BranchStateSqlHandler.class); handleMap.put(CriteriaBranchType.class, BranchTypesSqlHandler.class); diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java index d8e1d8b568a..1c45f2348fd 100644 --- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java +++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/sql/AbstractSqlWriter.java @@ -17,8 +17,6 @@ import java.util.Iterator; import java.util.List; import org.eclipse.osee.framework.core.sql.OseeSql; import org.eclipse.osee.framework.jdk.core.type.Id; -import org.eclipse.osee.framework.jdk.core.type.Identifiable; -import org.eclipse.osee.framework.jdk.core.type.Identity; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -351,15 +349,6 @@ public abstract class AbstractSqlWriter implements HasOptions { return joinQuery; } - public IdJoinQuery writeIdentifiableJoin(Collection> ids) { - IdJoinQuery joinQuery = joinFactory.createIdJoinQuery(); - for (Identity id : ids) { - joinQuery.add(id.getGuid()); - } - addJoin(joinQuery); - return joinQuery; - } - @Override public Options getOptions() { return getContext().getOptions(); -- cgit v1.2.3