Author: tolusha
Date: 2011-08-31 10:03:56 -0400 (Wed, 31 Aug 2011)
New Revision: 4819
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseMultiDbJDBCConnection.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseSingleDbJDBCConnection.java
Log:
EXOJCR-1195: Imrove RDBBS reindexing for Sybase
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java 2011-08-31
09:29:30 UTC (rev 4818)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java 2011-08-31
14:03:56 UTC (rev 4819)
@@ -130,6 +130,6 @@
@Override
public boolean isReindexingSupport()
{
- return false;
+ return true;
}
}
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseMultiDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseMultiDbJDBCConnection.java 2011-08-31
09:29:30 UTC (rev 4818)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseMultiDbJDBCConnection.java 2011-08-31
14:03:56 UTC (rev 4819)
@@ -118,7 +118,7 @@
SELECT_LIMIT_OFFSET_NODES_INTO_TEMPORARY_TABLE =
"select I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_INDEX,
I.N_ORDER_NUM into "
+ SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME
- + " from JCR_MITEM I where I.I_CLASS=1 AND I.ID > ? order
by I.ID ASC";
+ + " from JCR_MITEM I (index index JCR_PK_MITEM) where
I.I_CLASS=1 AND I.ID > ? order by I.ID ASC";
COUNT_NODES_IN_TEMPORARY_TABLE = "select count(*) from " +
SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME;
@@ -133,8 +133,7 @@
+ " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_MVALUE V,
JCR_MITEM P, "
+ SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME + " where
P.PARENT_ID = "
+ SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME
- + ".ID and P.I_CLASS=2 and V.PROPERTY_ID=P.ID order by
"
- + SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME +
".ID";
+ + ".ID and P.I_CLASS=2 and V.PROPERTY_ID=P.ID order by
ID";
DELETE_TEMPORARY_TABLE_A = "drop table " +
SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME;
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseSingleDbJDBCConnection.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseSingleDbJDBCConnection.java 2011-08-31
09:29:30 UTC (rev 4818)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseSingleDbJDBCConnection.java 2011-08-31
14:03:56 UTC (rev 4819)
@@ -118,7 +118,7 @@
SELECT_LIMIT_OFFSET_NODES_INTO_TEMPORARY_TABLE =
"select I.ID, I.PARENT_ID, I.NAME, I.VERSION, I.I_INDEX,
I.N_ORDER_NUM into "
+ SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME
- + " from JCR_SITEM I where I.CONTAINER_NAME=? AND
I.I_CLASS=1 AND I.ID > ? order by I.ID ASC";
+ + " from JCR_SITEM I (index JCR_PK_SITEM) where
I.CONTAINER_NAME=? AND I.I_CLASS=1 AND I.ID > ? order by I.ID ASC";
COUNT_NODES_IN_TEMPORARY_TABLE = "select count(*) from " +
SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME;
@@ -133,8 +133,7 @@
+ " V.DATA, V.ORDER_NUM, V.STORAGE_DESC from JCR_SVALUE V,
JCR_SITEM P, "
+ SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME + " where
P.PARENT_ID = "
+ SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME
- + ".ID and P.I_CLASS=2 and P.CONTAINER_NAME=? and
V.PROPERTY_ID=P.ID order by "
- + SybaseJDBCConnectionHelper.TEMP_B_TABLE_NAME +
".ID";
+ + ".ID and P.I_CLASS=2 and P.CONTAINER_NAME=? and
V.PROPERTY_ID=P.ID order by ID";
DELETE_TEMPORARY_TABLE_A = "drop table " +
SybaseJDBCConnectionHelper.TEMP_A_TABLE_NAME;
Show replies by date