Skip to content
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.

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

merge V8, 2.4 aggregation, and commands returning cursors #517

Merged
merged 244 commits into from
Sep 13, 2013
Merged

Conversation

leifwalsh
Copy link
Contributor

RedBeard0531 and others added 30 commits September 8, 2013 08:34
Conflicts:

	src/mongo/db/pipeline/expression.cpp
	src/mongo/dbtests/expressiontests.cpp
…o shards.

Conflicts:

	src/mongo/db/pipeline/accumulator.cpp
	src/mongo/db/pipeline/accumulator.h
…o shards.

Conflicts:

	src/mongo/db/pipeline/accumulator.cpp
	src/mongo/db/pipeline/accumulator.h
…e from Expression::NE, which is unused and unsupported.
Conflicts:

	src/mongo/dbtests/expressiontests.cpp
Change lots of code to take <string> arguments by const ref instead
of by value; minor changes to surrounding code.

Conflicts:

	src/mongo/client/syncclusterconnection.cpp
	src/mongo/db/client.cpp
	src/mongo/db/client.h
	src/mongo/db/dur.cpp
	src/mongo/db/dur.h
	src/mongo/db/durop.cpp
	src/mongo/db/durop.h
	src/mongo/db/extsort.cpp
	src/mongo/db/extsort.h
	src/mongo/db/geo/core.h
	src/mongo/db/index_update.cpp
	src/mongo/db/index_update.h
	src/mongo/db/memconcept.cpp
	src/mongo/db/mongommf.cpp
	src/mongo/db/mongommf.h
	src/mongo/db/pdfile.cpp
	src/mongo/db/pdfile.h
	src/mongo/db/repl.cpp
	src/mongo/db/repl.h
	src/mongo/db/repl/health.h
	src/mongo/db/repl/heartbeat.cpp
	src/mongo/db/repl/rs_initialsync.cpp
	src/mongo/platform/strtoll.h
	src/mongo/s/d_migrate.cpp
	src/mongo/util/logfile.cpp
	src/mongo/util/logfile.h
	src/mongo/util/mmap.cpp
	src/mongo/util/mmap.h
	src/mongo/util/mmap_win.cpp
… consist of a single field. Clean up pipeline stage parsing.
Signed-off-by: Tad Marshall <tad@10gen.com>

Conflicts:

	src/mongo/db/btree.h
	src/mongo/db/diskloc.h
	src/mongo/db/dur_preplogbuffer.cpp
	src/mongo/db/dur_recover.cpp
	src/mongo/db/json.cpp
	src/mongo/db/namespace_details.h
	src/mongo/db/record.cpp
	src/mongo/db/repl.cpp
	src/mongo/db/repl/rs_rollback.cpp
	src/mongo/db/repl/rs_sync.h
	src/mongo/dbtests/jsobjtests.cpp
	src/mongo/dbtests/perf/btreeperf.cpp
	src/mongo/dbtests/queryoptimizercursortests.cpp
	src/mongo/s/d_migrate.cpp
	src/mongo/s/d_writeback.h
	src/mongo/util/file_allocator.h
…n now

including a few that i made pass

Conflicts:

	src/mongo/db/oplog.cpp
	src/mongo/db/repl/rs_initialsync.cpp
	src/mongo/util/hashtab.h
Also allows you to have modules in mongos and the shell, as well as mongod.
Requires changes to the modules, to have SConscript files, and define libraries.
Allows modules to have unit tests, interesting linking rules, dependencies into
mongo, etc.

Still may need to do some work on includes.  The mongo-enterprise module has very
simple include requirements, today.

Conflicts:
	SConscript.buildinfo
	SConstruct
	src/mongo/SConscript
Using the following:

$ git clone -b 3.12 git://github.com/v8/v8
$ rm -rf \
  benchmarks/ \
  build/ \
  DEPS \
  Makefile \
  Makefile.android \
  preparser/ \
  samples/ \
  src/arm/ \
  src/mips/ \
  test/

(Above to reduce directory size from 46M to 13M)
Removed all but the following:
- LIBRARY_FLAGS from SConstruct
- V8_EXTRA_FLAGS from SConstruct
- SOURCES from src/SConscript
These are platform-independent, and were taken from a V8 build of
the same version.
Supports [MacOS, Linux, Windows, Solaris, FreeBSD]
         * [32-bit, 64-bit]
         * [debug, release]
Added mongo_v8 and mongod_v8 projects for building the shell and
mongod with V8 instead of SpiderMonkey.
This generates V8's experimental-libraries.cc and libraries.cc as
part of the build process.
Make the location of experimental-libraries.cc and libraries.cc
match the location where scons creates them.  Run the same Python
script that scons uses to create the files.

Conflicts:
	.gitignore
Reduce the number of documents inserted per iteration from 100,000
to 30,000 in jstests/sharding/mrShardedOutput.js when run on a 32-bit
system.  Do not print the list of inserted documents when the count
is wrong, just display the documents that are missing.  Add logging
so we can see where we are in the test if something goes wrong.
Move display of MapReduce results to before the assert test to help debugging.
Greg Studer and others added 24 commits September 11, 2013 23:18
…ulk inserts

Also divides batches into sizes manageable by the WBL

Conflicts:
	src/mongo/s/strategy_shard.cpp
…jects

Use the toString() method of Error (and derived) objects to convert them
to strings in tojson() and related functions.  These objects have no
enumerable properties, and so display as "{ }" if not handled specially.
Conflicts:
	src/mongo/db/mongod_v8.vcxproj
	src/mongo/shell/mongo_v8.vcxproj
It got lost in the merge of 50e9f135
…mongos bulk inserts"

This reverts commit 17c3781.

Conflicts:
	src/mongo/s/strategy_shard.cpp
@ghost ghost assigned leifwalsh Sep 13, 2013
@leifwalsh leifwalsh mentioned this pull request Sep 13, 2013
leifwalsh added a commit that referenced this pull request Sep 13, 2013
merge V8, 2.4 aggregation, and commands returning cursors #161 #503 #516

- Adds the V8 javascript engine as default, fixes #161
- Adds aggregation optimizations and refactoring up through 2.4.6, fixes #516
- Adds DBCommandCursor, fixes #503
@leifwalsh leifwalsh merged commit ce8f29d into master Sep 13, 2013
@leifwalsh leifwalsh deleted the cc5 branch September 13, 2013 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

merge aggregation changes up through 2.4 backport DBCommandCursor possibly move to v8 javascript