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.

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

Build 2.6.6 on s390x and fix unit test failures #1

Merged
merged 7 commits into from
Mar 13, 2015
Merged

Build 2.6.6 on s390x and fix unit test failures #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f3019e
Allow building on s390/s390x
bryanpkc Mar 11, 2015
2dcf122
Big-endian patch for snappy 1.0.3
bryanpkc Mar 11, 2015
72a2899
Big-endian patch for MurmurHash3
bryanpkc Mar 11, 2015
4ba0525
Fix build failure
bryanpkc Mar 11, 2015
75944d8
Add toString method to the little<TYPE> and little_pod<TYPE> classes,…
bryanpkc Mar 12, 2015
e0750be
Ensure that hardcoded hashes in unit tests are in little-endian byte …
bryanpkc Mar 12, 2015
5e31041
Generate index key suffix in consistent byte order
bryanpkc Mar 12, 2015
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: 10 additions & 0 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ add_option( "disable-declspec-thread", "don't use __declspec(thread) on Windows
# base compile flags
add_option( "64" , "whether to force 64 bit" , 0 , True , "force64" )
add_option( "32" , "whether to force 32 bit" , 0 , True , "force32" )
add_option( "31" , "whether to force 31 bit for s390x" , 0 , True , "force31" )

add_option( "cxx", "compiler to use" , 1 , True )
add_option( "cc", "compiler to use for c" , 1 , True )
Expand Down Expand Up @@ -353,6 +354,7 @@ boostLibs = [ "thread" , "filesystem" , "program_options", "system" ]
onlyServer = len( COMMAND_LINE_TARGETS ) == 0 or ( len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) in [ "mongod" , "mongos" , "test" ] )

linux64 = False
force31 = has_option( "force31" )
force32 = has_option( "force32" )
force64 = has_option( "force64" )
if not force64 and not force32 and os.getcwd().endswith( "mongo-64" ):
Expand Down Expand Up @@ -676,6 +678,10 @@ elif linux:
if has_option( "static-libstdc++" ):
env.Append( LINKFLAGS=["-static-libstdc++", "-static-libgcc"] )

if os.uname()[4] == "s390" or os.uname()[4] == "s390x":
env.Prepend(CPPDEFINES=[ "_BIG_ENDIAN=1" ] )
env.Prepend(CPPDEFINES=[ "__BIG_ENDIAN__=1" ] )

elif solaris:
env.Append( CPPDEFINES=[ "__sunos__" ] )
env.Append( LIBS=["socket","resolv"] )
Expand Down Expand Up @@ -880,6 +886,10 @@ if nix:
env.Append( CCFLAGS="-m32" )
env.Append( LINKFLAGS="-m32" )

if force31:
env.Append( CCFLAGS="-m31" )
env.Append( LINKFLAGS="-m31" )

if has_option( "gdbserver" ):
env.Append( CPPDEFINES=["USE_GDBSERVER"] )

Expand Down
6 changes: 6 additions & 0 deletions src/mongo/bson/util/bswap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ namespace mongo {
\
friend Nullstream& operator<<( Nullstream& ost, MYTYPE val ) { \
return ost << T(val); \
} \
\
std::string toString() const { \
std::stringstream ss; \
ss << this; \
return ss.str(); \
}


Expand Down
2 changes: 2 additions & 0 deletions src/mongo/db/fts/fts_index_format.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ namespace mongo {
} t;
uint32_t seed = 0;
MurmurHash3_x64_128( term.data(), term.size(), seed, t.hash );
t.hash[0] = littleEndian<uint64_t>(t.hash[0]);
t.hash[1] = littleEndian<uint64_t>(t.hash[1]);
string keySuffix = mongo::toHexLower( t.data, sizeof( t.data ) );
invariant( termKeySuffixLength == keySuffix.size() );
b.append( "", term.substr( 0, termKeyPrefixLength ) +
Expand Down
106 changes: 53 additions & 53 deletions src/mongo/db/hasher_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,187 +198,187 @@ namespace {
// All of the values in the remaining tests have been determined experimentally.
TEST( BSONElementHasher, HashIntOrLongOrDouble ) {
BSONObj o = BSON( "check" << 42 );
ASSERT_EQUALS( hashIt( o ), -944302157085130861LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-944302157085130861LL) );
o = BSON( "check" << 42.123 );
ASSERT_EQUALS( hashIt( o ), -944302157085130861LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-944302157085130861LL) );
o = BSON( "check" << (long long) 42 );
ASSERT_EQUALS( hashIt( o ), -944302157085130861LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-944302157085130861LL) );

o = BSON( "check" << 0 );
ASSERT_EQUALS( hashIt( o ), 4854801880128277513LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4854801880128277513LL) );
o = BSON( "check" << 0.456 );
ASSERT_EQUALS( hashIt( o ), 4854801880128277513LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4854801880128277513LL) );
o = BSON( "check" << (long long) 0 );
ASSERT_EQUALS( hashIt( o ), 4854801880128277513LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4854801880128277513LL) );
// NAN is treated as zero.
o = BSON( "check" << std::numeric_limits<double>::signaling_NaN() );
ASSERT_EQUALS( hashIt( o ), 4854801880128277513LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4854801880128277513LL) );
o = BSON( "check" << std::numeric_limits<double>::quiet_NaN() );
ASSERT_EQUALS( hashIt( o ), 4854801880128277513LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4854801880128277513LL) );

