Merge pull request #58 from tinchodias/29-Fix-mongo3CollectionNames-t…

…o-list-beyond-firstBatch

Add command find and getmore

mc/Mongo-Core.package/InsertOperation.class/properties.json

@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "TorstenBergmann 3/4/2015 09:38",
 	"super" : "MongoOperation",
-	"category" : "Mongo-Core-Collections",
+	"category" : "Mongo-Core-Operations",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

mc/Mongo-Core.package/Mongo.class/instance/databaseNames.st

@@ -0,0 +1,3 @@
+operations
+databaseNames
+	^ self listDatabases collect: [:each | each at: 'name' ]

mc/Mongo-Core.package/Mongo.class/instance/databases.st

@@ -1,8 +1,3 @@
 operations
 databases
-	| raw command |
-	command := (OrderedIdentityDictionary new)
-				at: #listDatabases put: 1;
-				yourself.
-	raw := (self admin command: command) at: 'databases'.
-	^raw collect: [:each | self databaseNamed: (each at: 'name')]
+	^ self databaseNames collect: [ :each | self databaseNamed: each ]

mc/Mongo-Core.package/Mongo.class/instance/listDatabases.st

@@ -0,0 +1,7 @@
+operations
+listDatabases
+	| command |
+	command := (OrderedIdentityDictionary new)
+				at: #listDatabases put: 1;
+				yourself.
+	^ (self admin command: command) at: 'databases'

mc/Mongo-Core.package/MongoCollection.class/instance/commandFind.readConcern..st

@@ -0,0 +1,9 @@
+operations
+commandFind: filterDictionary readConcern: aConcern
+	"Find (select) using Mongo command. Answer the output of the command.
+	See more on https://docs.mongodb.com/manual/reference/command/find/"
+
+	^ database
+		commandFind: filterDictionary
+		collection: name
+		readConcern: aConcern

mc/Mongo-Core.package/MongoCollection.class/instance/commandGetMore.batchSize.timeout..st

