This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 56b6a8c7 EMPIREDB-394 removed outdated subquery param functions
56b6a8c7 is described below
commit 56b6a8c74cae266ff3a63134a359010a130afec0
Author: Rainer Döbele <[email protected]>
AuthorDate: Sun Aug 21 20:43:03 2022 +0200
EMPIREDB-394 removed outdated subquery param functions
---
.../java/org/apache/empire/db/DBCmdParamList.java | 64 +++++-----------------
.../empire/db/expr/compare/DBCompareAndOrExpr.java | 12 ----
.../empire/db/expr/compare/DBCompareColExpr.java | 13 -----
.../empire/db/expr/compare/DBCompareNotExpr.java | 10 ----
.../db/expr/compare/DBCompareParenthesisExpr.java | 11 ----
.../empire/db/expr/compare/DBExistsExpr.java | 11 ----
.../empire/db/expr/join/DBColumnJoinExpr.java | 26 ---------
.../empire/db/expr/join/DBCrossJoinExpr.java | 24 --------
.../org/apache/empire/db/expr/join/DBJoinExpr.java | 8 ---
9 files changed, 15 insertions(+), 164 deletions(-)
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCmdParamList.java
b/empire-db/src/main/java/org/apache/empire/db/DBCmdParamList.java
index 0deefb16..d59a5328 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCmdParamList.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCmdParamList.java
@@ -143,6 +143,21 @@ public class DBCmdParamList implements DBCmdParams
}
}
+ /**
+ * Used to merge CmdParams from a subquery with the current command params
list
+ * @param subQueryParams
+ */
+ public void mergeSubqueryParams(DBCmdParams subQueryParams)
+ {
+ if (subQueryParams==null || subQueryParams.isEmpty())
+ return;
+ // Subquery has parameters
+ if (cmdParams==null)
+ cmdParams= new ArrayList<DBCmdParam>(subQueryParams.size());
+ for (DBCmdParam p : subQueryParams)
+ cmdParams.add(paramUsageCount++, new DBCmdParam(null,
DataType.UNKNOWN, p.getValue()));
+ }
+
/**
* internally used to reorder the command params to match their order of
occurance
*/
@@ -165,53 +180,4 @@ public class DBCmdParamList implements DBCmdParams
}
paramUsageCount++;
}
-
- public void mergeSubqueryParams(DBCmdParams subQueryParams)
- {
- if (subQueryParams==null || subQueryParams.isEmpty())
- return;
- // Subquery has parameters
- if (cmdParams==null)
- cmdParams= new ArrayList<DBCmdParam>(subQueryParams.size());
- for (DBCmdParam p : subQueryParams)
- cmdParams.add(paramUsageCount++, new DBCmdParam(null,
DataType.UNKNOWN, p.getValue()));
- }
-
- /*
- protected void mergeSubqueryParamsObsolete(Object[] subQueryParams)
- {
- if (subQueryParams==null || subQueryParams.length==0)
- return;
- // Subquery has parameters
- if (cmdParams==null)
- cmdParams= new ArrayList<DBCmdParam>(subQueryParams.length);
- for (int p=0; p<subQueryParams.length; p++)
- cmdParams.add(paramUsageCount++, new DBCmdParam(null,
DataType.UNKNOWN, subQueryParams[p]));
- log.warn("mergeSubqueryParamsObsolete");
- }
-
- public void addJoin(DBSQLBuilder sql, DBJoinExpr join, long context, int
whichParams)
- {
- // remember insert pos
- int paramInsertPos = paramUsageCount;
- // now add the join
- join.addSQL(sql, context);
- // Merge subquery params
- Object[] subQueryParams = join.getSubqueryParams(whichParams);
- if (subQueryParams!=null)
- {
- if (paramInsertPos == paramUsageCount)
- mergeSubqueryParamsObsolete(subQueryParams);
- else
- { // Some Params have been used in additional Join constraints
- int tempCounter = paramUsageCount;
- paramUsageCount = paramInsertPos;
- mergeSubqueryParamsObsolete(subQueryParams);
- int insertCount = (paramUsageCount - paramInsertPos);
- paramUsageCount = tempCounter + insertCount;
- }
- }
- }
- */
-
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
index 1f0b9de6..7a7bc842 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareAndOrExpr.java
@@ -160,18 +160,6 @@ public class DBCompareAndOrExpr extends DBCompareExpr
if (parenthesis)
sql.append(")");
}
-
- /**
- * Returns the subquery params if the two expressions to be combined
- * @return the subquery params or null
- @Override
- public Object[] getSubqueryParams()
- {
- Object[] lParams = left.getSubqueryParams();
- Object[] rParams = right.getSubqueryParams();
- return ObjectUtils.combine(lParams, rParams);
- }
- */
/**
* Returns whether the constraint should replace another one or not.
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
index bab0d1bf..b64dd57c 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareColExpr.java
@@ -292,19 +292,6 @@ public class DBCompareColExpr extends DBCompareExpr
addCompareExpr(sql, context);
}
- /**
- * Returns the subquery params if the comparison value is a DBCommand
expression
- * @return the subquery params or null
- @Override
- public Object[] getSubqueryParams()
- {
- if (value instanceof DBCommandExpr)
- return ((DBCommandExpr)value).getParamValues();
- // nothing
- return null;
- }
- */
-
/**
* Returns whether the constraint should replace another one or not.
*
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
index be6f452c..f3c95c6f 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareNotExpr.java
@@ -123,16 +123,6 @@ public class DBCompareNotExpr extends DBCompareExpr
expr.addSQL(sql, context);
sql .append(" )");
}
-
- /**
- * Returns the subquery params if the compare expression
- * @return the subquery params or null
- @Override
- public Object[] getSubqueryParams()
- {
- return expr.getSubqueryParams();
- }
- */
/**
* Returns whether the constraint should replace another one or not.
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareParenthesisExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareParenthesisExpr.java
index d3a274cb..f76f3046 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareParenthesisExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBCompareParenthesisExpr.java
@@ -90,15 +90,4 @@ public class DBCompareParenthesisExpr extends DBCompareExpr
implements Unwrappab
wrapped.addSQL(sql, context|CTX_NOPARENTHESES);
sql.append(")");
}
-
- /**
- * Returns the subquery params if the compare expression
- * @return the subquery params or null
- @Override
- public Object[] getSubqueryParams()
- {
- return wrapped.getSubqueryParams();
- }
- */
-
}
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
index a3528b78..b81bf732 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/compare/DBExistsExpr.java
@@ -149,17 +149,6 @@ public class DBExistsExpr extends DBCompareExpr
}
sql.append(") ");
}
-
- /**
- * Returns the subquery params if the compare expression
- * @return the subquery params or null
- @Override
- public Object[] getSubqueryParams()
- {
- // none
- return cmd.getParamValues();
- }
- */
/**
* Returns wheter the constraint should replace another one or not.
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
index bc27bfbb..e48fe4c1 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBColumnJoinExpr.java
@@ -266,32 +266,6 @@ public class DBColumnJoinExpr extends DBJoinExpr
}
}
- /**
- * Returns the subquery Params
- * Valid only directly after addSQL() has been called!
- * @param which: both (==0) | left (<=0) | right (>=0)
- * @return the subquery params;
- @Override
- public Object[] getSubqueryParams(int which)
- {
- DBRowSet left = getLeftTable();
- DBRowSet right = getRightTable();
- Object[] leftParams = (which<=0 && (left instanceof DBQuery)) ?
((DBQuery)left ).getCommandExpr().getParamValues() : null;
- Object[] rightParams = (which>=0 && (right instanceof DBQuery)) ?
((DBQuery)right).getCommandExpr().getParamValues() : null;
- if (leftParams!=null && rightParams!=null)
- { // combine
- Object[] both = new Object[leftParams.length+rightParams.length];
- int index = 0;
- for (int i=0; i<leftParams.length; i++)
- both[index++] = leftParams[i];
- for (int i=0; i<rightParams.length; i++)
- both[index++] = rightParams[i];
- return both;
- }
- return (leftParams!=null ? leftParams : rightParams);
- }
- */
-
/**
* Compares two DBJoinExpr objects.
*
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
index 36678540..8e7095da 100644
---
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
+++
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBCrossJoinExpr.java
@@ -166,30 +166,6 @@ public class DBCrossJoinExpr extends DBJoinExpr
}
}
- /**
- * Returns the subquery Params
- * Valid only directly after addSQL() has been called!
- * @param which: both (==0) | left (<=0) | right (>=0)
- * @return the subquery params;
- @Override
- public Object[] getSubqueryParams(int which)
- {
- Object[] leftParams = (which<=0 && (left instanceof DBQuery)) ?
((DBQuery)left ).getCommandExpr().getParamValues() : null;
- Object[] rightParams = (which>=0 && (right instanceof DBQuery)) ?
((DBQuery)right).getCommandExpr().getParamValues() : null;
- if (leftParams!=null && rightParams!=null)
- { // combine
- Object[] both = new Object[leftParams.length+rightParams.length];
- int index = 0;
- for (int i=0; i<leftParams.length; i++)
- both[index++] = leftParams[i];
- for (int i=0; i<rightParams.length; i++)
- both[index++] = rightParams[i];
- return both;
- }
- return (leftParams!=null ? leftParams : rightParams);
- }
- */
-
/**
* Compares two DBJoinExpr objects.
*
diff --git
a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
index 0ee40413..eb47bb02 100644
--- a/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
+++ b/empire-db/src/main/java/org/apache/empire/db/expr/join/DBJoinExpr.java
@@ -97,14 +97,6 @@ public abstract class DBJoinExpr extends DBExpr
* @return the current DBDatabase object
*/
public abstract DBRowSet getOuterTable();
-
- /**
- * Returns the subquery Params
- * Valid only directly after addSQL() has been called!
- * @param which: both (==0) | left (<=0) | right (>=0)
- * @return the subquery params;
- */
- // public abstract Object[] getSubqueryParams(int which);
/**
* This function swaps the left and the right statements of the join
expression.
