Skip to content

COMPASS-703 extract index field names from arrays of sub-docs #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2017
Merged

COMPASS-703 extract index field names from arrays of sub-docs #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f47314
extract field names from arrays of sub-docs
Mar 1, 2017
37dedaf
Merge branch 'master' into COMPASS-703-index-on-array-subfields
durran Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/internal-packages/indexes/lib/store/create-index-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const Reflux = require('reflux');
const EJSON = require('mongodb-extended-json');
const Action = require('../action/index-actions');
const NamespaceStore = require('hadron-reflux-store').NamespaceStore;
const _ = require('lodash');

// const debug = require('debug')('mongodb-compass:ddl:index:store');

Expand Down Expand Up @@ -125,9 +126,16 @@ const CreateIndexStore = Reflux.createStore({
// recursively search sub documents
for (const type of field.types) {
if (type.name === 'Document') {
// append . to current path so nested documents have proper prefix
// add nested sub-fields to list of index fields
possiblePaths = possiblePaths.concat(this._parseSchemaFields(type.fields, path + '.'));
}
if (type.name === 'Array') {
// add nested sub-fields of document type to list of index fields
const docType = _.find(type.types, 'name', 'Document');
if (docType) {
possiblePaths = possiblePaths.concat(this._parseSchemaFields(docType.fields, path + '.'));
}
}
}
}
return possiblePaths;
Expand Down
319 changes: 319 additions & 0 deletions test/fixtures/array_of_docs.fixture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
{
"fields": [
{
"name": "_id",
"path": "_id",
"count": 4,
"types": [
{
"name": "ObjectID",
"bsonType": "ObjectID",
"path": "_id",
"count": 4,
"values": [
{
"$oid": "5626704c0104270098888917"
},
{
"$oid": "5626704b0104270098888916"
},
{
"$oid": "5626704d0104270098888918"
},
{
"$oid": "58b66452509f926100cd8812"
}
],
"total_count": 0,
"probability": 1,
"unique": 4,
"has_duplicates": false
}
],
"total_count": 4,
"type": "ObjectID",
"has_duplicates": false,
"probability": 1
},
{
"name": "review",
"path": "review",
"count": 1,
"types": [
{
"name": "Undefined",
"type": "Undefined",
"path": "review",
"count": 3,
"total_count": 0,
"probability": 0.75,
"unique": 1,
"has_duplicates": true
},
{
"name": "Document",
"bsonType": "Document",
"path": "review",
"count": 1,
"fields": [
{
"name": "_id",
"path": "review._id",
"count": 1,
"types": [
{
"name": "Number",
"bsonType": "Number",
"path": "review._id",
"count": 1,
"values": [
3
],
"total_count": 0,
"probability": 1,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 1,
"type": "Number",
"has_duplicates": false,
"probability": 1
},
{
"name": "rating",
"path": "review.rating",
"count": 1,
"types": [
{
"name": "Number",
"bsonType": "Number",
"path": "review.rating",
"count": 1,
"values": [
9
],
"total_count": 0,
"probability": 1,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 1,
"type": "Number",
"has_duplicates": false,
"probability": 1
},
{
"name": "text",
"path": "review.text",
"count": 1,
"types": [
{
"name": "String",
"bsonType": "String",
"path": "review.text",
"count": 1,
"values": [
"it was great!"
],
"total_count": 0,
"probability": 1,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 1,
"type": "String",
"has_duplicates": false,
"probability": 1
}
],
"total_count": 0,
"probability": 0.25
}
],
"total_count": 4,
"type": [
"Undefined",
"Document"
],
"has_duplicates": true,
"probability": 0.25
},
{
"name": "reviews",
"path": "reviews",
"count": 3,
"types": [
{
"name": "Array",
"bsonType": "Array",
"path": "reviews",
"count": 3,
"types": [
{
"name": "Document",
"bsonType": "Document",
"path": "reviews",
"count": 6,
"fields": [
{
"name": "_id",
"path": "reviews._id",
"count": 5,
"types": [
{
"name": "Number",
"bsonType": "Number",
"path": "reviews._id",
"count": 5,
"values": [
1,
2,
2,
1,
2
],
"total_count": 0,
"probability": 0.8333333333333334,
"unique": 2,
"has_duplicates": true
},
{
"name": "Undefined",
"type": "Undefined",
"path": "reviews._id",
"count": 1,
"total_count": 0,
"probability": 0.16666666666666666,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 6,
"type": [
"Number",
"Undefined"
],
"has_duplicates": true,
"probability": 0.8333333333333334
},
{
"name": "rating",
"path": "reviews.rating",
"count": 5,
"types": [
{
"name": "Number",
"bsonType": "Number",
"path": "reviews.rating",
"count": 5,
"values": [
4,
1,
1,
4,
1
],
"total_count": 0,
"probability": 0.8333333333333334,
"unique": 2,
"has_duplicates": true
},
{
"name": "Undefined",
"type": "Undefined",
"path": "reviews.rating",
"count": 1,
"total_count": 0,
"probability": 0.16666666666666666,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 6,
"type": [
"Number",
"Undefined"
],
"has_duplicates": true,
"probability": 0.8333333333333334
},
{
"name": "text",
"path": "reviews.text",
"count": 5,
"types": [
{
"name": "String",
"bsonType": "String",
"path": "reviews.text",
"count": 5,
"values": [
"great!",
"didn't like it",
"didn't like it",
"great!",
"didn't like it"
],
"total_count": 0,
"probability": 0.8333333333333334,
"unique": 2,
"has_duplicates": true
},
{
"name": "Undefined",
"type": "Undefined",
"path": "reviews.text",
"count": 1,
"total_count": 0,
"probability": 0.16666666666666666,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 6,
"type": [
"String",
"Undefined"
],
"has_duplicates": true,
"probability": 0.8333333333333334
}
],
"total_count": 0,
"probability": 1
}
],
"lengths": [
3,
1,
2
],
"total_count": 6,
"probability": 0.75,
"average_length": 2
},
{
"name": "Undefined",
"type": "Undefined",
"path": "reviews",
"count": 1,
"total_count": 0,
"probability": 0.25,
"unique": 1,
"has_duplicates": false
}
],
"total_count": 4,
"type": [
"Array",
"Undefined"
],
"has_duplicates": false,
"probability": 0.75
}
],
"count": 4
}
13 changes: 13 additions & 0 deletions test/unit/indexes.store.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ require('../../src/app/reflux-listen-to-external-store.js');
const CreateIndexStore = require('../../src/internal-packages/indexes/lib/store/create-index-store');
const Collection = require('../../src/internal-packages/collection/lib/components/index');

const arrayOfDocsSchema = require('../fixtures/array_of_docs.fixture.json');

describe('CreateIndexesStore', function() {
let unsubscribe;

Expand Down Expand Up @@ -137,6 +139,17 @@ describe('CreateIndexesStore', function() {

CreateIndexStore.removeIndexField(1);
});

it('extracts top-level and nested field names from the schema', function(done) {
unsubscribe = CreateIndexStore.listen((fields, options, schemaFields) => {
expect(schemaFields).to.have.members(['reviews', 'reviews._id',
'reviews.rating', 'reviews.text', 'review', 'review._id',
'review.rating', 'review.text']);
unsubscribe();
done();
});
CreateIndexStore.loadFields({schema: arrayOfDocsSchema});
});
});

describe('LoadIndexesStore', () => {
Expand Down