Bug 1164717 - Flatten storage/src/ directory. r=mak

mozilla-spidermonkey · May 19, 2015 · 6f3606c · 6f3606c
1 parent a401f68
commit 6f3606c
Show file tree

Hide file tree

Showing 58 changed files with 73 additions and 79 deletions.
diff --git a/storage/src/FileSystemModule.cpp → storage/FileSystemModule.cpp b/storage/src/FileSystemModule.cpp → storage/FileSystemModule.cpp
diff --git a/storage/src/FileSystemModule.h → storage/FileSystemModule.h b/storage/src/FileSystemModule.h → storage/FileSystemModule.h
diff --git a/storage/src/IStorageBindingParamsInternal.h → storage/IStorageBindingParamsInternal.h b/storage/src/IStorageBindingParamsInternal.h → storage/IStorageBindingParamsInternal.h
diff --git a/storage/src/SQLCollations.cpp → storage/SQLCollations.cpp b/storage/src/SQLCollations.cpp → storage/SQLCollations.cpp
diff --git a/storage/src/SQLCollations.h → storage/SQLCollations.h b/storage/src/SQLCollations.h → storage/SQLCollations.h
diff --git a/storage/src/SQLiteMutex.h → storage/SQLiteMutex.h b/storage/src/SQLiteMutex.h → storage/SQLiteMutex.h
diff --git a/storage/src/StorageBaseStatementInternal.cpp → storage/StorageBaseStatementInternal.cpp b/storage/src/StorageBaseStatementInternal.cpp → storage/StorageBaseStatementInternal.cpp
diff --git a/storage/src/StorageBaseStatementInternal.h → storage/StorageBaseStatementInternal.h b/storage/src/StorageBaseStatementInternal.h → storage/StorageBaseStatementInternal.h
diff --git a/storage/src/TelemetryVFS.cpp → storage/TelemetryVFS.cpp b/storage/src/TelemetryVFS.cpp → storage/TelemetryVFS.cpp
diff --git a/storage/src/VacuumManager.cpp → storage/VacuumManager.cpp b/storage/src/VacuumManager.cpp → storage/VacuumManager.cpp
diff --git a/storage/src/VacuumManager.h → storage/VacuumManager.h b/storage/src/VacuumManager.h → storage/VacuumManager.h
diff --git a/storage/src/Variant.h → storage/Variant.h b/storage/src/Variant.h → storage/Variant.h
diff --git a/storage/src/Variant_inl.h → storage/Variant_inl.h b/storage/src/Variant_inl.h → storage/Variant_inl.h
diff --git a/storage/build/moz.build b/storage/build/moz.build
@@ -16,6 +16,8 @@ FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 
-LOCAL_INCLUDES += ['../src']
+LOCAL_INCLUDES += [
+    '..',
+]
 
 CXXFLAGS += CONFIG['SQLITE_CFLAGS']
diff --git a/storage/moz.build b/storage/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['src', 'build']
+DIRS += ['build']
 
 TEST_DIRS += ['test']
 
