SAK-31276 remove unnecessary SST keys because composite keys handle (s…

…akaiproject#3283)
alaminreaz · Sep 2, 2016 · d3c7274 · d3c7274
1 parent 6125406
commit d3c7274
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 129 deletions.
diff --git a/reference/docs/conversion/sakai_12_mysql_conversion.sql b/reference/docs/conversion/sakai_12_mysql_conversion.sql
@@ -196,5 +196,10 @@ ALTER TABLE pasystem_popup_assign DROP COLUMN user_eid;
 ALTER TABLE pasystem_popup_dismissed DROP COLUMN user_eid;
 ALTER TABLE pasystem_banner_dismissed DROP COLUMN user_eid;
 
+-- SAK-31276 remove unncecessary keys because there is a composite key that handles this
+DROP INDEX SST_PRESENCE_SITE_ID_IX ON SST_PRESENCES;
+DROP INDEX SST_EVENTS_USER_ID_IX ON SST_EVENTS;
+-- END SAK-31276
+
 -- #3258 Drop this unused column
 ALTER TABLE gb_grade_record_t DROP COLUMN user_entered_grade;
diff --git a/reference/docs/conversion/sakai_12_oracle_conversion.sql b/reference/docs/conversion/sakai_12_oracle_conversion.sql
@@ -209,5 +209,10 @@ ALTER TABLE pasystem_popup_assign DROP COLUMN user_eid;
 ALTER TABLE pasystem_popup_dismissed DROP COLUMN user_eid;
 ALTER TABLE pasystem_banner_dismissed DROP COLUMN user_eid;
 
+-- SAK-31276 remove unncecessary keys because there is a composite key that handles this
+DROP INDEX SST_PRESENCE_SITE_ID_IX ON SST_PRESENCES;
+DROP INDEX SST_EVENTS_USER_ID_IX ON SST_EVENTS;
+-- END SAK-31276
+
 -- #3258 Drop this unused column
 ALTER TABLE gb_grade_record_t DROP COLUMN user_entered_grade;
diff --git a/reference/docs/conversion/sakai_2_7_0_mysql_conversion.sql b/reference/docs/conversion/sakai_2_7_0_mysql_conversion.sql
@@ -370,7 +370,6 @@ create table SST_RESOURCES (ID bigint not null auto_increment, USER_ID varchar(9
 create table SST_SITEACTIVITY (ID bigint not null auto_increment, SITE_ID varchar(99) not null, ACTIVITY_DATE date not null, EVENT_ID varchar(32) not null, ACTIVITY_COUNT bigint not null, primary key (ID));
 create table SST_SITEVISITS (ID bigint not null auto_increment, SITE_ID varchar(99) not null, VISITS_DATE date not null, TOTAL_VISITS bigint not null, TOTAL_UNIQUE bigint not null, primary key (ID));
 create index SST_EVENTS_SITE_ID_IX on SST_EVENTS (SITE_ID);
-create index SST_EVENTS_USER_ID_IX on SST_EVENTS (USER_ID);
 create index SST_EVENTS_EVENT_ID_IX on SST_EVENTS (EVENT_ID);
 create index SST_EVENTS_DATE_IX on SST_EVENTS (EVENT_DATE);
 create index SST_PREFERENCES_SITE_ID_IX on SST_PREFERENCES (SITE_ID);
@@ -690,4 +689,4 @@ INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where RE
 alter table CONTENT_RESOURCE_DELETE CHANGE DELETE_DATE DELETE_DATE DATETIME;
 
 -- SAK-17206
-alter table POLL_OPTION add column DELETED bit(1) DEFAULT NULL;
+alter table POLL_OPTION add column DELETED bit(1) DEFAULT NULL;
diff --git a/reference/docs/conversion/sakai_2_7_0_oracle_conversion.sql b/reference/docs/conversion/sakai_2_7_0_oracle_conversion.sql
@@ -369,7 +369,6 @@ create table SST_RESOURCES (ID number(19,0) not null, USER_ID varchar2(99 char)
 create table SST_SITEACTIVITY (ID number(19,0) not null, SITE_ID varchar2(99 char) not null, ACTIVITY_DATE date not null, EVENT_ID varchar2(32 char) not null, ACTIVITY_COUNT number(19,0) not null, primary key (ID));
 create table SST_SITEVISITS (ID number(19,0) not null, SITE_ID varchar2(99 char) not null, VISITS_DATE date not null, TOTAL_VISITS number(19,0) not null, TOTAL_UNIQUE number(19,0) not null, primary key (ID));
 create index SST_EVENTS_SITE_ID_IX on SST_EVENTS (SITE_ID);
-create index SST_EVENTS_USER_ID_IX on SST_EVENTS (USER_ID);
 create index SST_EVENTS_EVENT_ID_IX on SST_EVENTS (EVENT_ID);
 create index SST_EVENTS_DATE_IX on SST_EVENTS (EVENT_DATE);
 create index SST_PREFERENCES_SITE_ID_IX on SST_PREFERENCES (SITE_ID);
@@ -687,4 +686,4 @@ INSERT INTO SAKAI_REALM_RL_FN VALUES((select REALM_KEY from SAKAI_REALM where RE
 -- end SAK-18370
 
 -- SAK-17206
-alter table POLL_OPTION add DELETED number(1,0) DEFAULT NULL;
+alter table POLL_OPTION add DELETED number(1,0) DEFAULT NULL;
diff --git a/reference/docs/conversion/sakai_2_8_0_mysql_conversion.sql b/reference/docs/conversion/sakai_2_8_0_mysql_conversion.sql
@@ -292,7 +292,6 @@ create table SST_PRESENCES (
 -- SAK-20076: missing Sitestats indexes
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 
 --  RES-2: table structure for validationaccount_item

diff --git a/reference/docs/conversion/sakai_2_8_0_mysql_hbm_indexes.sql b/reference/docs/conversion/sakai_2_8_0_mysql_hbm_indexes.sql
@@ -43,7 +43,6 @@ create index PROFILE_STATUS_DATE_ADDED_I on PROFILE_STATUS_T (DATE_ADDED);
 -- SAK-20076 missing Sitestats indexes
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 
 -- SHORTURL-27

diff --git a/reference/docs/conversion/sakai_2_8_0_oracle_conversion.sql b/reference/docs/conversion/sakai_2_8_0_oracle_conversion.sql
@@ -302,7 +302,6 @@ create sequence SST_PRESENCE_ID;
 -- SAK-20076: missing Sitestats indexes
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 
 -- KNL-563: dynamic bundling loading

diff --git a/reference/docs/conversion/sakai_2_8_0_oracle_hbm_indexes.sql b/reference/docs/conversion/sakai_2_8_0_oracle_hbm_indexes.sql
@@ -43,7 +43,6 @@ create index PROFILE_STATUS_DATE_ADDED_I on PROFILE_STATUS_T (DATE_ADDED);
 -- SAK-20076 missing Sitestats indexes
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 
 -- SHORTURL-27

diff --git a/sitestats/schema/db-tables/derby/sitestats.sql b/sitestats/schema/db-tables/derby/sitestats.sql
diff --git a/sitestats/schema/db-tables/hsqldb/sitestats.sql b/sitestats/schema/db-tables/hsqldb/sitestats.sql
@@ -6,15 +6,13 @@ create table SST_REPORTS (ID bigint generated by default as identity (start with
 create table SST_RESOURCES (ID bigint generated by default as identity (start with 1), USER_ID varchar(99) not null, SITE_ID varchar(99) not null, RESOURCE_REF varchar(255) not null, RESOURCE_ACTION varchar(12) not null, RESOURCE_DATE date not null, RESOURCE_COUNT bigint not null, primary key (ID));
 create table SST_SITEACTIVITY (ID bigint generated by default as identity (start with 1), SITE_ID varchar(99) not null, ACTIVITY_DATE date not null, EVENT_ID varchar(32) not null, ACTIVITY_COUNT bigint not null, primary key (ID));
 create table SST_SITEVISITS (ID bigint generated by default as identity (start with 1), SITE_ID varchar(99) not null, VISITS_DATE date not null, TOTAL_VISITS bigint not null, TOTAL_UNIQUE bigint not null, primary key (ID));
-create index SST_EVENTS_USER_ID_IX on SST_EVENTS (USER_ID);
 create index SST_EVENTS_SITE_ID_IX on SST_EVENTS (SITE_ID);
 create index SST_EVENTS_SITEEVENTUSER_ID_IX on SST_EVENTS (USER_ID, SITE_ID, EVENT_ID);
 create index SST_EVENTS_EVENT_ID_IX on SST_EVENTS (EVENT_ID);
 create index SST_EVENTS_DATE_IX on SST_EVENTS (EVENT_DATE);
 create index SST_PREFERENCES_SITE_ID_IX on SST_PREFERENCES (SITE_ID);
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 create index SST_REPORTS_SITE_ID_IX on SST_REPORTS (SITE_ID);
 create index SST_RESOURCES_USER_ID_IX on SST_RESOURCES (USER_ID);

diff --git a/sitestats/schema/db-tables/mssql/sitestats.sql b/sitestats/schema/db-tables/mssql/sitestats.sql
diff --git a/sitestats/schema/db-tables/mysql/sitestats.sql b/sitestats/schema/db-tables/mysql/sitestats.sql
@@ -6,15 +6,13 @@ create table SST_REPORTS (ID bigint not null auto_increment, SITE_ID varchar(99)
 create table SST_RESOURCES (ID bigint not null auto_increment, USER_ID varchar(99) not null, SITE_ID varchar(99) not null, RESOURCE_REF varchar(255) not null, RESOURCE_ACTION varchar(12) not null, RESOURCE_DATE date not null, RESOURCE_COUNT bigint not null, primary key (ID));
 create table SST_SITEACTIVITY (ID bigint not null auto_increment, SITE_ID varchar(99) not null, ACTIVITY_DATE date not null, EVENT_ID varchar(32) not null, ACTIVITY_COUNT bigint not null, primary key (ID));
 create table SST_SITEVISITS (ID bigint not null auto_increment, SITE_ID varchar(99) not null, VISITS_DATE date not null, TOTAL_VISITS bigint not null, TOTAL_UNIQUE bigint not null, primary key (ID));
-create index SST_EVENTS_USER_ID_IX on SST_EVENTS (USER_ID);
 create index SST_EVENTS_SITE_ID_IX on SST_EVENTS (SITE_ID);
 create index SST_EVENTS_SITEEVENTUSER_ID_IX on SST_EVENTS (USER_ID, SITE_ID, EVENT_ID);
 create index SST_EVENTS_EVENT_ID_IX on SST_EVENTS (EVENT_ID);
 create index SST_EVENTS_DATE_IX on SST_EVENTS (EVENT_DATE);
 create index SST_PREFERENCES_SITE_ID_IX on SST_PREFERENCES (SITE_ID);
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 create index SST_REPORTS_SITE_ID_IX on SST_REPORTS (SITE_ID);
 create index SST_RESOURCES_USER_ID_IX on SST_RESOURCES (USER_ID);

diff --git a/sitestats/schema/db-tables/oracle/sitestats.sql b/sitestats/schema/db-tables/oracle/sitestats.sql
@@ -6,15 +6,13 @@ create table SST_REPORTS (ID number(19,0) not null, SITE_ID varchar2(99 char), T
 create table SST_RESOURCES (ID number(19,0) not null, USER_ID varchar2(99 char) not null, SITE_ID varchar2(99 char) not null, RESOURCE_REF varchar2(255 char) not null, RESOURCE_ACTION varchar2(12 char) not null, RESOURCE_DATE date not null, RESOURCE_COUNT number(19,0) not null, primary key (ID));
 create table SST_SITEACTIVITY (ID number(19,0) not null, SITE_ID varchar2(99 char) not null, ACTIVITY_DATE date not null, EVENT_ID varchar2(32 char) not null, ACTIVITY_COUNT number(19,0) not null, primary key (ID));
 create table SST_SITEVISITS (ID number(19,0) not null, SITE_ID varchar2(99 char) not null, VISITS_DATE date not null, TOTAL_VISITS number(19,0) not null, TOTAL_UNIQUE number(19,0) not null, primary key (ID));
-create index SST_EVENTS_USER_ID_IX on SST_EVENTS (USER_ID);
 create index SST_EVENTS_SITE_ID_IX on SST_EVENTS (SITE_ID);
 create index SST_EVENTS_SITEEVENTUSER_ID_IX on SST_EVENTS (USER_ID, SITE_ID, EVENT_ID);
 create index SST_EVENTS_EVENT_ID_IX on SST_EVENTS (EVENT_ID);
 create index SST_EVENTS_DATE_IX on SST_EVENTS (EVENT_DATE);
 create index SST_PREFERENCES_SITE_ID_IX on SST_PREFERENCES (SITE_ID);
 create index SST_PRESENCE_DATE_IX on SST_PRESENCES (P_DATE);
 create index SST_PRESENCE_USER_ID_IX on SST_PRESENCES (USER_ID);
-create index SST_PRESENCE_SITE_ID_IX on SST_PRESENCES (SITE_ID);
 create index SST_PRESENCE_SUD_ID_IX on SST_PRESENCES (SITE_ID, USER_ID, P_DATE);
 create index SST_REPORTS_SITE_ID_IX on SST_REPORTS (SITE_ID);
 create index SST_RESOURCES_USER_ID_IX on SST_RESOURCES (USER_ID);

diff --git a/sitestats/schema/db-tables/postgres/sitestats.sql b/sitestats/schema/db-tables/postgres/sitestats.sql
diff --git a/...ats/sitestats-impl-hib/src/java/org/sakaiproject/sitestats/impl/hbm/EventStatImpl.hbm.xml b/...ats/sitestats-impl-hib/src/java/org/sakaiproject/sitestats/impl/hbm/EventStatImpl.hbm.xml
@@ -11,7 +11,7 @@
 				<param name="sequence">SST_EVENTS_ID</param>
 			</generator>
 		</id>		
-		<property name="userId" type="string" not-null="true" index="SST_EVENTS_USER_ID_IX">
+		<property name="userId" type="string" not-null="true">
 			<column name="USER_ID" length="99" not-null="true" index="SST_EVENTS_SITEEVENTUSER_ID_IX" />
 		</property>
 		<property name="siteId" type="string" not-null="true" index="SST_EVENTS_SITE_ID_IX">