summaryrefslogtreecommitdiffstats
path: root/sql/src
Commit message (Collapse)AuthorAgeFilesLines
* merge more modules into luniPeter Hallam2010-04-27142-54241/+0
|
* Remove "Messages" from the nio, prefs, sql, text, and x-net modules.Elliott Hughes2010-04-145-264/+42
| | | | | | | | | | Also remove an file of unused messages from luni, and inline one of luni's other files. (There are plenty more.) Also remove some German translations of bouncycastle messages (that are actually in English anyway). Change-Id: I9c565f6f2201a5d877eba5bf0af4ffad7b769984
* Remove all remaining "@since Android" tags.Elliott Hughes2010-03-221-2/+1
| | | | | | | I've fixed a few typos, and removed a few of the more egregiously nonsensical or incorrect comments that were nearby. Change-Id: I35851baebd532f949cc269f4738a26eeb9b6e697
* am a6d228d4: Merge "Minor documentation improvements."Elliott Hughes2010-03-091-7/+9
|\ | | | | | | | | | | | | Merge commit 'a6d228d44153ea2ee831eba1d41cd363989cdf7e' into dalvik-dev * commit 'a6d228d44153ea2ee831eba1d41cd363989cdf7e': Minor documentation improvements.
| * Minor documentation improvements.Elliott Hughes2010-03-091-7/+9
| | | | | | | | | | | | | | | | Based on user-submitted bugs that were just misunderstandings, plus implementation bugs caused by the intended behavior being somewhat subtle. Change-Id: Ic2606b5e57dadc95a35c2d0a977c01434a2fa28a
* | Upgrade our sqlite JDBC driver to version 20100131.Elliott Hughes2010-02-269-298/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bunch of KnownFailures, and adds a bunch of new features. I've updated the tests correspondingly (though doubtless we could add a lot more tests now, if we wanted to). I regenerated Constants.java manually, and explained how in its javadoc. I've added the upstream VERSION file so it's easier to see what upstream version we're at. (Constants now contains the version number too, but that's less obvious.) All our changes now have android-changed markers. I'll see about getting them pushed upstream next week. (This change best reviewed with "ignore whitespace". It looks like we made a bunch of whitespace "corrections" when we imported this source, which just makes it harder to stay in sync. I've taken the upstream copies of files that only had whitespace differences.)
* | Break the sqlite JDBC driver out from our JDBC implementation.Elliott Hughes2010-02-2629-12542/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JDBC driver is from a different source (http://www.ch-werner.de/javasqlite/overview-summary.html) and is only really needed for testing. Bug 2468870 asks that we don't eagerly register the native methods for these classes. That bug is fixed by this change. Bug 2198667 asks that we stop shipping this JDBC driver as part of the base system. That bug is not addressed by this change: the classes and native code are now in their own, separate, .jar and .so files -- so they'll be easier to remove in future -- but for now those files are still in /system/framework and /system/lib respectively. Bug: 2468870 Bug: 2198667
* | Fix a test by syncing with upstream.Elliott Hughes2010-02-241-12/+3
| | | | | | | | This test has been failing for us because of a local modification.
* | Resync a load of tests with upstream, make our build faster.Elliott Hughes2010-02-195-25/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | I started off with a mission to remove uses of dalvik.annotation.* (stuff like @TestTargetNew and other useless junk that just makes it harder to stay in sync with upstream). I wrote a script to go through tests showing me the diff between what we have and what upstream has, thinking that in cases where upstream has also added tests, I may as well pull them in at the same time... ...but I didn't realize how close we were to having dx fill its 1.5GiB heap. After trying various alternatives, I decided to bite the bullet and break core-tests up into one .jar per module. This adds parallelism back into this, the slowest part of our build. (I can do even better, but I'll do that in a separate patch, preferably after we've merged recent changes from master.) Only a couple of dependencies were problematic: the worthless TestSuiteFactory which already contained a comment suggesting we get rid of it, and the fact that some tests -- most notably the concurrent ones -- also contained main methods that started the JUnit tty-based TestRunner. (In the long run, we want to be running the harmony tests directly from a pristine "svn co" of upstream, using DalvikRunner. But this will be a big help in the meantime, and starts the work of getting our current copy of the tests into a state where we can start to extract any meaningful changes/additions we've made.)
* DeleteLocalRef the result of GetObjectClass more consistently.Elliott Hughes2009-10-262-1/+14
| | | | | | | | | | Should fix VM crashes in tests.java.sql.StressTest, which can now be re-enabled. I've also added a "throwoom" to the one place where this code calls malloc but doesn't check the result. Bug: 2213053
* Merge change I66e35647Android (Google) Code Review2009-10-261-0/+2
|\ | | | | | | | | * changes: A new hygenic way for tests to clean up before or after execution.
| * A new hygenic way for tests to clean up before or after execution.Jesse Wilson2009-10-251-0/+2
| | | | | | | | This replaces PrefsTester and is more general purpose.
* | Suppressing StressTest which is causing our continuous build to fail.Jesse Wilson2009-10-251-2/+2
|/ | | | We're tracking this under issue 2213053.
* Rewrite Support_Exec to support timeouts on waiting processes.Jesse Wilson2009-10-091-7/+6
| | | | | | Also rewriting SupportExec to use ProcessBuilder rather than Runtime.exec(). Changed callers to use the ProcessBuilder directly rather than calling-through chained methods.
* Use jniThrowException instead of FindClass/ThrowNew.Elliott Hughes2009-10-011-18/+5
| | | | | | Always use our best-of-breed code for throwing exceptions. The remaining callers of Throw have good reason, and the only caller of ThrowNew is now JNIHelp.c (jniThrowException) itself.
* Fix the final [mis]uses of iscopy.Elliott Hughes2009-09-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | I finally got round to going through all the dalvik/libcore/ calls to the following routines, in cases where the final argument ("iscopy") is non-NULL: Get*ArrayElements GetStringChars GetStringUTFChars GetStringCritical Get*ArrayCritical The calls in sqlite_jni.c were neither assuming that setting "iscopy" requests a copy (a bug we've seen elsewhere), nor were they making use of the result. I've changed these to pass NULL to make their lack of interest explicit. I've also fixed a compiler warning (signed/unsigned comparison). The ones in org_apache_harmony_luni_platform_OSFileSystem.cpp were genuine errors. The author was under the misapprehension that iscopy == JNI_FALSE implies that you do not need to call the corresponding "Release" function. I've fixed those. (I haven't addressed the fact that readvImpl and writevImpl differ by just one token, nor have I addressed the fact that -- in theory though not with our current GC -- any of the GetIntArrayElements could fail.)
* Use GetStringRegion/GetStringUTFRegion where appropriate.Elliott Hughes2009-09-101-17/+8
| | | | | | | | | | | Note that the changes to DecimalFormatInterface.cpp and RBNFInterface.cpp are just minor tidy-ups, fixing an issue where the early error exit wouldn't call ReleaseStringChars to undo the earlier call to GetStringChars. Also remove a dead function and fix a comment in ExpatParser.cpp. Tested on sapphire-eng. Bug: 1639287
* Update sql to Harmony 802921.Jesse Wilson2009-08-2655-1543/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notable changes - ConnectionEvent field changed for serialization - Date toString classes no longer use SimpleDateFormat - Timestamp doesn't call through an overridable method in its constructor - Timestamp now checks the String passed to valueOf() using a regex - Properties now specifies a buffer size to avoid a user-inescapable warning Squashed commit of the following: commit dd9926cddda4db0227adbc174070791e5a9afa72 Merge: 8be3b27 4bed1fc Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 10:34:56 2009 -0700 Merge branch 'sql_802921' into sql_dalvik Conflicts: libcore/sql/.classpath libcore/sql/META-INF/MANIFEST.MF libcore/sql/build.xml libcore/sql/src/main/java/java/sql/Array.java libcore/sql/src/main/java/java/sql/BatchUpdateException.java libcore/sql/src/main/java/java/sql/Blob.java libcore/sql/src/main/java/java/sql/CallableStatement.java libcore/sql/src/main/java/java/sql/Clob.java libcore/sql/src/main/java/java/sql/Connection.java libcore/sql/src/main/java/java/sql/DataTruncation.java libcore/sql/src/main/java/java/sql/DatabaseMetaData.java libcore/sql/src/main/java/java/sql/Date.java libcore/sql/src/main/java/java/sql/Driver.java libcore/sql/src/main/java/java/sql/DriverManager.java libcore/sql/src/main/java/java/sql/DriverPropertyInfo.java libcore/sql/src/main/java/java/sql/ParameterMetaData.java libcore/sql/src/main/java/java/sql/PreparedStatement.java libcore/sql/src/main/java/java/sql/Ref.java libcore/sql/src/main/java/java/sql/ResultSet.java libcore/sql/src/main/java/java/sql/ResultSetMetaData.java libcore/sql/src/main/java/java/sql/SQLData.java libcore/sql/src/main/java/java/sql/SQLException.java libcore/sql/src/main/java/java/sql/SQLInput.java libcore/sql/src/main/java/java/sql/SQLOutput.java libcore/sql/src/main/java/java/sql/SQLPermission.java libcore/sql/src/main/java/java/sql/SQLWarning.java libcore/sql/src/main/java/java/sql/Savepoint.java libcore/sql/src/main/java/java/sql/Statement.java libcore/sql/src/main/java/java/sql/Struct.java libcore/sql/src/main/java/java/sql/Time.java libcore/sql/src/main/java/java/sql/Timestamp.java libcore/sql/src/main/java/java/sql/Types.java libcore/sql/src/main/java/javax/sql/ConnectionEvent.java libcore/sql/src/main/java/javax/sql/ConnectionEventListener.java libcore/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java libcore/sql/src/main/java/javax/sql/DataSource.java libcore/sql/src/main/java/javax/sql/PooledConnection.java libcore/sql/src/main/java/javax/sql/RowSet.java libcore/sql/src/main/java/javax/sql/RowSetEvent.java libcore/sql/src/main/java/javax/sql/RowSetInternal.java libcore/sql/src/main/java/javax/sql/RowSetListener.java libcore/sql/src/main/java/javax/sql/RowSetMetaData.java libcore/sql/src/main/java/javax/sql/RowSetReader.java libcore/sql/src/main/java/javax/sql/RowSetWriter.java libcore/sql/src/main/java/javax/sql/rowset/BaseRowSet.java libcore/sql/src/main/java/javax/sql/rowset/WebRowSet.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialException.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java libcore/sql/src/main/java/javax/sql/rowset/serial/SerialStruct.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java libcore/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java libcore/sql/src/main/java/javax/transaction/xa/XAException.java libcore/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/BaseRowSetTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialClobTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialJavaObjectTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialRefTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialStructTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/InvalidTransactionExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRequiredExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRolledbackExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAExceptionTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAResourceTest.java libcore/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XidTest.java commit 8be3b27082122a5c5b650ad5aad6a70b45fd58d4 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:39:01 2009 -0700 Dalvik SQL commit 4bed1fc3972b50198299137dc152d46dd9d5d532 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:38:11 2009 -0700 SQL 802921 commit 82f57ed5049955585aecfae659310b6bde3354d8 Author: Jesse Wilson <jessewilson@google.com> Date: Wed Aug 12 09:36:42 2009 -0700 SQL 527399
* Fix issue 1687880.Jing Yu2009-05-051-0/+2
| | | | Change argument va_list to a standard representation.
* AI 147687: Several fixes for failing tests in the cts host. also tests that ↵Urs Grob2009-04-241-1/+1
| | | | | | | | | | timeout are now marked with BrokenTest to exclude them for the time being until we have a way to execute them. BUG=1285921 Automated import of CL 147687
* AI 147118: Several fixes to reduce failing tests in the cts hostUrs Grob2009-04-218-91/+74
| | | | | | | | | | | | | | | - Removing tests that are placed in a protected package name. They were not part of the cts tests. - Fixing a case of an Exception thrown in the static initializer of GBCharsetEncoderTest. - Remove copy/paste code which led to an exception in a 2nd thread (the test did not fail, but its output was reported in logcat) - fixing a test case in FileTest - removing test code in StmtTest that tested badly specified operations and failed. BUG=1285921 Automated import of CL 147118
* AI 146479: Fixes for tests in the sql module.Urs Grob2009-04-162-24/+54
| | | | | | | Some tests are still failing in the cts host environment. this CL fixes most of them in the sql module. BUG=1285921 Automated import of CL 146479
* AI 145288: Removing tabs from tests.Urs Grob2009-04-0910-81/+81
| | | | | | BUG=1285921 Automated import of CL 145288
* AI 144802: Bringing SQL down to zero broken tests. RestructuringJorg Pleumann2009-04-0716-653/+610
| | | | | | | | some overengineered tests, so they are able to execute in the CTS host and our CoreTestRunner. BUG=1285921 Automated import of CL 144802
* AI 143455: Bringing the SQL tests down to zero failures (andJorg Pleumann2009-03-3015-209/+160
| | | | | | | | | reducing the size of some stress tests, so they have a chance to actually succeed before the end of the world). BUG=1285921 Automated import of CL 143455
* auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-191-1/+1
|
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-1/+1
|
* auto import from //branches/cupcake/...@137873The Android Open Source Project2009-03-111-2/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03173-0/+68262
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03173-68262/+0
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-1021-1348/+2135
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-0981-6072/+22115
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-1787-5177/+11753
|
* Initial ContributionThe Android Open Source Project2008-10-21134-0/+44856
generated by cgit v1.1 at 2025-07-04 13:26:11 +0000