o = BSON( "check" << 1 );
ASSERT_EQUALS( hashIt( o ), 5902408780260971510LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(5902408780260971510LL) );
o = BSON( "check" << 1.987 );
ASSERT_EQUALS( hashIt( o ), 5902408780260971510LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(5902408780260971510LL) );
o = BSON( "check" << (long long) 1 );
ASSERT_EQUALS( hashIt( o ), 5902408780260971510LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(5902408780260971510LL) );

o = BSON( "check" << -1 );
ASSERT_EQUALS( hashIt( o ), 1140205862565771219LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1140205862565771219LL) );
o = BSON( "check" << -1.789 );
ASSERT_EQUALS( hashIt( o ), 1140205862565771219LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1140205862565771219LL) );
o = BSON( "check" << (long long) -1 );
ASSERT_EQUALS( hashIt( o ), 1140205862565771219LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1140205862565771219LL) );

o = BSON( "check" << std::numeric_limits<int>::min() );
ASSERT_EQUALS( hashIt( o ), 6165898260261354870LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6165898260261354870LL) );
o = BSON( "check" << (double) std::numeric_limits<int>::min() );
ASSERT_EQUALS( hashIt( o ), 6165898260261354870LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6165898260261354870LL) );
o = BSON( "check" << (long long) std::numeric_limits<int>::min() );
ASSERT_EQUALS( hashIt( o ), 6165898260261354870LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6165898260261354870LL) );

o = BSON( "check" << std::numeric_limits<int>::max() );
ASSERT_EQUALS( hashIt( o ), 1143184177162245883LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1143184177162245883LL) );
o = BSON( "check" << (double) std::numeric_limits<int>::max() );
ASSERT_EQUALS( hashIt( o ), 1143184177162245883LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1143184177162245883LL) );
o = BSON( "check" << (long long) std::numeric_limits<int>::max() );
ASSERT_EQUALS( hashIt( o ), 1143184177162245883LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(1143184177162245883LL) );

// Large/small double values.
ASSERT( std::numeric_limits<long long>::max() < std::numeric_limits<double>::max() );
o = BSON( "check" << std::numeric_limits<double>::max() );
ASSERT_EQUALS( hashIt( o ), 921523596458303250LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(921523596458303250LL) );
o = BSON( "check" << std::numeric_limits<long long>::max() ); // 9223372036854775807
ASSERT_EQUALS( hashIt( o ), 921523596458303250LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(921523596458303250LL) );

// Have to create our own small double.
// std::numeric_limits<double>::lowest() - Not available until C++11
// std::numeric_limits<double>::min() - Closest positive value to zero, not most negative.
double smallDouble = - std::numeric_limits<double>::max();
ASSERT( smallDouble < static_cast<double>( std::numeric_limits<long long>::min() ) );
o = BSON( "check" << smallDouble );
ASSERT_EQUALS( hashIt( o ), 4532067210535695462LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4532067210535695462LL) );
o = BSON( "check" << std::numeric_limits<long long>::min() ); // -9223372036854775808
ASSERT_EQUALS( hashIt( o ), 4532067210535695462LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4532067210535695462LL) );
}

TEST( BSONElementHasher, HashMinKey ) {
BSONObj o = BSON( "check" << MINKEY );
ASSERT_EQUALS( hashIt( o ), 7961148599568647290LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(7961148599568647290LL) );
}

TEST( BSONElementHasher, HashMaxKey ) {
BSONObj o = BSON( "check" << MAXKEY );
ASSERT_EQUALS( hashIt( o ), 5504842513779440750LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(5504842513779440750LL) );
}

TEST( BSONElementHasher, HashUndefined ) {
BSONObj o = BSON( "check" << BSONUndefined );
ASSERT_EQUALS( hashIt( o ), 40158834000849533LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(40158834000849533LL) );
}

TEST( BSONElementHasher, HashNull ) {
BSONObj o = BSON( "check" << BSONNULL );
ASSERT_EQUALS( hashIt( o ), 2338878944348059895LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(2338878944348059895LL) );
}

