Let me expand upon my previous comment in para 3 about the number of swords.
In 1588, Hideyoshi instituted a Katanagari (Sword Hunt)
Here's what Wiki has to say about it:
In 1588, Toyotomi Hideyoshi, having become kampaku or "imperial regent", ordered a new sword hunt; Hideyoshi, like Nobunaga, sought to solidify separations in the class structure, denying commoners weapons while allowing them to the nobility, the samurai class. In addition, Toyotomi's sword hunt, like Nobunaga's, was intended to prevent peasant uprisings and to deny weapons to his adversaries. This hunt may have been inspired by a peasant uprising in Higo the year prior, but also served to disarm the sōhei of Mount Kōya and Tōnomine. Toyotomi claimed that the confiscated weapons would be melted down and used to create a giant image of the Buddha for the Asuka-deramonastery in Nara.
"Taikō's Sword Hunt", as it came to be called, was accompanied by a number of other edicts, including the Expulsion Edict of 1590, by which Toyotomi sought to establish a census and expel from villages any newcomers who arrived in or after 1590. The chief goal of this was to place a check on the threat posed by rōnin, masterless wandering samurai who had the potential not only for crime and violence in general, but for banding together to overthrow Toyotomi rule. Hideyoshi, like most of this period, believed in rule by edict, paying little or no attention to legal principles.
While the Sword Hunt ostensibly succeeded in denying weapons to potential rebels, it also created discontent throughout the nation, increasing the number and passion of potential rebels.