Skip to content

Commit 89558a7

Browse files
mymeiyimymeiyi
committed
fix ut
1 parent 223b4d9 commit 89558a7

File tree

7 files changed

+21
-16
lines changed

7 files changed

+21
-16
lines changed

‎fe/fe-core/src/test/java/org/apache/doris/backup/CatalogMocker.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.doris.catalog.FakeEditLog;
2828
import org.apache.doris.catalog.HashDistributionInfo;
2929
import org.apache.doris.catalog.KeysType;
30+
import org.apache.doris.catalog.LocalTablet;
3031
import org.apache.doris.catalog.MaterializedIndex;
3132
import org.apache.doris.catalog.MaterializedIndex.IndexState;
3233
import org.apache.doris.catalog.MysqlTable;
@@ -247,7 +248,7 @@ public static Database mockDb() throws UserException {
247248
KeysType.AGG_KEYS, partitionInfo, distributionInfo);
248249
Deencapsulation.setField(olapTable, "baseIndexId", TEST_TBL_ID);
249250

250-
Tablet tablet0 = new Tablet(TEST_TABLET0_ID);
251+
Tablet tablet0 = new LocalTablet(TEST_TABLET0_ID);
251252
TabletMeta tabletMeta = new TabletMeta(TEST_DB_ID, TEST_TBL_ID, TEST_SINGLE_PARTITION_ID,
252253
TEST_TBL_ID, SCHEMA_HASH, TStorageMedium.HDD);
253254
baseIndex.addTablet(tablet0, tabletMeta);
@@ -321,7 +322,7 @@ public static Database mockDb() throws UserException {
321322
KeysType.AGG_KEYS, rangePartitionInfo, distributionInfo2);
322323
Deencapsulation.setField(olapTable2, "baseIndexId", TEST_TBL2_ID);
323324