TEST( BSONElementHasher, HashString ) {
BSONObj o = BSON( "check" << "abc" );
ASSERT_EQUALS( hashIt( o ), 8478485326885698097LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(8478485326885698097LL) );
o = BSON( "check" << BSONSymbol( "abc" ) );
ASSERT_EQUALS( hashIt( o ), 8478485326885698097LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(8478485326885698097LL) );

o = BSON( "check" << "" );
ASSERT_EQUALS( hashIt( o ), 2049396243249673340LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(2049396243249673340LL) );
o = BSON( "check" << BSONSymbol( "" ) );
ASSERT_EQUALS( hashIt( o ), 2049396243249673340LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(2049396243249673340LL) );
}

TEST( BSONElementHasher, HashObject ) {
BSONObj o = BSON( "check" << BSON( "a" << "abc" << "b" << 123LL ) );
ASSERT_EQUALS( hashIt( o ), 4771603801758380216LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4771603801758380216LL) );

o = BSON( "check" << BSONObj() );
ASSERT_EQUALS( hashIt( o ), 7980500913326740417LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(7980500913326740417LL) );
}

TEST( BSONElementHasher, HashArray ) {
BSONObj o = BSON( "check" << BSON_ARRAY( "bar" << "baz" << "qux" ) );
ASSERT_EQUALS( hashIt( o ), -2938911267422831539LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-2938911267422831539LL) );

o = BSON( "check" << BSONArray() );
ASSERT_EQUALS( hashIt( o ), 8849948234993459283LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(8849948234993459283LL) );
}

TEST( BSONElementHasher, HashBinary ) {
uint8_t bytes[] = { 0, 1, 2, 3, 4, 6 };
BSONObj o = BSON( "check" << BSONBinData( bytes, 6, BinDataGeneral ) );
ASSERT_EQUALS( hashIt( o ), 7252465090394235301LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(7252465090394235301LL) );

o = BSON( "check" << BSONBinData( bytes, 6, bdtCustom ) );
ASSERT_EQUALS( hashIt( o ), 5736670452907618262LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(5736670452907618262LL) );

uint8_t uuidBytes[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
o = BSON( "check" << BSONBinData( uuidBytes, 16, newUUID ) );
ASSERT_EQUALS( hashIt( o ), 6084661258071355978LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6084661258071355978LL) );
}

TEST( BSONElementHasher, HashObjectId ) {
BSONObj o = BSON( "check" << OID( "010203040506070809101112" ) );
ASSERT_EQUALS( hashIt( o ), -5588663249627035708LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-5588663249627035708LL) );

o = BSON( "check" << OID( "000000000000000000000000" ) );
ASSERT_EQUALS( hashIt( o ), -4293118519463489418LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-4293118519463489418LL) );
}

TEST( BSONElementHasher, HashBoolean ) {
BSONObj o = BSON( "check" << true );
ASSERT_EQUALS( hashIt( o ), 6405873908747105701LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6405873908747105701LL) );

o = BSON( "check" << false );
ASSERT_EQUALS( hashIt( o ), 6289544573401934092LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6289544573401934092LL) );
}

TEST( BSONElementHasher, HashTimeStamp ) {
BSONObjBuilder builder1;
BSONObjBuilder builder2;

BSONObj o = BSON( "check" << Date_t( 0x5566778811223344LL ) );
ASSERT_EQUALS( hashIt( o ), 4476222765095560467LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4476222765095560467LL) );
o = builder1.appendTimestamp( "check", 0x55667788LL * 1000LL, 0x11223344LL ).obj();
ASSERT_EQUALS( hashIt( o ), 4476222765095560467LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(4476222765095560467LL) );

o = BSON( "check" << Date_t( 0 ) );
ASSERT_EQUALS( hashIt( o ), -1178696894582842035LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-1178696894582842035LL) );
o = builder2.appendTimestamp( "check", 0 ).obj();
ASSERT_EQUALS( hashIt( o ), -1178696894582842035LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-1178696894582842035LL) );
}

TEST( BSONElementHasher, HashRegEx ) {
BSONObj o = BSON( "check" << BSONRegEx( "mongodb" ) );
ASSERT_EQUALS( hashIt( o ), -7275792090268217043LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(-7275792090268217043LL) );

o = BSON( "check" << BSONRegEx( ".*", "i" ) );
ASSERT_EQUALS( hashIt( o ), 7095855029187981886LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(7095855029187981886LL) );
}

TEST( BSONElementHasher, HashDBRef ) {
BSONObj o = BSON( "check" << BSONDBRef( "c", OID( "010203040506070809101112" ) ) );
ASSERT_EQUALS( hashIt( o ), 940175826736461384LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(940175826736461384LL) );

o = BSON( "check" << BSONDBRef( "db.c", OID( "010203040506070809101112" ) ) );
ASSERT_EQUALS( hashIt( o ), 2426768198104018194LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(2426768198104018194LL) );
}