@@ -46,5 +46,70 @@ EXPORTS.mozilla += [
 #      storage.h file too.
 EXPORTS.mozilla.storage += [
     'StatementCache.h',
+    'Variant.h',
+    'Variant_inl.h',
 ]
 # SEE ABOVE NOTE!
+
+UNIFIED_SOURCES += [
+    'FileSystemModule.cpp',
+    'mozStorageArgValueArray.cpp',
+    'mozStorageAsyncStatement.cpp',
+    'mozStorageAsyncStatementExecution.cpp',
+    'mozStorageAsyncStatementJSHelper.cpp',
+    'mozStorageAsyncStatementParams.cpp',
+    'mozStorageBindingParamsArray.cpp',
+    'mozStorageError.cpp',
+    'mozStoragePrivateHelpers.cpp',
+    'mozStorageResultSet.cpp',
+    'mozStorageRow.cpp',
+    'mozStorageService.cpp',
+    'mozStorageSQLFunctions.cpp',
+    'mozStorageStatement.cpp',
+    'mozStorageStatementJSHelper.cpp',
+    'mozStorageStatementParams.cpp',
+    'mozStorageStatementRow.cpp',
+    'SQLCollations.cpp',
+    'StorageBaseStatementInternal.cpp',
+    'TelemetryVFS.cpp',
+    'VacuumManager.cpp',
+]
+
+# These files need to be built separately because they #include variantToSQLiteT_impl.h.
+SOURCES += [
+    'mozStorageBindingParams.cpp',
+    'mozStorageConnection.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+
+# Don't use the jemalloc allocator on Android, because we can't guarantee
+# that Gecko will configure sqlite before it is first used (bug 730495).
+#
+# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
+# (such as NSS) might trigger an initialization of sqlite and allocation
+# of memory using the default allocator, prior to the storage service
+# registering its allocator, causing memory management failures (bug 938730).
+# However, this is not an issue if both the jemalloc allocator and the default
+# allocator are the same thing.
+#
+# Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
+# MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
+# MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
+if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
+                             or CONFIG['MOZ_NATIVE_JEMALLOC']):
+    if CONFIG['OS_TARGET'] != 'Android':
+        DEFINES['MOZ_STORAGE_MEMORY'] = True
+
+# This is the default value.  If we ever change it when compiling sqlite, we
+# will need to change it here as well.
+DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000
+
+LOCAL_INCLUDES += [
+    '/db/sqlite3/src',
+    '/dom/base',
+]
+
+CXXFLAGS += CONFIG['SQLITE_CFLAGS']
diff --git a/storage/src/mozStorageArgValueArray.cpp → storage/mozStorageArgValueArray.cpp b/storage/src/mozStorageArgValueArray.cpp → storage/mozStorageArgValueArray.cpp
diff --git a/storage/src/mozStorageArgValueArray.h → storage/mozStorageArgValueArray.h b/storage/src/mozStorageArgValueArray.h → storage/mozStorageArgValueArray.h
diff --git a/storage/src/mozStorageAsyncStatement.cpp → storage/mozStorageAsyncStatement.cpp b/storage/src/mozStorageAsyncStatement.cpp → storage/mozStorageAsyncStatement.cpp
diff --git a/storage/src/mozStorageAsyncStatement.h → storage/mozStorageAsyncStatement.h b/storage/src/mozStorageAsyncStatement.h → storage/mozStorageAsyncStatement.h
diff --git a/...src/mozStorageAsyncStatementExecution.cpp → ...age/mozStorageAsyncStatementExecution.cpp b/...src/mozStorageAsyncStatementExecution.cpp → ...age/mozStorageAsyncStatementExecution.cpp
diff --git a/...e/src/mozStorageAsyncStatementExecution.h → storage/mozStorageAsyncStatementExecution.h b/...e/src/mozStorageAsyncStatementExecution.h → storage/mozStorageAsyncStatementExecution.h
diff --git a/.../src/mozStorageAsyncStatementJSHelper.cpp → storage/mozStorageAsyncStatementJSHelper.cpp b/.../src/mozStorageAsyncStatementJSHelper.cpp → storage/mozStorageAsyncStatementJSHelper.cpp
diff --git a/...ge/src/mozStorageAsyncStatementJSHelper.h → storage/mozStorageAsyncStatementJSHelper.h b/...ge/src/mozStorageAsyncStatementJSHelper.h → storage/mozStorageAsyncStatementJSHelper.h
diff --git a/...ge/src/mozStorageAsyncStatementParams.cpp → storage/mozStorageAsyncStatementParams.cpp b/...ge/src/mozStorageAsyncStatementParams.cpp → storage/mozStorageAsyncStatementParams.cpp
diff --git a/storage/src/mozStorageAsyncStatementParams.h → storage/mozStorageAsyncStatementParams.h b/storage/src/mozStorageAsyncStatementParams.h → storage/mozStorageAsyncStatementParams.h
diff --git a/storage/src/mozStorageBindingParams.cpp → storage/mozStorageBindingParams.cpp b/storage/src/mozStorageBindingParams.cpp → storage/mozStorageBindingParams.cpp
diff --git a/storage/src/mozStorageBindingParams.h → storage/mozStorageBindingParams.h b/storage/src/mozStorageBindingParams.h → storage/mozStorageBindingParams.h
diff --git a/storage/src/mozStorageBindingParamsArray.cpp → storage/mozStorageBindingParamsArray.cpp b/storage/src/mozStorageBindingParamsArray.cpp → storage/mozStorageBindingParamsArray.cpp
diff --git a/storage/src/mozStorageBindingParamsArray.h → storage/mozStorageBindingParamsArray.h b/storage/src/mozStorageBindingParamsArray.h → storage/mozStorageBindingParamsArray.h
diff --git a/storage/src/mozStorageConnection.cpp → storage/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp → storage/mozStorageConnection.cpp
diff --git a/storage/src/mozStorageConnection.h → storage/mozStorageConnection.h b/storage/src/mozStorageConnection.h → storage/mozStorageConnection.h
diff --git a/storage/src/mozStorageError.cpp → storage/mozStorageError.cpp b/storage/src/mozStorageError.cpp → storage/mozStorageError.cpp
diff --git a/storage/src/mozStorageError.h → storage/mozStorageError.h b/storage/src/mozStorageError.h → storage/mozStorageError.h
diff --git a/storage/src/mozStoragePrivateHelpers.cpp → storage/mozStoragePrivateHelpers.cpp b/storage/src/mozStoragePrivateHelpers.cpp → storage/mozStoragePrivateHelpers.cpp
diff --git a/storage/src/mozStoragePrivateHelpers.h → storage/mozStoragePrivateHelpers.h b/storage/src/mozStoragePrivateHelpers.h → storage/mozStoragePrivateHelpers.h
diff --git a/storage/src/mozStorageResultSet.cpp → storage/mozStorageResultSet.cpp b/storage/src/mozStorageResultSet.cpp → storage/mozStorageResultSet.cpp
diff --git a/storage/src/mozStorageResultSet.h → storage/mozStorageResultSet.h b/storage/src/mozStorageResultSet.h → storage/mozStorageResultSet.h
diff --git a/storage/src/mozStorageRow.cpp → storage/mozStorageRow.cpp b/storage/src/mozStorageRow.cpp → storage/mozStorageRow.cpp
diff --git a/storage/src/mozStorageRow.h → storage/mozStorageRow.h b/storage/src/mozStorageRow.h → storage/mozStorageRow.h
diff --git a/storage/src/mozStorageSQLFunctions.cpp → storage/mozStorageSQLFunctions.cpp b/storage/src/mozStorageSQLFunctions.cpp → storage/mozStorageSQLFunctions.cpp
diff --git a/storage/src/mozStorageSQLFunctions.h → storage/mozStorageSQLFunctions.h b/storage/src/mozStorageSQLFunctions.h → storage/mozStorageSQLFunctions.h
diff --git a/storage/src/mozStorageService.cpp → storage/mozStorageService.cpp b/storage/src/mozStorageService.cpp → storage/mozStorageService.cpp
diff --git a/storage/src/mozStorageService.h → storage/mozStorageService.h b/storage/src/mozStorageService.h → storage/mozStorageService.h
diff --git a/storage/src/mozStorageStatement.cpp → storage/mozStorageStatement.cpp b/storage/src/mozStorageStatement.cpp → storage/mozStorageStatement.cpp
diff --git a/storage/src/mozStorageStatement.h → storage/mozStorageStatement.h b/storage/src/mozStorageStatement.h → storage/mozStorageStatement.h
diff --git a/storage/src/mozStorageStatementData.h → storage/mozStorageStatementData.h b/storage/src/mozStorageStatementData.h → storage/mozStorageStatementData.h
diff --git a/storage/src/mozStorageStatementJSHelper.cpp → storage/mozStorageStatementJSHelper.cpp b/storage/src/mozStorageStatementJSHelper.cpp → storage/mozStorageStatementJSHelper.cpp
diff --git a/storage/src/mozStorageStatementJSHelper.h → storage/mozStorageStatementJSHelper.h b/storage/src/mozStorageStatementJSHelper.h → storage/mozStorageStatementJSHelper.h
diff --git a/storage/src/mozStorageStatementParams.cpp → storage/mozStorageStatementParams.cpp b/storage/src/mozStorageStatementParams.cpp → storage/mozStorageStatementParams.cpp
diff --git a/storage/src/mozStorageStatementParams.h → storage/mozStorageStatementParams.h b/storage/src/mozStorageStatementParams.h → storage/mozStorageStatementParams.h
diff --git a/storage/src/mozStorageStatementRow.cpp → storage/mozStorageStatementRow.cpp b/storage/src/mozStorageStatementRow.cpp → storage/mozStorageStatementRow.cpp
diff --git a/storage/src/mozStorageStatementRow.h → storage/mozStorageStatementRow.h b/storage/src/mozStorageStatementRow.h → storage/mozStorageStatementRow.h
diff --git a/storage/src/moz.build b/storage/src/moz.build
diff --git a/storage/test/moz.build b/storage/test/moz.build
@@ -29,7 +29,7 @@ if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'):
     ])
 
 LOCAL_INCLUDES += [
-    '../src',
+    '..',
 ]
 
 FAIL_ON_WARNINGS = True

