Skip to content

Commit c67ba78

Browse files
tedxutedxu
committed
remove useless comments
Signed-off-by: Ted Xu <[email protected]>
1 parent 3ae10dd commit c67ba78

File tree

2 files changed

+0
-68
lines changed

2 files changed

+0
-68
lines changed

‎internal/datacoord/compaction.go

-4
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,6 @@ func (c *compactionPlanHandler) removeTasksByChannel(channel string) {
591591
}
592592

593593
func (c *compactionPlanHandler) submitTask(t CompactionTask) error {
594-
// _, span := otel.Tracer(typeutil.DataCoordRole).Start(context.Background(), fmt.Sprintf("Compaction-%s", t.GetTaskProto().GetType()))
595-
// t.SetSpan(span)
596594
if err := c.queueTasks.Enqueue(t); err != nil {
597595
return err
598596
}
@@ -602,8 +600,6 @@ func (c *compactionPlanHandler) submitTask(t CompactionTask) error {
602600

603601
// restoreTask used to restore Task from etcd
604602
func (c *compactionPlanHandler) restoreTask(t CompactionTask) {
605-
// _, span := otel.Tracer(typeutil.DataCoordRole).Start(context.Background(), fmt.Sprintf("Compaction-%s", t.GetTaskProto().GetType()))
606-
// t.SetSpan(span)
607603
c.executingGuard.Lock()
608604
c.executingTasks[t.GetTaskProto().GetPlanID()] = t
609605
c.executingGuard.Unlock()

‎internal/datacoord/compaction_test.go

-64
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ func (s *CompactionPlanHandlerSuite) TestScheduleEmpty() {
7575

7676
func (s *CompactionPlanHandlerSuite) generateInitTasksForSchedule() {
7777
task1 := &mixCompactionTask{
78-
// plan: &datapb.CompactionPlan{PlanID: 1, Channel: "ch-1", Type: datapb.CompactionType_MixCompaction},
7978
sessions: s.mockSessMgr,
8079
meta: s.mockMeta,
8180
}
@@ -88,7 +87,6 @@ func (s *CompactionPlanHandlerSuite) generateInitTasksForSchedule() {
8887
})
8988

9089
task2 := &mixCompactionTask{
91-
// plan: &datapb.CompactionPlan{PlanID: 2, Channel: "ch-1", Type: datapb.CompactionType_MixCompaction},
9290
sessions: s.mockSessMgr,
9391
meta: s.mockMeta,
9492
}
@@ -101,7 +99,6 @@ func (s *CompactionPlanHandlerSuite) generateInitTasksForSchedule() {
10199
})
102100

103101
task3 := &mixCompactionTask{
104-
// plan: &datapb.CompactionPlan{PlanID: 3, Channel: "ch-2", Type: datapb.CompactionType_MixCompaction},
105102
sessions: s.mockSessMgr,
106103
meta: s.mockMeta,
107104
}
@@ -114,7 +111,6 @@ func (s *CompactionPlanHandlerSuite) generateInitTasksForSchedule() {
114111
})
115112

116113
task4 := &mixCompactionTask{
117-
// plan: &datapb.CompactionPlan{PlanID: 4, Channel: "ch-3", Type: datapb.CompactionType_Level0DeleteCompaction},
118114
sessions: s.mockSessMgr,
119115
meta: s.mockMeta,
120116
}
@@ -525,23 +521,13 @@ func (s *CompactionPlanHandlerSuite) TestRemoveTasksByChannel() {
525521
Channel: ch,
526522
NodeID: 1,
527523
}, nil, s.mockMeta, s.mockSessMgr)
528-
// t1.plan = &datapb.CompactionPlan{
529-
// PlanID: 19530,
530-
// Channel: ch,
531-
// Type: datapb.CompactionType_MixCompaction,
532-
// }
533524

534525
t2 := newMixCompactionTask(&datapb.CompactionTask{
535526
PlanID: 19531,
536527
Type: datapb.CompactionType_MixCompaction,
537528
Channel: ch,
538529
NodeID: 1,
539530
}, nil, s.mockMeta, s.mockSessMgr)
540-
// t2.plan = &datapb.CompactionPlan{
541-
// PlanID: 19531,
542-
// Channel: ch,
543-
// Type: datapb.CompactionType_MixCompaction,
544-
// }
545531

546532
s.handler.submitTask(t1)
547533
s.handler.restoreTask(t2)
@@ -558,11 +544,6 @@ func (s *CompactionPlanHandlerSuite) TestGetCompactionTask() {
558544
Channel: "ch-01",
559545
State: datapb.CompactionTaskState_executing,
560546
}, nil, s.mockMeta, s.mockSessMgr)
561-
// t1.plan = &datapb.CompactionPlan{
562-
// PlanID: 1,
563-
// Type: datapb.CompactionType_MixCompaction,
564-
// Channel: "ch-01",
565-
// }
566547

