summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 18:26:44 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 18:26:44 +0000
commite840afdedd33728491639312a268fbf37a48f078 (patch)
tree448ac9eaf5890f1b3aa9e2a72afa069675fd4691
parentd9573ac7aac27d42ecb31c892cf9b9ddd8de401f (diff)
downloadchromium_src-e840afdedd33728491639312a268fbf37a48f078.zip
chromium_src-e840afdedd33728491639312a268fbf37a48f078.tar.gz
chromium_src-e840afdedd33728491639312a268fbf37a48f078.tar.bz2
Next step integrating the HistoryQuickProvider: Implement index initialization and population and provide unit test with test data. Eliminated DCHECKs which were surrounding 'release' code and causing release failures.
[Previously reviewed as: http://codereview.chromium.org/3138006.] BUG=None TEST=None Review URL: http://codereview.chromium.org/3263002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57706 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/in_memory_history_backend.cc8
-rw-r--r--chrome/browser/history/in_memory_url_index.cc162
-rw-r--r--chrome/browser/history/in_memory_url_index.h145
-rw-r--r--chrome/browser/history/in_memory_url_index_unittest.cc119
-rw-r--r--chrome/test/data/History/url_history_provider_test.db.txt57
5 files changed, 480 insertions, 11 deletions
diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc
index 1350667..d07f9a6 100644
--- a/chrome/browser/history/in_memory_history_backend.cc
+++ b/chrome/browser/history/in_memory_history_backend.cc
@@ -7,14 +7,17 @@
#include "base/command_line.h"
#include "base/histogram.h"
#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/history/history_notifications.h"
#include "chrome/browser/history/in_memory_database.h"
#include "chrome/browser/history/in_memory_url_index.h"
#include "chrome/browser/history/url_database.h"
+#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
+#include "chrome/common/pref_names.h"
namespace history {
@@ -36,9 +39,10 @@ bool InMemoryHistoryBackend::Init(const FilePath& history_filename,
if (CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableInMemoryURLIndex)) {
- index_.reset(new InMemoryURLIndex);
+ index_.reset(new InMemoryURLIndex());
base::TimeTicks beginning_time = base::TimeTicks::Now();
- index_->Init(db);
+ // TODO(mrossetti): Provide languages when profile is available.
+ index_->Init(db, NULL);
UMA_HISTOGRAM_TIMES("Autocomplete.HistoryDatabaseIndexingTime",
base::TimeTicks::Now() - beginning_time);
}
diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc
index 7f249df2..a9f55ab 100644
--- a/chrome/browser/history/in_memory_url_index.cc
+++ b/chrome/browser/history/in_memory_url_index.cc
@@ -4,16 +4,170 @@
#include "chrome/browser/history/in_memory_url_index.h"
+#include <algorithm>
+#include <limits>
+
+#include "app/l10n_util.h"
+#include "base/i18n/word_iterator.h"
+#include "base/string_util.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/history/url_database.h"
+#include "net/base/escape.h"
+#include "net/base/net_util.h"
+
+using base::Time;
+using base::TimeDelta;
namespace history {
+InMemoryURLIndex::InMemoryURLIndex() : history_item_count_(0) {}
+
+InMemoryURLIndex::~InMemoryURLIndex() {}
+
// Indexing
-bool InMemoryURLIndex::Init(history::URLDatabase* history_db) {
- bool success = true;
- // TODO(mrossetti): Implement.
- return success;
+bool InMemoryURLIndex::Init(history::URLDatabase* history_db,
+ const string16* languages) {
+ // TODO(mrossetti): Register for profile/language change notifications.
+ languages_ = *languages;
+ // Reset our indexes.
+ char_word_map_.clear();
+ word_id_history_map_.clear();
+ if (!history_db)
+ return false;
+ URLDatabase::URLEnumerator history_enum;
+ if (history_db->InitURLEnumeratorForEverything(&history_enum)) {
+ URLRow row;
+ Time recent_threshold = InMemoryURLIndex::RecentThreshold();
+ while (history_enum.GetNextURL(&row)) {
+ // Do some filtering so that we only get history items which could
+ // possibly pass the HistoryURLProvider::CullPoorMatches filter later.
+ if ((row.typed_count() > kLowQualityMatchTypedLimit) ||
+ (row.visit_count() > kLowQualityMatchVisitLimit) ||
+ (row.last_visit() >= recent_threshold)) {
+ if (!IndexRow(row))
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+bool InMemoryURLIndex::IndexRow(URLRow row) {
+ const GURL& gurl(row.url());
+ string16 url(WideToUTF16(net::FormatUrl(gurl, UTF16ToWide(languages_),
+ net::kFormatUrlOmitUsernamePassword,
+ UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS, NULL, NULL,
+ NULL)));
+
+ // TODO(mrossetti): Find or implement a ConvertPercentEncoding and use it
+ // on the url.
+
+ // TODO(mrossetti): Detect row_id > std::numeric_limits<HistoryID>::max().
+ HistoryID history_id = static_cast<HistoryID>(row.id());
+
+ // Add the row for quick lookup in the history info store.
+ url = l10n_util::ToLower(url);
+ URLRow new_row(GURL(url), row.id());
+ new_row.set_visit_count(row.visit_count());
+ new_row.set_typed_count(row.typed_count());
+ new_row.set_last_visit(row.last_visit());
+ new_row.set_title(row.title());
+ history_info_map_.insert(std::make_pair(history_id, new_row));
+
+ // Split into individual, unique words.
+ String16Set words = WordsFromString16(url);
+
+ // For each word, add a new entry into the word index referring to the
+ // associated history item.
+ for (String16Set::iterator iter = words.begin();
+ iter != words.end(); ++iter) {
+ String16Set::value_type uni_word = *iter;
+ AddWordToIndex(uni_word, history_id);
+ }
+ ++history_item_count_;
+ return true;
+}
+
+// Utility Functions
+
+InMemoryURLIndex::String16Set InMemoryURLIndex::WordsFromString16(
+ const string16& uni_string) {
+ String16Set words;
+
+ // TODO(mrossetti): Replace all | and _'s with a space, all % quoted
+ // characters with real characters, and break into words, using
+ // appropriate string16 functions.
+ WordIterator iter(&uni_string, WordIterator::BREAK_WORD);
+ if (iter.Init()) {
+ while (iter.Advance()) {
+ if (iter.IsWord()) {
+ words.insert(iter.GetWord());
+ }
+ }
+ }
+ return words;
+}
+
+InMemoryURLIndex::Char16Set InMemoryURLIndex::CharactersFromString16(
+ const string16& uni_word) {
+ Char16Set characters;
+ for (string16::const_iterator iter = uni_word.begin();
+ iter != uni_word.end(); ++iter)
+ characters.insert(*iter);
+ return characters;
+}
+
+void InMemoryURLIndex::AddWordToIndex(const string16& uni_word,
+ HistoryID history_id) {
+ WordMap::iterator word_pos = word_map_.find(uni_word);
+ if (word_pos != word_map_.end())
+ UpdateWordHistory(word_pos->second, history_id);
+ else
+ AddWordHistory(uni_word, history_id);
+}
+
+void InMemoryURLIndex::UpdateWordHistory(WordID word_id, HistoryID history_id) {
+ WordIDHistoryMap::iterator history_pos = word_id_history_map_.find(word_id);
+ DCHECK(history_pos != word_id_history_map_.end());
+ HistoryIDSet& history_id_set(history_pos->second);
+ history_id_set.insert(history_id);
+}
+
+// Add a new word to the word list and the word map, and then create a
+// new entry in the word/history map.
+void InMemoryURLIndex::AddWordHistory(const string16& uni_word,
+ HistoryID history_id) {
+ word_list_.push_back(uni_word);
+ WordID word_id = word_list_.size() - 1;
+ word_map_.insert(std::make_pair(uni_word, word_id));
+ HistoryIDSet history_id_set;
+ history_id_set.insert(history_id);
+ word_id_history_map_.insert(std::make_pair(word_id, history_id_set));
+ // For each character in the newly added word (i.e. a word that is not
+ // already in the word index), add the word to the character index.
+ Char16Set characters = CharactersFromString16(uni_word);
+ for (Char16Set::iterator uni_char_iter = characters.begin();
+ uni_char_iter != characters.end(); ++uni_char_iter) {
+ Char16Set::value_type uni_string = *uni_char_iter;
+ CharWordIDMap::iterator char_iter = char_word_map_.find(uni_string);
+ if (char_iter != char_word_map_.end()) {
+ // Update existing entry in the char/word index.
+ WordIDSet& word_id_set(char_iter->second);
+ word_id_set.insert(word_id);
+ } else {
+ // Create a new entry in the char/word index.
+ WordIDSet word_id_set;
+ word_id_set.insert(word_id);
+ char_word_map_.insert(std::make_pair(uni_string, word_id_set));
+ }
+ }
+}
+
+// static
+Time InMemoryURLIndex::RecentThreshold() {
+ return Time::Now() - TimeDelta::FromDays(kLowQualityMatchAgeLimitInDays);
}
} // namespace history
diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h
index 5b7861a..2b89d02 100644
--- a/chrome/browser/history/in_memory_url_index.h
+++ b/chrome/browser/history/in_memory_url_index.h
@@ -6,6 +6,23 @@
#define CHROME_BROWSER_HISTORY_IN_MEMORY_URL_INDEX_H_
#pragma once
+#include <map>
+#include <set>
+#include <vector>
+
+#include "app/sql/connection.h"
+#include "base/basictypes.h"
+#include "base/linked_ptr.h"
+#include "base/scoped_ptr.h"
+#include "base/string16.h"
+#include "chrome/browser/autocomplete/history_provider_util.h"
+#include "chrome/browser/history/history_types.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
+
+namespace base {
+class Time;
+}
+
namespace history {
class URLDatabase;
@@ -15,13 +32,135 @@ class URLDatabase;
// quickly look up matching URLs for a given query string. Used by
// the HistoryURLProvider for inline autocomplete and to provide URL
// matches to the omnibox.
+//
+// Note about multi-byte codepoints and the data structures in the
+// InMemoryURLIndex class: One will quickly notice that no effort is made to
+// insure that multi-byte character boundaries are detected when indexing the
+// words and characters in the URL history database except when converting
+// URL strings to lowercase. Multi-byte-edness makes no difference when
+// indexing or when searching the index as the final filtering of results
+// is dependent on the comparison of a string of bytes, not individual
+// characters. While the lookup of those bytes during a search in the
+// |char_word_map_| could serve up words in which the individual char16
+// occurs as a portion of a composite character the next filtering step
+// will eliminate such words except in the case where a single character
+// is being searched on and which character occurs as the second char16 of a
+// multi-char16 instance.
class InMemoryURLIndex {
public:
- InMemoryURLIndex() {}
- ~InMemoryURLIndex() {}
+ InMemoryURLIndex();
+ ~InMemoryURLIndex();
+
+ // Convenience types
+ typedef std::vector<string16> String16Vector;
// Open and index the URL history database.
- bool Init(URLDatabase* history_db);
+ bool Init(URLDatabase* history_db, const string16* languages);
+
+ // Reset the history index.
+ void Reset();
+
+ // Given a vector containing one or more words as string16s, scan the
+ // history index and return a vector with all scored, matching history items.
+ // Each term must occur somewhere in the history item for the item to
+ // qualify; however, the terms do not necessarily have to be adjacent.
+ HistoryMatches HistoryItemsForTerms(const String16Vector& terms);
+
+ // Returns the date threshold for considering an history item as significant.
+ static base::Time RecentThreshold();
+
+ private:
+ friend class InMemoryURLIndexTest;
+ FRIEND_TEST(InMemoryURLIndexTest, Initialization);
+
+ // Convenience types
+ typedef std::set<string16> String16Set;
+ typedef std::set<char16> Char16Set;
+
+ // An index into list of all of the words we have indexed.
+ typedef int16 WordID;
+
+ // A map allowing a WordID to be determined given a word.
+ typedef std::map<string16, WordID> WordMap;
+
+ // A map from character to word_ids.
+ typedef std::set<WordID> WordIDSet; // An index into the WordList.
+ typedef std::map<char16, WordIDSet> CharWordIDMap;
+
+ // A map from word_id to history item.
+ // TODO(mrossetti): URLID is 64 bit: a memory bloat and performance hit.
+ // Consider using a smaller type.
+ typedef URLID HistoryID;
+ typedef std::set<HistoryID> HistoryIDSet;
+ typedef std::map<WordID, HistoryIDSet> WordIDHistoryMap;
+
+ // Support caching of term character intersections so that we can optimize
+ // searches which build upon a previous search.
+ struct TermCharWordSet {
+ TermCharWordSet(Char16Set char_set, WordIDSet word_id_set, bool used)
+ : char_set_(char_set),
+ word_id_set_(word_id_set),
+ used_(used) {}
+
+ Char16Set char_set_;
+ WordIDSet word_id_set_;
+ bool used_; // true if this set has been used for the current term search.
+ };
+ typedef std::vector<TermCharWordSet> TermCharWordSetVector;
+
+ // TODO(rohitrao): Probably replace this with QueryResults.
+ typedef std::vector<URLRow> URLRowVector;
+
+ // A map from history_id to the history's URL and title.
+ typedef std::map<HistoryID, URLRow> HistoryInfoMap;
+
+ // Break a string down into individual words.
+ String16Set WordsFromString16(const string16& uni_string);
+
+ // URL History indexing support functions.
+
+ // Index one URL history item.
+ bool IndexRow(URLRow row);
+
+ // Break a string down into its individual characters.
+ // Note that this is temporarily intended to work on a single word, but
+ // _will_ work on a string of words, perhaps with unexpected results.
+ // TODO(mrossetti): Lots of optimizations possible here for not restarting
+ // a search if the user is just typing along. Also, change this to uniString
+ // and properly handle substring matches, scoring and sorting the results
+ // by score. Also, provide the metrics for where the matches occur so that
+ // the UI can highlight the matched sections.
+ Char16Set CharactersFromString16(const string16& uni_word);
+
+ // Given a single word, add a reference to the containing history item
+ // to the index.
+ void AddWordToIndex(const string16& uni_word, HistoryID history_id);
+
+ // Update an existing entry in the word/history index by adding the
+ // |history_id| to set for |word_id| in the word_id_history_map_.
+ void UpdateWordHistory(WordID word_id, HistoryID history_id);
+
+ // Create a new entry in the word/history map for |word_id| and add
+ // |history_id| as the initial element of the word's set.
+ void AddWordHistory(const string16& uni_word, HistoryID history_id);
+
+ // A list of all of indexed words. The index of a word in this list is the
+ // ID of the word in the word_map_. It reduces the memory overhead by
+ // replacing a potentially long and repeated string with a simple index.
+ // NOTE: A word will _never_ be removed from this vector thus insuring
+ // the immutability of the word_id throughout the session, reducing
+ // maintenance complexity.
+ String16Vector word_list_;
+
+ uint64 history_item_count_;
+ WordMap word_map_;
+ CharWordIDMap char_word_map_;
+ WordIDHistoryMap word_id_history_map_;
+ TermCharWordSetVector term_char_word_set_cache_;
+ HistoryInfoMap history_info_map_;
+ string16 languages_;
+
+ DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex);
};
} // namespace history
diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc
index f5932ef..8c808f9 100644
--- a/chrome/browser/history/in_memory_url_index_unittest.cc
+++ b/chrome/browser/history/in_memory_url_index_unittest.cc
@@ -2,15 +2,105 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/history/in_memory_url_index.h"
+#include <stdio.h>
+
+#include <fstream>
+#include <string>
+#include <vector>
+#include "app/sql/connection.h"
+#include "app/sql/statement.h"
+#include "app/sql/transaction.h"
+#include "base/file_util.h"
+#include "base/path_service.h"
#include "base/scoped_ptr.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/history/in_memory_url_index.h"
+#include "chrome/browser/history/in_memory_database.h"
+#include "chrome/common/chrome_paths.h"
#include "testing/gtest/include/gtest/gtest.h"
+// The test version of the history url database table ('url') is contained in
+// a database file created from a text file('url_history_provider_test.db.txt').
+// The only difference between this table and a live 'urls' table from a
+// profile is that the last_visit_time column in the test table contains a
+// number specifying the number of days relative to 'today' to which the
+// absolute time should be set during the test setup stage.
+//
+// The format of the test database text file is of a SQLite .dump file.
+// Note that only lines whose first character is an upper-case letter are
+// processed when creating the test database.
+
+using base::Time;
+using base::TimeDelta;
+
namespace history {
-class InMemoryURLIndexTest : public testing::Test {
+class InMemoryURLIndexTest : public testing::Test,
+ public InMemoryDatabase {
+ public:
+ InMemoryURLIndexTest() { InitFromScratch(); }
+
protected:
+ // Test setup.
+ virtual void SetUp() {
+ // Create and populate a working copy of the URL history database.
+ FilePath history_proto_path;
+ PathService::Get(chrome::DIR_TEST_DATA, &history_proto_path);
+ history_proto_path = history_proto_path.Append(
+ FILE_PATH_LITERAL("History"));
+ history_proto_path = history_proto_path.Append(
+ FILE_PATH_LITERAL("url_history_provider_test.db.txt"));
+ EXPECT_TRUE(file_util::PathExists(history_proto_path));
+
+ std::ifstream proto_file(history_proto_path.value().c_str());
+ static const size_t kCommandBufferMaxSize = 2048;
+ char sql_cmd_line[kCommandBufferMaxSize];
+
+ sql::Connection& db(GetDB());
+ {
+ sql::Transaction transaction(&db);
+ transaction.Begin();
+ while (!proto_file.eof()) {
+ proto_file.getline(sql_cmd_line, kCommandBufferMaxSize);
+ if (!proto_file.eof()) {
+ // We only process lines which begin with a upper-case letter.
+ // TODO(mrossetti): Can iswupper() be used here?
+ if (sql_cmd_line[0] >= 'A' && sql_cmd_line[0] <= 'Z') {
+ std::string sql_cmd(sql_cmd_line);
+ sql::Statement sql_stmt(db.GetUniqueStatement(sql_cmd_line));
+ EXPECT_TRUE(sql_stmt.Run());
+ }
+ }
+ }
+ transaction.Commit();
+ }
+ proto_file.close();
+
+ // Update the last_visit_time table column
+ // such that it represents a time relative to 'now'.
+ sql::Statement statement(db.GetUniqueStatement(
+ "SELECT" HISTORY_URL_ROW_FIELDS "FROM urls;"));
+ EXPECT_TRUE(statement);
+ Time time_right_now = Time::NowFromSystemTime();
+ TimeDelta day_delta = TimeDelta::FromDays(1);
+ {
+ sql::Transaction transaction(&db);
+ transaction.Begin();
+ while (statement.Step()) {
+ URLRow row;
+ FillURLRow(statement, &row);
+ Time last_visit = time_right_now;
+ for (int64 i = row.last_visit().ToInternalValue(); i > 0; --i)
+ last_visit -= day_delta;
+ row.set_last_visit(last_visit);
+ UpdateURLRow(row.id(), row);
+ }
+ transaction.Commit();
+ }
+ }
+
scoped_ptr<InMemoryURLIndex> url_index_;
};
@@ -19,4 +109,29 @@ TEST_F(InMemoryURLIndexTest, Construction) {
EXPECT_TRUE(url_index_.get());
}
+TEST_F(InMemoryURLIndexTest, Initialization) {
+ // Verify that the database contains the expected number of items, which
+ // is the pre-filtered count, i.e. all of the items.
+ sql::Statement statement(GetDB().GetUniqueStatement("SELECT * FROM urls;"));
+ EXPECT_TRUE(statement);
+ uint64 row_count = 0;
+ while (statement.Step()) ++row_count;
+ EXPECT_EQ(29U, row_count);
+ url_index_.reset(new InMemoryURLIndex);
+ string16 languages = UTF8ToUTF16("en,ja,hi,zh");
+ url_index_->Init(this, &languages);
+
+ // There should have been 25 of the 29 urls accepted during filtering.
+ EXPECT_EQ(25U, url_index_->history_item_count_);
+
+ // history_info_map_ should have the same number of items as were filtered.
+ EXPECT_EQ(25U, url_index_->history_info_map_.size());
+
+ // The resulting indexes should account for:
+ // 37 characters
+ // 88 words
+ EXPECT_EQ(37U, url_index_->char_word_map_.size());
+ EXPECT_EQ(88U, url_index_->word_map_.size());
+}
+
} // namespace history
diff --git a/chrome/test/data/History/url_history_provider_test.db.txt b/chrome/test/data/History/url_history_provider_test.db.txt
new file mode 100644
index 0000000..9fe79cb
--- /dev/null
+++ b/chrome/test/data/History/url_history_provider_test.db.txt
@@ -0,0 +1,57 @@
+/*
+ The schema of the database is defined by HISTORY_URL_ROW_FIELDS found in
+ url_database.h and is equivalent to:
+
+ CREATE TABLE urls(id INTEGER PRIMARY KEY,
+ url LONGVARCHAR,
+ title LONGVARCHAR,
+ hidden INTEGER DEFAULT 0 NOT NULL,
+ favicon_id INTEGER DEFAULT 0 NOT NULL,
+ typed_count INTEGER DEFAULT 0 NOT NULL,
+ visit_count INTEGER DEFAULT 0 NOT NULL,
+ last_visit_time INTEGER NOT NULL);
+
+ The quick history autocomplete provider filters out history items that:
+ 1) have not been visited in kLowQualityMatchAgeLimitInDays, AND
+ 2) for which the URL was not explicitly typed at least
+ kLowQualityMatchTypedLimit + 1 times, AND
+ 3) have not been visited at least kLowQualityMatchVisitLimit + 1 times.
+ So we create history items in all of those combinations.
+
+ Note that the last_visit_time column for this test table represents the
+ relative number of days prior to 'today' to which the final column
+ value will be set during test setup. Beware: Do not set this number
+ to be equal to kLowQualityMatchAgeLimitInDays.
+
+ This test file contains 4 items which should not pass the quick history
+ provider filter: 1, 9-11.
+*/
+INSERT INTO "urls" VALUES(1,'http://www.reuters.com/article/idUSN0839880620100708','UPDATE 1-US 30-yr mortgage rate drops to new record low | Reuters',3,1,2,0,29);
+INSERT INTO "urls" VALUES(2,'http://www.golfweek.com/news/2010/jul/08/goydos-opens-john-deere-classic-59/','Goydos opens John Deere Classic with 59',3,1,4,0,27);
+INSERT INTO "urls" VALUES(3,'http://www.businessandmedia.org/articles/2010/20100708120415.aspx','LeBronomics: Could High Taxes Influence James'' Team Decision?',4,1,2,0,28);
+INSERT INTO "urls" VALUES(4,'http://www.realclearmarkets.com/articles/2010/07/08/diversity_in_the_financial_sector_98562.html','RealClearMarkets - Racial, Gender Quotas in the Financial Bill?',4,1,4,0,0);
+INSERT INTO "urls" VALUES(5,'http://drudgereport.com/','DRUDGE REPORT 2010®',3,2,2,0,0);
+INSERT INTO "urls" VALUES(6,'http://totalfinder.binaryage.com/','TotalFinder brings tabs to your native Finder and more!',3,2,4,0,26);
+INSERT INTO "urls" VALUES(7,'http://www.clickgamer.com/products/pid_5269/screenshots/j2me/large/ingame5.png','ingame5.png 176×208 pixels',4,2,2,0,21);
+INSERT INTO "urls" VALUES(8,'http://getsharekit.com/','ShareKit : Drop-in Share Features for all iOS Apps',4,2,4,0,20);
+INSERT INTO "urls" VALUES(9,'http://en.wikipedia.org/wiki/Control-Z','Control-Z - Wikipedia, the free encyclopedia',0,0,6,0,0);
+INSERT INTO "urls" VALUES(10,'http://vmware.com/info?id=724','VMware Account Management Login',1,0,6,0,0);
+INSERT INTO "urls" VALUES(11,'http://www.tech-recipes.com/rx/2621/os_x_change_path_environment_variable/','OS X: Change your PATH environment variable | Mac system administration | Tech-Recipes',0,1,6,0,14);
+INSERT INTO "urls" VALUES(12,'http://view.atdmt.com/PPJ/iview/194841301/direct;wi.160;hi.600/01?click=','',6,6,0,1,0);
+INSERT INTO "urls" VALUES(13,'http://www.itmedia.co.jp/news/','ITmedia News/ITの今が見える、明日が分かる',6,6,0,0,25);
+INSERT INTO "urls" VALUES(14,'http://www.nikkei.co.jp/','NIKKEI NET(日経ネット)は日本経済新聞 電子版に生まれ変わりました',6,6,0,0,73);
+INSERT INTO "urls" VALUES(15,'http://www.cnn.com/','CNN.com International - Breaking, World, Business, Sports, Entertainment and Video News',6,6,0,0,89);
+INSERT INTO "urls" VALUES(16,'http://www.zdnet.com/','Technology News, Analysis, Comments and Product Reviews for IT Professionals | ZDNet',6,6,0,0,652);
+INSERT INTO "urls" VALUES(17,'http://www.crash.net/','Crash.Net | Formula 1 & MotoGP | Motorsport News',6,6,0,0,239);
+INSERT INTO "urls" VALUES(18,'http://www.theinquirer.net/','THE INQUIRER - Microprocessor, Server, Memory, PCS, Graphics, Networking, Storage',6,6,0,0,79);
+INSERT INTO "urls" VALUES(19,'http://www.theregister.co.uk/','The Register: Sci/Tech News for the World',6,6,0,0,74);
+INSERT INTO "urls" VALUES(20,'http://blogs.technet.com/markrussinovich/','Mark''s Blog - Site Home - TechNet Blogs',6,6,0,0,685);
+INSERT INTO "urls" VALUES(21,'http://www.icu-project.org/','ICU Home Page (ICU - International Components for Unicode)',6,6,0,0,445);
+INSERT INTO "urls" VALUES(22,'http://site.icu-project.org/','ICU Home Page (ICU - International Components for Unicode)',6,6,0,0,445);
+INSERT INTO "urls" VALUES(23,'http://icu-project.org/apiref/icu4c/','ICU 4.2: Main Page',6,6,0,0,212);
+INSERT INTO "urls" VALUES(24,'http://www.danilatos.com/event-test/ExperimentTest.html','Experimentation Harness',6,6,0,0,0);
+INSERT INTO "urls" VALUES(25,'http://www.codeguru.com/','CodeGuru : codeguru',6,6,0,0,110);
+INSERT INTO "urls" VALUES(26,'http://www.codeproject.com/','Your Development Resource - CodeProject',6,6,0,0,369);
+INSERT INTO "urls" VALUES(27,'http://www.tomshardware.com/us/#redir','Tom''s Hardware: Hardware News, Tests and Reviews',6,6,0,0,65);
+INSERT INTO "urls" VALUES(28,'http://www.ddj.com/windows/184416623','Dr. Dobb''s | Avoiding the Visual C++ Runtime Library | 2 1, 2003',6,6,0,0,0);
+INSERT INTO "urls" VALUES(29,'http://svcs.cnn.com/weather/getForecast?time=34&mode=json_html&zipCode=336736767676&locCode=EGLL&celcius=true&csiID=csi2','',6,6,0,1,0);