diff --git a/storage/test/unit/test_statement_wrapper_automatically.js b/storage/test/unit/test_statement_wrapper_automatically.js
@@ -146,7 +146,7 @@ function run_test()
   setup();
 
   // function JSValStorageStatementBinder in
-  // storage/src/mozStorageStatementParams.cpp tells us that the following types
+  // storage/mozStorageStatementParams.cpp tells us that the following types
   // and only the following types are valid as statement parameters:
   var vals = [
     1337,       // int

diff --git a/storage/src/variantToSQLiteT_impl.h → storage/variantToSQLiteT_impl.h b/storage/src/variantToSQLiteT_impl.h → storage/variantToSQLiteT_impl.h
diff --git a/toolkit/components/places/UnifiedComplete.js b/toolkit/components/places/UnifiedComplete.js
@@ -1572,7 +1572,7 @@ UnifiedComplete.prototype = {
         // Autocomplete often fallbacks to a table scan due to lack of text
         // indices.  A larger cache helps reducing IO and improving performance.
         // The value used here is larger than the default Storage value defined
-        // as MAX_CACHE_SIZE_BYTES in storage/src/mozStorageConnection.cpp.
+        // as MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
         yield conn.execute("PRAGMA cache_size = -6144"); // 6MiB
 
         yield SwitchToTabStorage.initDatabase(conn);

diff --git a/toolkit/components/places/nsPlacesAutoComplete.js b/toolkit/components/places/nsPlacesAutoComplete.js
@@ -318,7 +318,7 @@ function nsPlacesAutoComplete()
 
     // Autocomplete often fallbacks to a table scan due to lack of text indices.
     // In such cases a larger cache helps reducing IO.  The default Storage
-    // value is MAX_CACHE_SIZE_BYTES in storage/src/mozStorageConnection.cpp.
+    // value is MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
     let stmt = db.createAsyncStatement("PRAGMA cache_size = -6144"); // 6MiB
     stmt.executeAsync();
     stmt.finalize();
-Original file line number
+Diff line change
@@ Expand Up @@
         ])
     LOCAL_INCLUDES += [
-        '../src',
+        '..',
     ]
     FAIL_ON_WARNINGS = True
@@ Expand Down @@