324-
Tablet baseTabletP1 = new Tablet(TEST_BASE_TABLET_P1_ID);
325+
Tablet baseTabletP1 = new LocalTablet(TEST_BASE_TABLET_P1_ID);
325326
TabletMeta tabletMetaBaseTabletP1 = new TabletMeta(TEST_DB_ID, TEST_TBL2_ID, TEST_PARTITION1_ID,
326327
TEST_TBL2_ID, SCHEMA_HASH, TStorageMedium.HDD);
327328
baseIndexP1.addTablet(baseTabletP1, tabletMetaBaseTabletP1);
@@ -333,7 +334,7 @@ public static Database mockDb() throws UserException {
333334
baseTabletP1.addReplica(replica4);
334335
baseTabletP1.addReplica(replica5);
335336

336-
Tablet baseTabletP2 = new Tablet(TEST_BASE_TABLET_P2_ID);
337+
Tablet baseTabletP2 = new LocalTablet(TEST_BASE_TABLET_P2_ID);
337338
TabletMeta tabletMetaBaseTabletP2 = new TabletMeta(TEST_DB_ID, TEST_TBL2_ID, TEST_PARTITION2_ID,
338339
TEST_TBL2_ID, SCHEMA_HASH, TStorageMedium.HDD);
339340
baseIndexP2.addTablet(baseTabletP2, tabletMetaBaseTabletP2);
@@ -353,7 +354,7 @@ public static Database mockDb() throws UserException {
353354

354355
// rollup index p1
355356
MaterializedIndex rollupIndexP1 = new MaterializedIndex(TEST_ROLLUP_ID, IndexState.NORMAL);
356-
Tablet rollupTabletP1 = new Tablet(TEST_ROLLUP_TABLET_P1_ID);
357+
Tablet rollupTabletP1 = new LocalTablet(TEST_ROLLUP_TABLET_P1_ID);
357358
TabletMeta tabletMetaRollupTabletP1 = new TabletMeta(TEST_DB_ID, TEST_TBL2_ID, TEST_PARTITION1_ID,
358359
TEST_ROLLUP_TABLET_P1_ID, ROLLUP_SCHEMA_HASH,
359360
TStorageMedium.HDD);
@@ -370,7 +371,7 @@ public static Database mockDb() throws UserException {
370371

371372
// rollup index p2
372373
MaterializedIndex rollupIndexP2 = new MaterializedIndex(TEST_ROLLUP_ID, IndexState.NORMAL);
373-
Tablet rollupTabletP2 = new Tablet(TEST_ROLLUP_TABLET_P2_ID);
374+
Tablet rollupTabletP2 = new LocalTablet(TEST_ROLLUP_TABLET_P2_ID);
374375
TabletMeta tabletMetaRollupTabletP2 = new TabletMeta(TEST_DB_ID, TEST_TBL2_ID, TEST_PARTITION1_ID,
375376
TEST_ROLLUP_TABLET_P2_ID, ROLLUP_SCHEMA_HASH,
376377
TStorageMedium.HDD);

‎fe/fe-core/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public static Database createSimpleDb(long dbId, long tableId, long partitionId,
198198

199199

200200
// tablet
201-
Tablet tablet = new Tablet(tabletId);
201+
Tablet tablet = new LocalTablet(tabletId);
202202

203203
// index
204204
MaterializedIndex index = new MaterializedIndex(indexId, IndexState.NORMAL);
@@ -268,7 +268,7 @@ public static void createDupTable(Database db) {
268268
}
269269

270270
// tablet
271-
Tablet tablet = new Tablet(testTabletId2);
271+
Tablet tablet = new LocalTablet(testTabletId2);
272272

273273
// index
274274
MaterializedIndex index = new MaterializedIndex(testIndexId2, IndexState.NORMAL);

‎fe/fe-core/src/test/java/org/apache/doris/catalog/TabletTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void makeTablet() {
8080
}
8181
};
8282

83-
tablet = new Tablet(1);
83+
tablet = new LocalTablet(1);
8484
TabletMeta tabletMeta = new TabletMeta(10, 20, 30, 40, 1, TStorageMedium.HDD);
8585
invertedIndex.addTablet(1, tabletMeta);
8686
replica1 = new Replica(1L, 1L, 100L, 0, 200000L, 0, 3000L, ReplicaState.NORMAL, 0, 0);
@@ -146,7 +146,7 @@ public void testSerialization() throws Exception {
146146
Assert.assertEquals(rTablet1, tablet);
147147
Assert.assertEquals(rTablet1, rTablet1);
148148

149-
Tablet tablet2 = new Tablet(1);
149+
Tablet tablet2 = new LocalTablet(1);
150150
Replica replica1 = new Replica(1L, 1L, 100L, 0, 200000L, 0, 3000L, ReplicaState.NORMAL, 0, 0);
151151
Replica replica2 = new Replica(2L, 2L, 100L, 0, 200000L, 0, 3000L, ReplicaState.NORMAL, 0, 0);
152152
Replica replica3 = new Replica(3L, 3L, 100L, 0, 200000L, 0, 3000L, ReplicaState.NORMAL, 0, 0);
@@ -156,7 +156,7 @@ public void testSerialization() throws Exception {
156156
tablet2.addReplica(replica3);
157157
Assert.assertEquals(tablet2, tablet);
158158

159-
Tablet tablet3 = new Tablet(1);
159+
Tablet tablet3 = new LocalTablet(1);
160160
tablet3.addReplica(replica1);
161161
tablet3.addReplica(replica2);
162162
tablet3.addReplica(new Replica(4L, 4L, 100L, 0, 200000L, 0, 3000L, ReplicaState.NORMAL, 0, 0));
@@ -173,7 +173,7 @@ public void testSerialization() throws Exception {
173173
@SafeVarargs
174174
private final void testTabletColocateHealthStatus0(Tablet.TabletStatus exceptedTabletStatus,
175175
Pair<Long, Boolean>... backendId2ReplicaIsBad) {
176-
Tablet tablet = new Tablet(1);
176+
Tablet tablet = new LocalTablet(1);
177177
int replicaId = 1;
178178
for (Pair<Long, Boolean> pair : backendId2ReplicaIsBad) {
179179
long versionAndSuccessVersion = 100L;
@@ -218,7 +218,7 @@ public void testTabletColocateHealthStatus() {
218218

219219
@Test
220220
public void testGetMinReplicaRowCount() {
221-
Tablet t = new Tablet(1);
221+
Tablet t = new LocalTablet(1);
222222
long row = t.getMinReplicaRowCount(1);
223223
Assert.assertEquals(0, row);
224224

‎fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.apache.doris.catalog.Database;
2121
import org.apache.doris.catalog.DiskInfo;
2222
import org.apache.doris.catalog.Env;
23+
import org.apache.doris.catalog.LocalTablet;
2324
import org.apache.doris.catalog.MaterializedIndex;
2425
import org.apache.doris.catalog.MysqlCompatibleDatabase;
2526
import org.apache.doris.catalog.OlapTable;
@@ -85,7 +86,7 @@ public static void createTablet(TabletInvertedIndex invertedIndex, Database db,
8586

8687
TabletMeta tabletMeta = new TabletMeta(db.getId(), olapTable.getId(),
8788
partition.getId(), baseIndex.getId(), schemaHash, medium);
88-
Tablet tablet = new Tablet(tabletId);
89+
Tablet tablet = new LocalTablet(tabletId);
8990

9091
// add tablet to olapTable
9192
olapTable.getPartition("p0").getBaseIndex().addTablet(tablet, tabletMeta);

‎fe/fe-core/src/test/java/org/apache/doris/cloud/cache/CacheHotspotManagerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.doris.cloud.cache;
1919

20+
import org.apache.doris.catalog.LocalTablet;
2021
import org.apache.doris.catalog.MaterializedIndex;
2122
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
2223
import org.apache.doris.catalog.Partition;
@@ -89,7 +90,7 @@ List<Backend> getBackendsFromCluster(String dstClusterName) {
8990
@Mock
9091
public List<Tablet> getTabletsFromIndexs(List<MaterializedIndex> indexes) {
9192
List<Tablet> list = new ArrayList<>();
92-
Tablet tablet = new Tablet(1001L);
93+
Tablet tablet = new LocalTablet(1001L);
9394
list.add(tablet);
9495
return list;
9596
}

‎fe/fe-core/src/test/java/org/apache/doris/common/util/UnitTestUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.doris.catalog.DataProperty;
2323
import org.apache.doris.catalog.Database;
2424
import org.apache.doris.catalog.KeysType;
25+
import org.apache.doris.catalog.LocalTablet;
2526
import org.apache.doris.catalog.MaterializedIndex;
2627
import org.apache.doris.catalog.MaterializedIndex.IndexState;
2728
import org.apache.doris.catalog.OlapTable;
@@ -76,7 +77,7 @@ public static OlapTable createTable(Database db, long tableId, String tableName,
7677
Replica replica3 = new Replica(replicaId + 2, backendId + 2, ReplicaState.NORMAL, version, 0);
7778

7879
// tablet
79-
Tablet tablet = new Tablet(tabletId);
80+
Tablet tablet = new LocalTablet(tabletId);
8081

8182
// index
8283
MaterializedIndex index = new MaterializedIndex(indexId, IndexState.NORMAL);

‎fe/fe-core/src/test/java/org/apache/doris/http/DorisHttpTestCase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.doris.catalog.EsResource;
2727
import org.apache.doris.catalog.EsTable;
2828
import org.apache.doris.catalog.KeysType;
29+
import org.apache.doris.catalog.LocalTablet;
2930
import org.apache.doris.catalog.MaterializedIndex;
3031
import org.apache.doris.catalog.OlapTable;
3132
import org.apache.doris.catalog.Partition;
@@ -152,7 +153,7 @@ public static OlapTable newTable(String name) {
152153
Replica.ReplicaState.NORMAL, -1, 0);
153154

154155
// tablet
155-
Tablet tablet = new Tablet(tabletId);
156+
Tablet tablet = new LocalTablet(tabletId);
156157

157158
// index
158159
MaterializedIndex baseIndex = new MaterializedIndex(testIndexId, MaterializedIndex.IndexState.NORMAL);

0 commit comments

Comments
 (0)