567548
t2 := newMixCompactionTask(&datapb.CompactionTask{
568549
TriggerID: 1,
@@ -571,11 +552,6 @@ func (s *CompactionPlanHandlerSuite) TestGetCompactionTask() {
571552
Channel: "ch-01",
572553
State: datapb.CompactionTaskState_completed,
573554
}, nil, s.mockMeta, s.mockSessMgr)
574-
// t2.plan = &datapb.CompactionPlan{
575-
// PlanID: 2,
576-
// Type: datapb.CompactionType_MixCompaction,
577-
// Channel: "ch-01",
578-
// }
579555

580556
t3 := newL0CompactionTask(&datapb.CompactionTask{
581557
TriggerID: 1,
@@ -584,11 +560,6 @@ func (s *CompactionPlanHandlerSuite) TestGetCompactionTask() {
584560
Channel: "ch-02",
585561
State: datapb.CompactionTaskState_failed,
586562
}, nil, s.mockMeta, s.mockSessMgr)
587-
// t3.plan = &datapb.CompactionPlan{
588-
// PlanID: 3,
589-
// Type: datapb.CompactionType_Level0DeleteCompaction,
590-
// Channel: "ch-02",
591-
// }
592563

593564
inTasks := map[int64]CompactionTask{
594565
1: t1,
@@ -633,11 +604,6 @@ func (s *CompactionPlanHandlerSuite) TestCompactionQueueFull() {
633604
Channel: "ch-01",
634605
State: datapb.CompactionTaskState_executing,
635606
}, nil, s.mockMeta, s.mockSessMgr)
636-
// t1.plan = &datapb.CompactionPlan{
637-
// PlanID: 1,
638-
// Type: datapb.CompactionType_MixCompaction,
639-
// Channel: "ch-01",
640-
// }
641607

642608
s.NoError(s.handler.submitTask(t1))
643609

@@ -648,11 +614,6 @@ func (s *CompactionPlanHandlerSuite) TestCompactionQueueFull() {
648614
Channel: "ch-01",
649615
State: datapb.CompactionTaskState_completed,
650616
}, nil, s.mockMeta, s.mockSessMgr)
651-
// t2.plan = &datapb.CompactionPlan{
652-
// PlanID: 2,
653-
// Type: datapb.CompactionType_MixCompaction,
654-
// Channel: "ch-01",
655-
// }
656617

657618
s.Error(s.handler.submitTask(t2))
658619
}
@@ -709,11 +670,6 @@ func (s *CompactionPlanHandlerSuite) TestCheckCompaction() {
709670
State: datapb.CompactionTaskState_executing,
710671
NodeID: 111,
711672
}, nil, s.mockMeta, s.mockSessMgr)
712-
// t1.plan = &datapb.CompactionPlan{
713-
// PlanID: 1, Channel: "ch-1",
714-
// TimeoutInSeconds: 1,
715-
// Type: datapb.CompactionType_MixCompaction,
716-
// }
717673

718674
t2 := newMixCompactionTask(&datapb.CompactionTask{
719675
PlanID: 2,
@@ -722,11 +678,6 @@ func (s *CompactionPlanHandlerSuite) TestCheckCompaction() {
722678
State: datapb.CompactionTaskState_executing,
723679
NodeID: 111,
724680
}, nil, s.mockMeta, s.mockSessMgr)
725-
// t2.plan = &datapb.CompactionPlan{
726-
// PlanID: 2,
727-
// Channel: "ch-1",
728-
// Type: datapb.CompactionType_MixCompaction,
729-
// }
730681

731682
t3 := newMixCompactionTask(&datapb.CompactionTask{
732683
PlanID: 3,
@@ -735,11 +686,6 @@ func (s *CompactionPlanHandlerSuite) TestCheckCompaction() {
735686
State: datapb.CompactionTaskState_timeout,
736687
NodeID: 111,
737688
}, nil, s.mockMeta, s.mockSessMgr)
738-
// t3.plan = &datapb.CompactionPlan{
739-
// PlanID: 3,
740-
// Channel: "ch-1",
741-
// Type: datapb.CompactionType_MixCompaction,
742-
// }
743689

744690
t4 := newMixCompactionTask(&datapb.CompactionTask{
745691
PlanID: 4,
@@ -748,11 +694,6 @@ func (s *CompactionPlanHandlerSuite) TestCheckCompaction() {
748694
State: datapb.CompactionTaskState_timeout,
749695
NodeID: 111,
750696
}, nil, s.mockMeta, s.mockSessMgr)
751-
// t4.plan = &datapb.CompactionPlan{
752-
// PlanID: 4,
753-
// Channel: "ch-1",
754-
// Type: datapb.CompactionType_MixCompaction,
755-
// }
756697

757698
t6 := newMixCompactionTask(&datapb.CompactionTask{
758699
PlanID: 6,
@@ -761,11 +702,6 @@ func (s *CompactionPlanHandlerSuite) TestCheckCompaction() {
761702
State: datapb.CompactionTaskState_executing,
762703
NodeID: 111,
763704
}, nil, s.mockMeta, s.mockSessMgr)
764-
// t6.plan = &datapb.CompactionPlan{
765-
// PlanID: 6,
766-
// Channel: "ch-2",
767-
// Type: datapb.CompactionType_MixCompaction,
768-
// }
769705

770706
inTasks := map[int64]CompactionTask{
771707
1: t1,

0 commit comments

Comments
 (0)