TEST( BSONElementHasher, HashCode ) {
BSONObj o = BSON( "check" << BSONCode( "func f() { return 1; }" ) );
ASSERT_EQUALS( hashIt( o ), 6861638109178014270LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(6861638109178014270LL) );
}

TEST( BSONElementHasher, HashCodeWScope ) {
BSONObj o = BSON( "check" <<
BSONCodeWScope( "func f() { return 1; }", BSON( "c" << true ) ) );
ASSERT_EQUALS( hashIt( o ), 501342939894575968LL );
ASSERT_EQUALS( hashIt( o ), littleEndian<long long>(501342939894575968LL) );
}

} // namespace
Expand Down
4 changes: 2 additions & 2 deletions src/mongo/db/storage/extent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ namespace mongo {
LOG(3) << "_reuse extent was:" << nsDiagnostic.toString() << " now:" << nsname << endl;
if (magic != extentSignature) {
StringBuilder sb;
sb << "bad extent signature " << toHex((void*)((unsigned)magic), sizeof(unsigned))
sb << "bad extent signature " << integerToHex(littleEndian<unsigned>(magic))
<< " for namespace '" << nsDiagnostic.toString()
<< "' found in Extent::_reuse";
msgasserted(10360, sb.str());
Expand Down Expand Up @@ -185,7 +185,7 @@ namespace mongo {
if (magic != extentSignature) {
if (errors) {
StringBuilder sb;
sb << "bad extent signature " << toHex((void*)((unsigned)magic), sizeof(unsigned))
sb << "bad extent signature " << integerToHex(littleEndian<unsigned>(magic))
<< " in extent " << diskLoc.toString();
*errors << sb.str();
}
Expand Down
2 changes: 1 addition & 1 deletion src/mongo/logger/logstream_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace logger {

template <typename T>
LogstreamBuilder& operator<<(const T& x) {
//stream() << x.toString();
stream() << x.toString();
return *this;
}

Expand Down
45 changes: 43 additions & 2 deletions src/third_party/murmurhash3/MurmurHash3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,59 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )

#endif // !defined(_MSC_VER)

/* NO-OP for little-endian platforms */
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
# define BYTESWAP32(x) (x)
# define BYTESWAP64(x) (x)
# endif
/* if __BYTE_ORDER__ is not predefined (like FreeBSD), use arch */
#elif defined(__i386) || defined(__x86_64) \
|| defined(__alpha) || defined(__vax)
# define BYTESWAP32(x) (x)
# define BYTESWAP64(x) (x)
/* use __builtin_bswap32 if available */
#elif defined(__GNUC__) || defined(__clang__)
# ifdef __has_builtin
# if __has_builtin(__builtin_bswap32)
# define BYTESWAP32(x) __builtin_bswap32(x)
# endif // __has_builtin(__builtin_bswap32)
# if __has_builtin(__builtin_bswap64)
# define BYTESWAP64(x) __builtin_bswap64(x)
# endif // __has_builtin(__builtin_bswap64)
# endif // __has_builtin
#endif // defined(__GNUC__) || defined(__clang__)
/* last resort (big-endian w/o __builtin_bswap) */
#ifndef BYTESWAP32
# define BYTESWAP32(x) ((((x)&0xFF)<<24) \
|(((x)>>24)&0xFF) \
|(((x)&0x0000FF00)<<8) \
|(((x)&0x00FF0000)>>8) )
#endif
#ifndef BYTESWAP64
# define BYTESWAP64(x) \
(((uint64_t)(x) << 56) | \
(((uint64_t)(x) << 40) & 0X00FF000000000000ULL) | \
(((uint64_t)(x) << 24) & 0X0000FF0000000000ULL) | \
(((uint64_t)(x) << 8) & 0X000000FF00000000ULL) | \
(((uint64_t)(x) >> 8) & 0X00000000FF000000ULL) | \
(((uint64_t)(x) >> 24) & 0X0000000000FF0000ULL) | \
(((uint64_t)(x) >> 40) & 0X000000000000FF00ULL) | \
((uint64_t)(x) >> 56))
#endif

//-----------------------------------------------------------------------------
// Block read - if your platform needs to do endian-swapping or can only
// handle aligned reads, do the conversion here

FORCE_INLINE inline uint32_t getblock ( const uint32_t * p, int i )
{
return p[i];
return BYTESWAP32(p[i]);
}

FORCE_INLINE inline uint64_t getblock ( const uint64_t * p, int i )
{
return p[i];
return BYTESWAP64(p[i]);
}

//-----------------------------------------------------------------------------
Expand Down
Loading