summaryrefslogtreecommitdiff
path: root/table
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2011-04-12 19:38:58 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2011-04-12 19:38:58 +0000
commitf779e7a5d89f853fc5224f9eb8103ca2b8f2f555 (patch)
treeca48db37de2515489323a99272729a1d9f5be254 /table
parent9e33808a26cbbb38008fcd10b74c4d05d78d0aa1 (diff)
downloadleveldb-f779e7a5d89f853fc5224f9eb8103ca2b8f2f555.tar.gz
@20602303. Default file permission is now 755.
git-svn-id: https://leveldb.googlecode.com/svn/trunk@20 62dab493-f737-651d-591e-8d6aee1b9529
Diffstat (limited to 'table')
-rwxr-xr-x[-rw-r--r--]table/block.cc0
-rwxr-xr-x[-rw-r--r--]table/block.h0
-rwxr-xr-x[-rw-r--r--]table/block_builder.cc0
-rwxr-xr-x[-rw-r--r--]table/block_builder.h0
-rwxr-xr-x[-rw-r--r--]table/format.cc0
-rwxr-xr-x[-rw-r--r--]table/format.h0
-rwxr-xr-x[-rw-r--r--]table/iterator.cc0
-rwxr-xr-x[-rw-r--r--]table/iterator_wrapper.h0
-rwxr-xr-x[-rw-r--r--]table/merger.cc0
-rwxr-xr-x[-rw-r--r--]table/merger.h0
-rwxr-xr-x[-rw-r--r--]table/table.cc0
-rwxr-xr-x[-rw-r--r--]table/table_builder.cc0
-rwxr-xr-x[-rw-r--r--]table/table_test.cc4
-rwxr-xr-x[-rw-r--r--]table/two_level_iterator.cc0
-rwxr-xr-x[-rw-r--r--]table/two_level_iterator.h0
15 files changed, 2 insertions, 2 deletions
diff --git a/table/block.cc b/table/block.cc
index 0525d2d..0525d2d 100644..100755
--- a/table/block.cc
+++ b/table/block.cc
diff --git a/table/block.h b/table/block.h
index cdf0598..cdf0598 100644..100755
--- a/table/block.h
+++ b/table/block.h
diff --git a/table/block_builder.cc b/table/block_builder.cc
index ae18b36..ae18b36 100644..100755
--- a/table/block_builder.cc
+++ b/table/block_builder.cc
diff --git a/table/block_builder.h b/table/block_builder.h
index bf92a0f..bf92a0f 100644..100755
--- a/table/block_builder.h
+++ b/table/block_builder.h
diff --git a/table/format.cc b/table/format.cc
index 8c6b0f3..8c6b0f3 100644..100755
--- a/table/format.cc
+++ b/table/format.cc
diff --git a/table/format.h b/table/format.h
index a6ab964..a6ab964 100644..100755
--- a/table/format.h
+++ b/table/format.h
diff --git a/table/iterator.cc b/table/iterator.cc
index 4ddd55f..4ddd55f 100644..100755
--- a/table/iterator.cc
+++ b/table/iterator.cc
diff --git a/table/iterator_wrapper.h b/table/iterator_wrapper.h
index 158d3a7..158d3a7 100644..100755
--- a/table/iterator_wrapper.h
+++ b/table/iterator_wrapper.h
diff --git a/table/merger.cc b/table/merger.cc
index 6ce06bb..6ce06bb 100644..100755
--- a/table/merger.cc
+++ b/table/merger.cc
diff --git a/table/merger.h b/table/merger.h
index 71d9dc5..71d9dc5 100644..100755
--- a/table/merger.h
+++ b/table/merger.h
diff --git a/table/table.cc b/table/table.cc
index 9820753..9820753 100644..100755
--- a/table/table.cc
+++ b/table/table.cc
diff --git a/table/table_builder.cc b/table/table_builder.cc
index 7ec7ad2..7ec7ad2 100644..100755
--- a/table/table_builder.cc
+++ b/table/table_builder.cc
diff --git a/table/table_test.cc b/table/table_test.cc
index e0c7134..4b3e85e 100644..100755
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -725,10 +725,10 @@ TEST(Harness, RandomizedLongDB) {
Test(&rnd);
// We must have created enough data to force merging
- uint64_t l0_files, l1_files;
+ std::string l0_files, l1_files;
ASSERT_TRUE(db()->GetProperty("leveldb.num-files-at-level0", &l0_files));
ASSERT_TRUE(db()->GetProperty("leveldb.num-files-at-level1", &l1_files));
- ASSERT_GT(l0_files + l1_files, 0);
+ ASSERT_GT(atoi(l0_files.c_str()) + atoi(l1_files.c_str()), 0);
}
diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc
index 24a1241..24a1241 100644..100755
--- a/table/two_level_iterator.cc
+++ b/table/two_level_iterator.cc
diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h
index 5909e2b..5909e2b 100644..100755
--- a/table/two_level_iterator.h
+++ b/table/two_level_iterator.h