Was what David did, a picture of what Jesus will do when he returns?

It looks like that shortly before Jesus returns, that half of Jerusalem will go forth into captivity.

Zechariah 14:2 For I will gather all nations against Jerusalem to battle; and the city shall be taken, and the houses rifled, and the women ravished; and half of the city shall go forth into captivity, and the residue of the people shall not be cut off from the city.

  3 Then shall the LORD go forth, and fight against those nations, as when he fought in the day of battle.

Shortly before David was anointed king of Judah in Hebron, he and his men came to find that,

the Amalekites had taken their families captive from Ziklag:

I Samuel 30:18a And David recovered all that the Amalekites had carried away:

  19 And there was nothing lacking to them, neither small nor great, neither sons nor daughters, neither spoil, nor any thing that they had taken to them: David recovered all.

Will Jesus, after he returns at the second advent, personally go and deliver those who were taken captive?