Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=273050, storage module interface review, r=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184622 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vladimir%pobox.com
2005-11-15 00:35:50 +00:00
parent 29bf628a6f
commit df10e47ecb
15 changed files with 351 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

319
mozilla/storage/src/mozStorageValueArray.cpp
View File

@@ -52,7 +52,7 @@ NS_IMPL_ISUPPORTS1(mozStorageStatementRowValueArray, mozIStorageValueArray)
mozStorageStatementRowValueArray::mozStorageStatementRowValueArray(sqlite3_stmt *aSqliteStmt)
{
mSqliteStatement = aSqliteStmt;
mNumColumns = sqlite3_data_count (aSqliteStmt);
mNumEntries = sqlite3_data_count (aSqliteStmt);
}
mozStorageStatementRowValueArray::~mozStorageStatementRowValueArray()
@@ -60,11 +60,11 @@ mozStorageStatementRowValueArray::~mozStorageStatementRowValueArray()
/* do nothing, we don't own the stmt */
}
/* readonly attribute unsigned long length; */
/* readonly attribute unsigned long numEntries; */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetNumColumns(PRUint32 *aLength)
mozStorageStatementRowValueArray::GetNumEntries(PRUint32 *aLength)
{
*aLength = mNumColumns;
*aLength = mNumEntries;
return NS_OK;
}
@@ -72,7 +72,7 @@ mozStorageStatementRowValueArray::GetNumColumns(PRUint32 *aLength)
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetTypeOfIndex(PRUint32 aIndex, PRInt32 *_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
int t = sqlite3_column_type (mSqliteStatement, aIndex);
switch (t) {
@@ -99,73 +99,52 @@ mozStorageStatementRowValueArray::GetTypeOfIndex(PRUint32 aIndex, PRInt32 *_retv
return NS_OK;
}
/* long getAsInt32 (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsInt32(PRUint32 aIndex, PRInt32 *_retval)
mozStorageStatementRowValueArray::GetInt32(PRUint32 aIndex, PRInt32 *_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
*_retval = sqlite3_column_int (mSqliteStatement, aIndex);
return NS_OK;
}
/* long long getAsInt64 (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsInt64(PRUint32 aIndex, PRInt64 *_retval)
mozStorageStatementRowValueArray::GetInt64(PRUint32 aIndex, PRInt64 *_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
*_retval = sqlite3_column_int64 (mSqliteStatement, aIndex);
return NS_OK;
}
/* double getAsDouble (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsDouble(PRUint32 aIndex, double *_retval)
mozStorageStatementRowValueArray::GetDouble(PRUint32 aIndex, double *_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
*_retval = sqlite3_column_double (mSqliteStatement, aIndex);
return NS_OK;
}
/* string getAsCString (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsCString(PRUint32 aIndex, char **_retval)
mozStorageStatementRowValueArray::GetUTF8String(PRUint32 aIndex, nsACString &_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
int slen = sqlite3_column_bytes (mSqliteStatement, aIndex);
const unsigned char *cstr = sqlite3_column_text (mSqliteStatement, aIndex);
char *str = (char *) nsMemory::Clone (cstr, slen);
if (str == NULL)
return NS_ERROR_OUT_OF_MEMORY;
*_retval = str;
return NS_OK;
}
/* AUTF8String getAsUTF8String (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsUTF8String(PRUint32 aIndex, nsACString & _retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
int slen = sqlite3_column_bytes (mSqliteStatement, aIndex);
const unsigned char *cstr = sqlite3_column_text (mSqliteStatement, aIndex);
_retval.Assign ((char *) cstr, slen);
PRUint32 slen = (PRUint32) sqlite3_column_bytes (mSqliteStatement, aIndex);
const char *cstr = (const char *) sqlite3_column_text (mSqliteStatement, aIndex);
_retval.Assign(cstr, slen);
return NS_OK;
}
/* AString getAsString (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsString(PRUint32 aIndex, nsAString & _retval)
mozStorageStatementRowValueArray::GetString(PRUint32 aIndex, nsAString & _retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
int slen = sqlite3_column_bytes16 (mSqliteStatement, aIndex);
const PRUnichar *wstr = (const PRUnichar *) sqlite3_column_text16 (mSqliteStatement, aIndex);
@@ -174,11 +153,10 @@ mozStorageStatementRowValueArray::GetAsString(PRUint32 aIndex, nsAString & _retv
return NS_OK;
}
/* void getAsBlob (in unsigned long aIndex, [array, size_is (aDataSize)] out octet aData, out unsigned long aDataSize); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetAsBlob(PRUint32 aIndex, PRUint8 **aData, PRUint32 *aDataSize)
mozStorageStatementRowValueArray::GetBlob(PRUint32 aIndex, PRUint32 *aDataSize, PRUint8 **aData)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
NS_ASSERTION (aIndex < mNumEntries, "aIndex out of range");
int blobsize = sqlite3_column_bytes (mSqliteStatement, aIndex);
const void *blob = sqlite3_column_blob (mSqliteStatement, aIndex);
@@ -193,74 +171,13 @@ mozStorageStatementRowValueArray::GetAsBlob(PRUint32 aIndex, PRUint8 **aData, PR
return NS_OK;
}
/* [notxpcom] long asInt32 (in unsigned long aIndex); */
NS_IMETHODIMP_(PRInt32)
mozStorageStatementRowValueArray::AsInt32(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
return sqlite3_column_int (mSqliteStatement, aIndex);
}
/* [notxpcom] long long asInt64 (in unsigned long aIndex); */
NS_IMETHODIMP_(PRInt64)
mozStorageStatementRowValueArray::AsInt64(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
return sqlite3_column_int64 (mSqliteStatement, aIndex);
}
/* [notxpcom] double asDouble (in unsigned long aIndex); */
NS_IMETHODIMP_(double)
mozStorageStatementRowValueArray::AsDouble(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
return sqlite3_column_double (mSqliteStatement, aIndex);
}
/* [notxpcom] string asSharedCString (in unsigned long aIndex, out unsigned long aLength); */
NS_IMETHODIMP_(char *)
mozStorageStatementRowValueArray::AsSharedCString(PRUint32 aIndex, PRUint32 *aLength)
{
if (aLength) {
int slen = sqlite3_column_bytes (mSqliteStatement, aIndex);
*aLength = slen;
}
return (char *) sqlite3_column_text (mSqliteStatement, aIndex);
}
/* [notxpcom] wstring asSharedWString (in unsigned long aIndex, out unsigned long aLength); */
NS_IMETHODIMP_(PRUnichar *)
mozStorageStatementRowValueArray::AsSharedWString(PRUint32 aIndex, PRUint32 *aLength)
{
if (aLength) {
int slen = sqlite3_column_bytes16 (mSqliteStatement, aIndex);
*aLength = slen;
}
return (PRUnichar *) sqlite3_column_text16 (mSqliteStatement, aIndex);
}
/* [noscript] void asSharedBlob (in unsigned long aIndex, [shared] out voidPtr aData, out unsigned long aDataSize); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::AsSharedBlob(PRUint32 aIndex, const void * *aData, PRUint32 *aDataSize)
{
*aDataSize = sqlite3_column_bytes (mSqliteStatement, aIndex);
*aData = sqlite3_column_blob (mSqliteStatement, aIndex);
return NS_OK;
}
/* boolean getIsNull (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetIsNull(PRUint32 aIndex, PRBool *_retval)
{
PRInt32 t;
nsresult rv = GetTypeOfIndex (aIndex, &t);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv))
return rv;
if (t == VALUE_TYPE_NULL)
*_retval = PR_TRUE;
@@ -270,16 +187,40 @@ mozStorageStatementRowValueArray::GetIsNull(PRUint32 aIndex, PRBool *_retval)
return NS_OK;
}
/* [notxpcom] boolean isNull (in unsigned long aIndex); */
PRBool
mozStorageStatementRowValueArray::IsNull(PRUint32 aIndex)
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetSharedUTF8String(PRUint32 aIndex, PRUint32 *aLength, const char **_retval)
{
NS_ASSERTION (aIndex < mNumColumns, "aIndex out of range");
if (aLength) {
int slen = sqlite3_column_bytes (mSqliteStatement, aIndex);
*aLength = slen;
}
return (sqlite3_column_type (mSqliteStatement, aIndex) == SQLITE_NULL);
*_retval = (const char*) sqlite3_column_text (mSqliteStatement, aIndex);
return NS_OK;
}
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetSharedString(PRUint32 aIndex, PRUint32 *aLength, const PRUnichar **_retval)
{
if (aLength) {
int slen = sqlite3_column_bytes16 (mSqliteStatement, aIndex);
*aLength = slen;
}
*_retval = (const PRUnichar *) sqlite3_column_text16 (mSqliteStatement, aIndex);
return NS_OK;
}
NS_IMETHODIMP
mozStorageStatementRowValueArray::GetSharedBlob(PRUint32 aIndex, PRUint32 *aDataSize, const PRUint8 **aData)
{
*aDataSize = sqlite3_column_bytes (mSqliteStatement, aIndex);
*aData = (const PRUint8*) sqlite3_column_blob (mSqliteStatement, aIndex);
return NS_OK;
}
/***
*** mozStorageArgvValueArray
***/
@@ -299,7 +240,7 @@ mozStorageArgvValueArray::~mozStorageArgvValueArray()
/* readonly attribute unsigned long length; */
NS_IMETHODIMP
mozStorageArgvValueArray::GetNumColumns(PRUint32 *aLength)
mozStorageArgvValueArray::GetNumEntries(PRUint32 *aLength)
{
*aLength = mArgc;
return NS_OK;
@@ -336,9 +277,8 @@ mozStorageArgvValueArray::GetTypeOfIndex(PRUint32 aIndex, PRInt32 *_retval)
return NS_OK;
}
/* long getAsInt32 (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsInt32(PRUint32 aIndex, PRInt32 *_retval)
mozStorageArgvValueArray::GetInt32(PRUint32 aIndex, PRInt32 *_retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -347,9 +287,8 @@ mozStorageArgvValueArray::GetAsInt32(PRUint32 aIndex, PRInt32 *_retval)
return NS_OK;
}
/* long long getAsInt64 (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsInt64(PRUint32 aIndex, PRInt64 *_retval)
mozStorageArgvValueArray::GetInt64(PRUint32 aIndex, PRInt64 *_retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -358,9 +297,8 @@ mozStorageArgvValueArray::GetAsInt64(PRUint32 aIndex, PRInt64 *_retval)
return NS_OK;
}
/* double getAsDouble (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsDouble(PRUint32 aIndex, double *_retval)
mozStorageArgvValueArray::GetDouble(PRUint32 aIndex, double *_retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -369,25 +307,8 @@ mozStorageArgvValueArray::GetAsDouble(PRUint32 aIndex, double *_retval)
return NS_OK;
}
/* string getAsCString (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsCString(PRUint32 aIndex, char **_retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
int slen = sqlite3_value_bytes (mArgv[aIndex]);
const unsigned char *cstr = sqlite3_value_text (mArgv[aIndex]);
char *str = (char *) nsMemory::Clone (cstr, slen);
if (str == NULL)
return NS_ERROR_OUT_OF_MEMORY;
*_retval = str;
return NS_OK;
}
/* AUTF8String getAsUTF8String (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsUTF8String(PRUint32 aIndex, nsACString & _retval)
mozStorageArgvValueArray::GetUTF8String(PRUint32 aIndex, nsACString & _retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -398,9 +319,8 @@ mozStorageArgvValueArray::GetAsUTF8String(PRUint32 aIndex, nsACString & _retval)
return NS_OK;
}
/* AString getAsString (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsString(PRUint32 aIndex, nsAString & _retval)
mozStorageArgvValueArray::GetString(PRUint32 aIndex, nsAString & _retval)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -411,9 +331,8 @@ mozStorageArgvValueArray::GetAsString(PRUint32 aIndex, nsAString & _retval)
return NS_OK;
}
/* void getAsBlob (in unsigned long aIndex, [array, size_is (aDataSize)] out octet aData, out unsigned long aDataSize); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetAsBlob(PRUint32 aIndex, PRUint8 **aData, PRUint32 *aDataSize)
mozStorageArgvValueArray::GetBlob(PRUint32 aIndex, PRUint32 *aDataSize, PRUint8 **aData)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
@@ -430,74 +349,14 @@ mozStorageArgvValueArray::GetAsBlob(PRUint32 aIndex, PRUint8 **aData, PRUint32 *
return NS_OK;
}
/* [notxpcom] long asInt32 (in unsigned long aIndex); */
NS_IMETHODIMP_(PRInt32)
mozStorageArgvValueArray::AsInt32(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
return sqlite3_value_int (mArgv[aIndex]);
}
/* [notxpcom] long long asInt64 (in unsigned long aIndex); */
NS_IMETHODIMP_(PRInt64)
mozStorageArgvValueArray::AsInt64(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
return sqlite3_value_int64 (mArgv[aIndex]);
}
/* [notxpcom] double asDouble (in unsigned long aIndex); */
NS_IMETHODIMP_(double)
mozStorageArgvValueArray::AsDouble(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
return sqlite3_value_double (mArgv[aIndex]);
}
/* [notxpcom] string asSharedCString (in unsigned long aIndex, out unsigned long aLength); */
NS_IMETHODIMP_(char *)
mozStorageArgvValueArray::AsSharedCString(PRUint32 aIndex, PRUint32 *aLength)
{
if (aLength) {
int slen = sqlite3_value_bytes (mArgv[aIndex]);
*aLength = slen;
}
return (char *) sqlite3_value_text (mArgv[aIndex]);
}
/* [notxpcom] wstring asSharedWString (in unsigned long aIndex, out unsigned long aLength); */
NS_IMETHODIMP_(PRUnichar *)
mozStorageArgvValueArray::AsSharedWString(PRUint32 aIndex, PRUint32 *aLength)
{
if (aLength) {
int slen = sqlite3_value_bytes16 (mArgv[aIndex]);
*aLength = slen;
}
return (PRUnichar *) sqlite3_value_text16 (mArgv[aIndex]);
}
/* [noscript] void asSharedBlob (in unsigned long aIndex, [shared] out voidPtr aData, out unsigned long aDataSize); */
NS_IMETHODIMP
mozStorageArgvValueArray::AsSharedBlob(PRUint32 aIndex, const void * *aData, PRUint32 *aDataSize)
{
*aDataSize = sqlite3_value_bytes (mArgv[aIndex]);
*aData = sqlite3_value_blob (mArgv[aIndex]);
return NS_OK;
}
/* boolean getIsNull (in unsigned long aIndex); */
NS_IMETHODIMP
mozStorageArgvValueArray::GetIsNull(PRUint32 aIndex, PRBool *_retval)
{
PRInt32 t;
nsresult rv = GetTypeOfIndex (aIndex, &t);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv))
return rv;
if (t == VALUE_TYPE_NULL)
*_retval = PR_TRUE;
@@ -507,41 +366,35 @@ mozStorageArgvValueArray::GetIsNull(PRUint32 aIndex, PRBool *_retval)
return NS_OK;
}
/* [notxpcom] boolean isNull (in unsigned long aIndex); */
PRBool
mozStorageArgvValueArray::IsNull(PRUint32 aIndex)
{
NS_ASSERTION (aIndex < mArgc, "aIndex out of range");
return (sqlite3_value_type (mArgv[aIndex]) == SQLITE_NULL);
}
/***
*** mozStorageDataSet
***/
NS_IMPL_ISUPPORTS1(mozStorageDataSet, mozIStorageDataSet)
mozStorageDataSet::mozStorageDataSet(nsIArray *aRows)
: mRows(aRows)
{
}
mozStorageDataSet::~mozStorageDataSet()
{
}
/* readonly attribute nsIArray dataRows; */
NS_IMETHODIMP
mozStorageDataSet::GetDataRows(nsIArray **aDataRows)
mozStorageArgvValueArray::GetSharedUTF8String(PRUint32 aIndex, PRUint32 *aLength, const char **_retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
if (aLength) {
int slen = sqlite3_value_bytes (mArgv[aIndex]);
*aLength = slen;
}
*_retval = (const char*) sqlite3_value_text (mArgv[aIndex]);
return NS_OK;
}
/* nsISimpleEnumerator getRowEnumerator (); */
NS_IMETHODIMP
mozStorageDataSet::GetRowEnumerator(nsISimpleEnumerator **_retval)
mozStorageArgvValueArray::GetSharedString(PRUint32 aIndex, PRUint32 *aLength, const PRUnichar **_retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
if (aLength) {
int slen = sqlite3_value_bytes16 (mArgv[aIndex]);
*aLength = slen;
}
*_retval = (const PRUnichar*) sqlite3_value_text16 (mArgv[aIndex]);
return NS_OK;
}
NS_IMETHODIMP
mozStorageArgvValueArray::GetSharedBlob(PRUint32 aIndex, PRUint32 *aDataSize, const PRUint8 **aData)
{
*aDataSize = sqlite3_value_bytes (mArgv[aIndex]);
*aData = (const PRUint8*) sqlite3_value_blob (mArgv[aIndex]);
return NS_OK;
}