Skip to content

Commit e643e0c

Browse files
committed
Solve #986, Add index for tables in SSM
1 parent b009f30 commit e643e0c

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

smart-metastore/src/main/java/org/smartdata/metastore/utils/MetaStoreUtils.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@ public static void initializeDataBase(
102102
"DROP TABLE IF EXISTS sys_info",
103103
"DROP TABLE IF EXISTS cluster_info",
104104

105-
106105
"CREATE TABLE access_count_table (\n" +
107-
" table_name varchar(255) NOT NULL,\n" +
106+
" table_name varchar(255) PRIMARY KEY,\n" +
108107
" start_time bigint(20) NOT NULL,\n" +
109108
" end_time bigint(20) NOT NULL\n" +
110109
") ;",
@@ -121,6 +120,8 @@ public static void initializeDataBase(
121120
" last_access_time bigint(20) NOT NULL,\n" +
122121
" accessed_num int(11) NOT NULL\n" +
123122
") ;",
123+
"CREATE INDEX cached_file_fid_idx ON cached_file (fid);",
124+
"CREATE INDEX cached_file_path_idx ON cached_file (path);",
124125

125126
"CREATE TABLE ec_policy (\n" +
126127
" id INTEGER PRIMARY KEY AUTOINCREMENT,\n" +
@@ -146,6 +147,8 @@ public static void initializeDataBase(
146147
" permission smallint(6) DEFAULT NULL,\n" +
147148
" ec_policy_id smallint(6) DEFAULT NULL\n" +
148149
") ;",
150+
"CREATE INDEX file_fid_idx ON file (fid);",
151+
"CREATE INDEX file_path_idx ON file (path);",
149152

150153
"CREATE TABLE user_group (\n" +
151154
" gid INTEGER PRIMARY KEY AUTOINCREMENT,\n" +
@@ -158,13 +161,13 @@ public static void initializeDataBase(
158161
") ;",
159162

160163
"CREATE TABLE storage (\n" +
161-
" type varchar(255) NOT NULL,\n" +
164+
" type varchar(255) PRIMARY KEY,\n" +
162165
" capacity bigint(20) NOT NULL,\n" +
163166
" free bigint(20) NOT NULL\n" +
164167
") ;",
165168

166169
"CREATE TABLE storage_policy (\n" +
167-
" sid tinyint(4) NOT NULL,\n" +
170+
" sid tinyint(4) PRIMARY KEY,\n" +
168171
" policy_name varchar(64) DEFAULT NULL\n" +
169172
") ;",
170173

@@ -182,9 +185,10 @@ public static void initializeDataBase(
182185
" name varchar(255) NOT NULL,\n" +
183186
" value blob NOT NULL\n" +
184187
") ;",
188+
"CREATE INDEX xattr_fid_idx ON xattr (fid);",
185189

186190
"CREATE TABLE datanode_info (\n" +
187-
" uuid varchar(64) NOT NULL,\n" +
191+
" uuid varchar(64) PRIMARY KEY,\n" +
188192
" hostname varchar(255) NOT NULL,\n" + // DatanodeInfo
189193
" rpcAddress varchar(21) DEFAULT NULL,\n" +
190194
" cache_capacity bigint(20) DEFAULT NULL,\n" +
@@ -193,7 +197,7 @@ public static void initializeDataBase(
193197
") ;",
194198

195199
"CREATE TABLE datanode_storage_info (\n" +
196-
" uuid varchar(64) NOT NULL,\n" +
200+
" uuid varchar(64) PRIMARY KEY,\n" +
197201
" sid tinyint(4) NOT NULL,\n" + // storage type
198202
" state tinyint(4) NOT NULL,\n" + // DatanodeStorage.state
199203
" storage_id varchar(64) NOT NULL,\n" + // StorageReport ...
@@ -262,7 +266,7 @@ public static void initializeDataBase(
262266
") ;",
263267

264268
"CREATE TABLE sys_info (\n" +
265-
" property varchar(512) NOT NULL UNIQUE,\n" +
269+
" property varchar(512) PRIMARY KEY,\n" +
266270
" value varchar(4096) NOT NULL\n" +
267271
");",
268272

@@ -280,7 +284,8 @@ public static void initializeDataBase(
280284
" src varchar(4096) NOT NULL,\n" +
281285
" dest varchar(4096) NOT NULL,\n" +
282286
" period bigint(20) NOT NULL\n" +
283-
") ;"
287+
") ;",
288+
"CREATE INDEX backup_file_rid_idx ON backup_file (rid);"
284289
};
285290
try {
286291
String url = conn.getMetaData().getURL();

smart-metastore/src/test/java/org/smartdata/metastore/TestMetaStore.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ public void testGetMaxActionId() throws Exception {
464464

465465
@Test
466466
public void testInsertStoragePolicyTable() throws Exception {
467-
metaStore.insertStoragePolicyTable(new StoragePolicy((byte) 3, "COOL"));
468-
metaStore.insertStoragePolicyTable(new StoragePolicy((byte) 2, "COLD"));
469-
String value = metaStore.getStoragePolicyName(3);
470-
Assert.assertEquals(metaStore.getStoragePolicyName(2), "COLD");
467+
metaStore.insertStoragePolicyTable(new StoragePolicy((byte) 53, "COOL"));
468+
metaStore.insertStoragePolicyTable(new StoragePolicy((byte) 52, "COLD"));
469+
String value = metaStore.getStoragePolicyName(53);
470+
Assert.assertEquals(metaStore.getStoragePolicyName(52), "COLD");
471471
int key = metaStore.getStoragePolicyID("COOL");
472472
Assert.assertEquals(value, "COOL");
473-
Assert.assertEquals(key, 3);
473+
Assert.assertEquals(key, 53);
474474
}
475475

476476
@Test

0 commit comments

Comments
 (0)