@@ -0,0 +1,28 @@
+operations
+commandGetMore: cursorId batchSize: batchSizeOrNil timeout: aDurationOrNil
+	"Get a batch of documents from this collection using a cursor id obtained via commandFind* (for example).
+
+	Translates to:
+	
+	{
+	   'getMore': <long>,
+	   'collection': <string>,
+	   'batchSize': <int>,
+	   'maxTimeMS': <int>
+	}
+
+	See: https://docs.mongodb.com/manual/reference/command/getMore/#dbcmd.getMore"
+
+	| dictionary |
+	dictionary := OrderedIdentityDictionary new
+		at: #getMore put: cursorId;
+		at: #collection put: name;
+		yourself.
+
+	batchSizeOrNil ifNotNil: [
+		dictionary at: #batchSize put: batchSizeOrNil ].
+
+	aDurationOrNil ifNotNil: [
+		dictionary at: #maxTimeMS put: aDurationOrNil asMilliSeconds ].
+
+	^ MongoQueryBatch newFromGetMoreResponse: (database command: dictionary)

mc/Mongo-Core.package/MongoCollection.class/instance/ensureAdded.st

@@ -0,0 +1,5 @@
+convenience
+ensureAdded
+	[ database addCollection: name ]
+		on: MongoCollectionAlreadyExists
+		do: [ :error | ]

mc/Mongo-Core.package/MongoCommandCursor.class/README.md

@@ -0,0 +1,6 @@
+Mongodb's provides find-like commands respond the first batch of a cursor. I help to enumerate documents in a database command reply with methods such as #contents, #do: and #collect:.
+
+See: 
+https://docs.mongodb.com/manual/reference/command/find/
+https://docs.mongodb.com/manual/reference/command/listCollections/
+https://docs.mongodb.com/manual/reference/command/getMore/#dbcmd.getMore

mc/Mongo-Core.package/MongoCommandCursor.class/class/database.dictionary..st

@@ -0,0 +1,6 @@
+instance creation
+database: aMongoDatabase dictionary: aCollection 
+	^ self basicNew
+		initializeDatabase: aMongoDatabase
+		command: aCollection;
+		yourself.

mc/Mongo-Core.package/MongoCommandCursor.class/instance/batchSizeOrNil..st

@@ -0,0 +1,3 @@
+accessing
+batchSizeOrNil: anObject
+	batchSizeOrNil := anObject

mc/Mongo-Core.package/MongoCommandCursor.class/instance/batchSizeOrNil.st

@@ -0,0 +1,3 @@
+accessing
+batchSizeOrNil
+	^ batchSizeOrNil

mc/Mongo-Core.package/MongoCommandCursor.class/instance/collect..st

@@ -0,0 +1,4 @@
+enumerating
+collect: aBlockClosure 
+	^ Array streamContents: [ :stream |
+		self do: [ :each | stream nextPut: (aBlockClosure value: each) ] ]

mc/Mongo-Core.package/MongoCommandCursor.class/instance/command.st

@@ -0,0 +1,3 @@
+accessing
+command
+	^ command

mc/Mongo-Core.package/MongoCommandCursor.class/instance/contents.st

@@ -0,0 +1,3 @@
+enumerating
+contents
+	^ self collect: #yourself

mc/Mongo-Core.package/MongoCommandCursor.class/instance/database.st

@@ -0,0 +1,3 @@
+accessing
+database
+	^ database

mc/Mongo-Core.package/MongoCommandCursor.class/instance/do..st

@@ -0,0 +1,8 @@
+enumerating
+do: aBlockClosure 
+	batch := MongoQueryBatch newFromFindResponse: (database command: command).
+
+	[	batch documents do: aBlockClosure.
+		batch atEnd ifTrue: [ ^self ].
+		batch := (database collectionAt: batch collectionName) commandGetMore: batch cursorId batchSize: self batchSizeOrNil timeout: self timeoutOrNil
+		] repeat

mc/Mongo-Core.package/MongoCommandCursor.class/instance/initializeDatabase.command..st

@@ -0,0 +1,6 @@
+initialization
+initializeDatabase: aMongoDatabase command: aCollection 
+	self initialize.
+
+	database := aMongoDatabase.
+	command := aCollection.

mc/Mongo-Core.package/MongoCommandCursor.class/instance/timeoutOrNil..st

@@ -0,0 +1,3 @@
+accessing
+timeoutOrNil: aDuration
+	timeoutOrNil := aDuration

mc/Mongo-Core.package/MongoCommandCursor.class/instance/timeoutOrNil.st

@@ -0,0 +1,3 @@
+accessing
+timeoutOrNil
+	^ timeoutOrNil

mc/Mongo-Core.package/MongoCommandCursor.class/properties.json

@@ -0,0 +1,17 @@
+{
+	"commentStamp" : "MartinDias 7/30/2019 12:47",
+	"super" : "Object",
+	"category" : "Mongo-Core-Utilities",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"database",
+		"batch",
+		"command",
+		"batchSizeOrNil",
+		"timeoutOrNil"
+	],
+	"name" : "MongoCommandCursor",
+	"type" : "normal"
+}

mc/Mongo-Core.package/MongoDatabase.class/instance/addCollection..st

@@ -1,3 +1,7 @@
 operations
 addCollection: aString
-	^self addCollection: aString capped: false size: nil max: nil.
+	^ self
+		addCollection: aString
+		capped: false
+		size: nil
+		max: nil

mc/Mongo-Core.package/MongoDatabase.class/instance/addCollection.capped.size.max..st

@@ -15,4 +15,4 @@ addCollection: aString capped: aCapped size: aSize max: aMax
 			error isCollectionAlreadyExists
 				ifTrue: [ (MongoCollectionAlreadyExists new collectionName: aString) signal ]
 				ifFalse: [ error signal ] ].
-	^MongoCollection database: self name: aString
+	^ self collectionAt: aString

