From ac2332b0422132f9a1622da52f8f2cf2ba6b6135 Mon Sep 17 00:00:00 2001 From: mcasimir Date: Wed, 27 Jan 2021 15:16:50 +0100 Subject: [PATCH 1/2] update import export --- package-lock.json | 45 +++++++++++++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 01c23ddfdd8..20095a13f18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1251,9 +1251,9 @@ "integrity": "sha512-4GZcTJtnWPlrMMBcv8n2+yJ+T+Cbu3F9p0n7EGc9v5jIpRBUf+ZzKz5eRoXwS0f3ZHAwNFYQEHEqMDLEWMicpg==" }, "@mongodb-js/compass-import-export": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-import-export/-/compass-import-export-5.2.3.tgz", - "integrity": "sha512-JqRKbDC4+MnXE59ZZAC9Ac3nGSl00wC5W6P5i132w7Syk4wb8/feUgB1We7FCTvX20/9EW5oH8P7ko+rT+r9SA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-import-export/-/compass-import-export-5.2.4.tgz", + "integrity": "sha512-5hZdlhq5TQTcgew3gtsuzbcZZI/tC2+E+my+5KfNWzWNlykqqHEKy8W9Q/i+fLwxTieZ0iPvysaQs0YNNFQrrw==", "requires": { "JSONStream": "^1.3.5", "ansi-to-html": "^0.6.11", @@ -1269,7 +1269,6 @@ "mime-types": "^2.1.24", "mongodb-extjson": "^4.0.0-rc1", "mongodb-query-parser": "^2.1.2", - "mongodb-schema": "^8.2.5", "object-sizeof": "^1.5.1", "parse-json": "^5.0.0", "peek-stream": "^1.1.3", @@ -7448,11 +7447,41 @@ "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==" }, "csv-parser": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-2.3.4.tgz", - "integrity": "sha512-UlzYZEiHR5OQTh0C97HeZfSBOCshKIe0NpG5vYlgAcXheDKvZoIHvZNMgg1IGvtvbSKVRB6/UIA4xxjzKi2TFA==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/csv-parser/-/csv-parser-2.3.5.tgz", + "integrity": "sha512-LCHolC4AlNwL+5EuD5LH2VVNKpD8QixZW2zzK1XmrVYUaslFY4c5BooERHOCIubG9iv/DAyFjs4x0HvWNZuyWg==", "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.0", + "through2": "^3.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + } } }, "csv-write-stream": { diff --git a/package.json b/package.json index e63fe44ad19..dadf594e1ea 100644 --- a/package.json +++ b/package.json @@ -266,7 +266,7 @@ "@mongodb-js/compass-field-store": "^6.0.3", "@mongodb-js/compass-find-in-page": "^2.0.4", "@mongodb-js/compass-home": "^4.2.1", - "@mongodb-js/compass-import-export": "^5.2.3", + "@mongodb-js/compass-import-export": "^5.2.4", "@mongodb-js/compass-indexes": "^3.0.10", "@mongodb-js/compass-instance": "^2.0.3", "@mongodb-js/compass-loading": "^1.1.0", From 79fa2f0fe3278cb3c6933d276c465a26e2fd5aef Mon Sep 17 00:00:00 2001 From: mcasimir Date: Sun, 31 Jan 2021 13:23:50 +0100 Subject: [PATCH 2/2] fix: improve schema analysis on big collections COMPASS-4154 --- package-lock.json | 80 +++++++++++++++++++++-------------------------- package.json | 4 +-- 2 files changed, 38 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20095a13f18..69609539b67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -993,9 +993,9 @@ "integrity": "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=" }, "@mapbox/tiny-sdf": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.1.1.tgz", - "integrity": "sha512-Ihn1nZcGIswJ5XGbgFAvVumOgWpvIjBX9jiRlIl46uQG9vJOF51ViBYHF95rEZupuyQbEmhLaDPLQlU7fUTsBg==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.2.tgz", + "integrity": "sha512-GeJdumh5Do1JvnE2QbbLixZmJg6CzOfpzcAuS+qZadWK1Gj+yY/mj7IOVlgXCBg/yDqDmitGwSius+rrTpm8RA==" }, "@mapbox/unitbezier": { "version": "0.0.0", @@ -1381,9 +1381,9 @@ } }, "@mongodb-js/compass-schema": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@mongodb-js/compass-schema/-/compass-schema-2.0.10.tgz", - "integrity": "sha512-AT2ND/hDyeGMJz0QEPt2IA+e2lvJ+f3YqvRdXJXt+3R5TvNRM/S12Ywqw9rMwmgpkoWV5UzBJN91gPB0XtwcsA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@mongodb-js/compass-schema/-/compass-schema-2.1.0.tgz", + "integrity": "sha512-F8DxEFBn/uQIBfItoVrPyRL5RY8aiC7OoOGrdRrJofy4EwKhWBU896nCr7dCc04c9r4DBqcTym10veSB+o6ZJQ==", "requires": { "detect-coordinates": "^0.2.0", "leaflet": "^1.5.1", @@ -1410,10 +1410,10 @@ "lodash.sortbyorder": "^3.4.4", "lodash.sum": "^4.0.2", "mapbox-gl": "^1.2.0", + "moment": "^2.27.0", "mongodb-query-util": "^0.0.3", - "mongodb-redux-common": "^0.0.1", "mongodb-schema": "^8.2.5", - "mongodb-schema-parser": "^0.1.5", + "numeral": "^1.5.6", "pluralize": "^8.0.0", "react-leaflet": "^2.4.0", "react-leaflet-draw": "^0.19.0", @@ -1444,11 +1444,6 @@ "lodash.uniq": "^4.5.0" } }, - "mongodb-redux-common": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/mongodb-redux-common/-/mongodb-redux-common-0.0.1.tgz", - "integrity": "sha512-eLw30wSxxh1w2Ahl0a5yDevwr85XLofrzv5FkNRQ782FpGsq2gSXptFCrFQfsZQ8OAsMfAcWKSQ8DRGt4G2vXQ==" - }, "pluralize": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", @@ -8030,13 +8025,6 @@ "integrity": "sha1-iQ1boMVfj7pVBOIhp3NLAWFUYoo=", "requires": { "lodash": "^4.13.1" - }, - "dependencies": { - "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" - } } }, "detect-indent": { @@ -15609,7 +15597,8 @@ "lodash.chunk": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" + "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=", + "optional": true }, "lodash.clone": { "version": "3.0.3", @@ -16524,9 +16513,9 @@ "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" }, "mapbox-gl": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.12.0.tgz", - "integrity": "sha512-B3URR4qY9R/Bx+DKqP8qmGCai8IOZYMSZF7ZSvcCZaYTaOYhQQi8ErTEDZtFMOR0ZPj7HFWOkkhl5SqvDfpJpA==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.0.tgz", + "integrity": "sha512-g8zlzuJxYJqbOPXT19/UBYpVrcefBQ06F/Cbj0fyEfFnFesDcU3cFTxd75/FZ6Upx2ZEjCsD61CHxrcxZidVpA==", "requires": { "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/geojson-types": "^1.0.2", @@ -17439,6 +17428,7 @@ "version": "4.5.1", "resolved": "https://registry.npmjs.org/mongodb-collection-sample/-/mongodb-collection-sample-4.5.1.tgz", "integrity": "sha512-tUCdRLToheOh2Tn+KVdhYtbLifxCo60+wVMf0zxtbZLKPYbZqQaYmyrYTsEunePNJyxIutBWdayX79VJ/Fb2hg==", + "optional": true, "requires": { "bson": "^4.0.3", "debug": "^4.1.1", @@ -17689,15 +17679,14 @@ } }, "mongodb-data-service": { - "version": "18.2.1", - "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-18.2.1.tgz", - "integrity": "sha512-s/3GydXC0VmdI1z2fQp3EqsPfkcMnc45q5c2VJowDOQpjXRF4i24QPtU01P97v+IN7pvge8O2ZNSFP2GoDzIMA==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/mongodb-data-service/-/mongodb-data-service-19.0.0.tgz", + "integrity": "sha512-4j7FWkLzR/UnaNLYqFrGoVMi+jP4O06FTX3cpnzLVZgEAgZl1WFrWaV5w6eqIdmjNzfs/SIvYKAdx7XkyrumVQ==", "requires": { "async": "^3.2.0", "debug": "^4.2.0", "lodash": "^4.17.20", "mongodb-build-info": "^1.1.1", - "mongodb-collection-sample": "^4.5.1", "mongodb-index-model": "^2.6.1", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.2.0", @@ -18567,11 +18556,6 @@ } } }, - "mongodb-schema-parser": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/mongodb-schema-parser/-/mongodb-schema-parser-0.1.10.tgz", - "integrity": "sha512-/CMlkgZSj+U8gYqATTBrAyNu5cNoHcEO62OFmRZ2gQ2j9AXb/ZtG4Jmu8kbynpbvoXjU8lf3Gz4BQU9RWI+22g==" - }, "mongodb-security": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/mongodb-security/-/mongodb-security-0.2.0.tgz", @@ -20888,9 +20872,9 @@ "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" }, "protocol-buffers-schema": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz", - "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz", + "integrity": "sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw==" }, "prr": { "version": "1.0.1", @@ -21170,16 +21154,24 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-leaflet": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-2.7.0.tgz", - "integrity": "sha512-pMf5eRyWU8RH9HohM2i0NZymcWHraJA1m6iMFYu94/01PAaBJpOyxORZJmN6cV9dBzkVWaLjAAHTNmxbwIpcfw==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-2.8.0.tgz", + "integrity": "sha512-Y7oHtNrrlRH8muDttXf+jZ2Ga/X7jneSGi1GN8uEdeCfLProTqgG2Zoa5TfloS3ZnY20v7w+DIenMG59beFsQw==", "requires": { - "@babel/runtime": "^7.9.2", - "fast-deep-equal": "^3.1.1", + "@babel/runtime": "^7.12.1", + "fast-deep-equal": "^3.1.3", "hoist-non-react-statics": "^3.3.2", "warning": "^4.0.3" }, "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, "warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", @@ -22747,9 +22739,9 @@ } }, "supercluster": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.0.tgz", - "integrity": "sha512-LDasImUAFMhTqhK+cUXfy9C2KTUqJ3gucLjmNLNFmKWOnDUBxLFLH9oKuXOTCLveecmxh8fbk8kgh6Q0gsfe2w==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.2.tgz", + "integrity": "sha512-bGA0pk3DYMjLTY1h+rbh0imi/I8k/Lg0rzdBGfyQs0Xkiix7jK2GUmH1qSD8+jq6U0Vu382QHr3+rbbiHqdKJA==", "requires": { "kdbush": "^3.0.0" } diff --git a/package.json b/package.json index dadf594e1ea..dcf9ae5233b 100644 --- a/package.json +++ b/package.json @@ -274,7 +274,7 @@ "@mongodb-js/compass-plugin-info": "^2.0.1", "@mongodb-js/compass-query-bar": "^6.2.0", "@mongodb-js/compass-query-history": "^7.0.4", - "@mongodb-js/compass-schema": "^2.0.10", + "@mongodb-js/compass-schema": "^2.1.0", "@mongodb-js/compass-schema-validation": "^4.0.5", "@mongodb-js/compass-server-version": "^4.0.1", "@mongodb-js/compass-serverstats": "^14.0.0", @@ -332,7 +332,7 @@ "mongodb-ace-theme-query": "^0.0.2", "mongodb-collection-model": "^3.1.0", "mongodb-connection-model": "^19.0.2", - "mongodb-data-service": "^18.2.1", + "mongodb-data-service": "^19.0.0", "mongodb-database-model": "^0.1.3", "mongodb-explain-plan-model": "^0.2.3", "mongodb-extended-json": "^1.11.0",