mc/Mongo-Core.package/MongoDatabase.class/instance/collectionAt..st

@@ -1,7 +1,5 @@
 accessing
 collectionAt: aString 
-	"Answers the collection in this database that has aString as name (or nil)"
+	"Answers a MongoCollection for this database that has aString as name (may not exist)."
 
-	^ self collections 
-		detect:  [ :e | e name = aString ]
-		ifNone: [ nil ]
+	^ MongoCollection database: self name: aString

mc/Mongo-Core.package/MongoDatabase.class/instance/collectionNames.st

@@ -1,9 +1,16 @@
 operations
 collectionNames
-	"Answer the names of the collections in this database (for MongoDB >= 3.0).
+	"Answer the names of the collections in this database.
 
 	See more at https://docs.mongodb.com/manual/reference/command/listCollections/"
 
-	| reply |
-	reply := self command: {(#listCollections -> 1)} asDictionary.
-	^ ((reply at: 'cursor') at: 'firstBatch') collect: [ :each | each at: 'name' ]
+	| dictionary |
+	dictionary := OrderedIdentityDictionary new
+		at: #listCollections put: 1;
+		at: #nameOnly put: true;
+		yourself.
+
+	^ (MongoCommandCursor
+		database: self
+		dictionary: dictionary)
+		collect: [ :each | each at: 'name' ].

mc/Mongo-Core.package/MongoDatabase.class/instance/collections.st

@@ -2,5 +2,4 @@ operations
 collections
 	"Answer the collections in this database"
 
-	^ self collectionNames
-		collect: [ :each | MongoCollection database: self name: each ]
+	^ self collectionNames collect: [ :each | self collectionAt: each ]

mc/Mongo-Core.package/MongoDatabase.class/instance/commandFind.collection.readConcern..st

@@ -0,0 +1,13 @@
+operations
+commandFind: filterDictionary collection: collectionName readConcern: aConcern
+
+	| dict |
+	dict := {
+		'find' -> collectionName.
+		'filter' -> filterDictionary.
+		} as: OrderedDictionary.
+
+	aConcern ifNotNil: [
+		dict at: 'readConcern' put: aConcern concernForCommand ].
+
+	^ MongoCommandCursor database: self dictionary: dict

mc/Mongo-Core.package/MongoDatabase.class/instance/getCollection..st

@@ -1,6 +1,5 @@
 operations
 getCollection: aString
-	^ [ self addCollection: aString capped: false size: nil max: nil ]
-		on: MongoCollectionAlreadyExists 
-		do: [ :err | 
-			MongoCollection database: self name: aString ]
+	^ (self collectionAt: aString)
+		ensureAdded;
+		yourself

mc/Mongo-Core.package/MongoDatabase.class/instance/listCollections.st

@@ -0,0 +1,6 @@
+operations
+listCollections
+	"Answer the raw response of listCollections command.
+	See more at https://docs.mongodb.com/manual/reference/command/listCollections/"
+
+	^ self command: { #listCollections -> 1 } asDictionary

mc/Mongo-Core.package/MongoQueryBatch.class/class/newFromFindResponse..st

@@ -0,0 +1,10 @@
+instance creation
+newFromFindResponse: aDictionary
+
+	| cursorDictionary |
+	cursorDictionary := aDictionary at: 'cursor'.
+	^ self basicNew
+		initializeWithCollectionName: (cursorDictionary at: 'ns')
+		documents: (cursorDictionary at: 'firstBatch')
+		cursorId: (cursorDictionary at: 'id');
+		yourself

mc/Mongo-Core.package/MongoQueryBatch.class/class/newFromGetMoreResponse..st

@@ -0,0 +1,10 @@
+instance creation
+newFromGetMoreResponse: aDictionary
+
+	| cursorDictionary |
+	cursorDictionary := aDictionary at: 'cursor'.
+	^ self basicNew
+		initializeWithCollectionName: (cursorDictionary at: 'ns')
+		documents: (cursorDictionary at: 'nextBatch')
+		cursorId: (cursorDictionary at: 'id');
+		yourself

mc/Mongo-Core.package/MongoQueryBatch.class/instance/atEnd.st

@@ -0,0 +1,3 @@
+accessing
+atEnd
+	^ self cursorId = 0

mc/Mongo-Core.package/MongoQueryBatch.class/instance/collectionName.st

@@ -0,0 +1,3 @@
+accessing
+collectionName
+	^ collectionName

mc/Mongo-Core.package/MongoQueryBatch.class/instance/cursorId.st

@@ -0,0 +1,3 @@
+accessing
+cursorId
+	^ cursorId

mc/Mongo-Core.package/MongoQueryBatch.class/instance/documents.st

@@ -0,0 +1,3 @@
+accessing
+documents
+	^ documents

mc/Mongo-Core.package/MongoQueryBatch.class/instance/initializeWithCollectionName.documents.cursorId..st

@@ -0,0 +1,8 @@
+initialization
+initializeWithCollectionName: aString documents: aCollection cursorId: anInteger
+	self initialize.
+
+	self flag: #todo. "This code removes the db name, and it's a bit strange to have it here."	
+	collectionName := aString readStream upTo: $.; upToEnd.
+	documents := aCollection.
+	cursorId := anInteger.

mc/Mongo-Core.package/MongoQueryBatch.class/properties.json

@@ -0,0 +1,15 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "Mongo-Core-Responses",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"documents",
+		"collectionName",
+		"cursorId"
+	],
+	"name" : "MongoQueryBatch",
+	"type" : "normal"
+}

mc/Mongo-Core.package/MongoReplicaSetConfig.class/properties.json

@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "MartinDias 5/12/2016 01:30",
 	"super" : "Object",
-	"category" : "Mongo-Core-Replication",
+	"category" : "Mongo-Core-Responses",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

mc/Mongo-Core.package/MongoReplicaSetConfigMember.class/properties.json

@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "MartinDias 5/12/2016 01:31",
 	"super" : "Object",
-	"category" : "Mongo-Core-Replication",
+	"category" : "Mongo-Core-Responses",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

mc/Mongo-Core.package/MongoReplicaSetStatus.class/properties.json

@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "MartinDias 5/12/2016 01:31",
 	"super" : "Object",
-	"category" : "Mongo-Core-Replication",
+	"category" : "Mongo-Core-Responses",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

mc/Mongo-Core.package/MongoReplicaSetStatusMember.class/properties.json

@@ -1,7 +1,7 @@
 {
 	"commentStamp" : "MartinDias 5/12/2016 01:32",
 	"super" : "Object",
-	"category" : "Mongo-Core-Replication",
+	"category" : "Mongo-Core-Responses",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [ ],

mc/Mongo-Core.package/monticello.meta/categories.st

@@ -2,6 +2,7 @@ SystemOrganization addCategory: #'Mongo-Core'!
 SystemOrganization addCategory: #'Mongo-Core-Auth'!
 SystemOrganization addCategory: #'Mongo-Core-Base'!
 SystemOrganization addCategory: #'Mongo-Core-Collections'!
+SystemOrganization addCategory: #'Mongo-Core-Commands'!
 SystemOrganization addCategory: #'Mongo-Core-Errors'!
 SystemOrganization addCategory: #'Mongo-Core-Operations'!
 SystemOrganization addCategory: #'Mongo-Core-Replication'!

mc/Mongo-Tests-Core.package/MongoCommandCursorTest.class/instance/assertExpectedDocuments..st

@@ -0,0 +1,8 @@
+tests
+assertExpectedDocuments: aCollection
+	self assert: aCollection size equals: self expectedDocumentCount.
+
+	aCollection doWithIndex: [ :each :index |
+		self baseDocumentForTesting keysAndValuesDo: [ :key :value |
+			self assert: (each at: key) equals: value ].
+		self assert: (each at: 'index') equals: index ].