Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07A6A109F0 for ; Wed, 4 Dec 2013 23:58:47 +0000 (UTC) Received: (qmail 47608 invoked by uid 500); 4 Dec 2013 23:58:45 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47512 invoked by uid 500); 4 Dec 2013 23:58:45 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 47470 invoked by uid 99); 4 Dec 2013 23:58:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 23:58:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CEA5032038C; Wed, 4 Dec 2013 23:58:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 04 Dec 2013 23:59:18 -0000 Message-Id: <0fa4b4af1b72480ab124861eba4f635c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] ACCUMULO-1712 Rename system tables and namespaces http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index fa29135..fa127fb 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -1195,7 +1195,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu // processing the write from the dead client is still in progress, // the restarted client may not see the write unless we wait here. // this behavior is very important when the client is reading the - // !METADATA table + // metadata if (waitForWrites) writeTracker.waitForWrites(TabletType.type(extent)); @@ -2896,7 +2896,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu * * 1) The log recovery code does not handle data written to the tablet on multiple tablet servers. 2) The log recovery code does not block if memory is * full. Therefore recovering lots of tablets that use a lot of memory could run out of memory. 3) The minor compaction finish event did not make it to - * the logs (the file will be in !METADATA, preventing replay of compacted data)... but do not want a majc to wipe the file out from !METADATA and then + * the logs (the file will be in metadata, preventing replay of compacted data)... but do not want a majc to wipe the file out from metadata and then * have another process failure... this could cause duplicate data to replay */ if (tablet.getNumEntriesInMemory() > 0 && !tablet.minorCompactNow(MinorCompactionReason.SYSTEM)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/scale/deleteLargeTable.txt ---------------------------------------------------------------------- diff --git a/test/scale/deleteLargeTable.txt b/test/scale/deleteLargeTable.txt index 97ba831..59dd648 100644 --- a/test/scale/deleteLargeTable.txt +++ b/test/scale/deleteLargeTable.txt @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -Create and delete a large table (do this with !METADATA split alot) see #2381 +Create and delete a large table (do this with accumulo.metadata split alot) see #2381 http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java index 09ed966..a52651e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java @@ -134,7 +134,7 @@ public class ZombieTServer { if (zlock.tryLock(lw, lockContent)) { log.debug("Obtained tablet server lock " + zlock.getLockPath()); } - // modify !METADATA + // modify metadata synchronized (tch) { while (!tch.halted) { tch.wait(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java index 1a314bf..449d732 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java @@ -48,7 +48,7 @@ import org.apache.hadoop.io.Text; import com.google.common.net.HostAndPort; /** - * This little program can be used to write a lot of entries to the !METADATA table and measure the performance of varying numbers of threads doing !METADATA + * This little program can be used to write a lot of metadata entries and measure the performance of varying numbers of threads doing metadata * lookups using the batch scanner. * * http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java index a26e69e..ce0370b 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java @@ -77,7 +77,7 @@ import com.beust.jcommander.Parameter; import com.google.common.net.HostAndPort; /** - * The purpose of this class is to server as fake tserver that is a data sink like /dev/null. NullTserver modifies the !METADATA location entries for a table to + * The purpose of this class is to server as fake tserver that is a data sink like /dev/null. NullTserver modifies the metadata location entries for a table to * point to it. This allows thrift performance to be measured by running any client code that writes to a table. * */ @@ -247,7 +247,7 @@ public class NullTserver { HostAndPort addr = HostAndPort.fromParts(InetAddress.getLocalHost().getHostName(), opts.port); - // modify !METADATA + // modify metadata ZooKeeperInstance zki = new ZooKeeperInstance(new ClientConfiguration().withInstance(opts.iname).withZkHosts(opts.keepers)); String tableId = Tables.getTableId(zki, opts.tableName); http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java index 349f709..39df878 100644 --- a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java +++ b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java @@ -57,8 +57,8 @@ public class DumpConfigIT extends ConfigurableMacIT { assertTrue(meta.contains(Property.TABLE_FILE_REPLICATION.getKey())); String systemPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), "system_perm.cfg"))); assertTrue(systemPerm.contains("grant System.ALTER_USER -s -u root")); - String metaPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), "!METADATA_perm.cfg"))); - assertTrue(metaPerm.contains("grant Table.READ -t !METADATA -u root")); - assertFalse(metaPerm.contains("grant Table.DROP -t !METADATA -u root")); + String metaPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), MetadataTable.NAME + "_perm.cfg"))); + assertTrue(metaPerm.contains("grant Table.READ -t " + MetadataTable.NAME + " -u root")); + assertFalse(metaPerm.contains("grant Table.DROP -t " + MetadataTable.NAME + " -u root")); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java index 8341762..f38c944 100644 --- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java @@ -514,14 +514,14 @@ public class NamespacesIT extends SimpleMacIT { assertTrue(c.instanceOperations().getSystemConfiguration().containsValue("20," + SimpleFilter.class.getName())); assertTrue(checkNamespaceHasProp(c, Constants.DEFAULT_NAMESPACE, "table.iterator.scan.sum", "20," + SimpleFilter.class.getName())); - assertTrue(!checkNamespaceHasProp(c, Constants.SYSTEM_NAMESPACE, "table.iterator.scan.sum", "20," + SimpleFilter.class.getName())); + assertTrue(!checkNamespaceHasProp(c, Constants.ACCUMULO_NAMESPACE, "table.iterator.scan.sum", "20," + SimpleFilter.class.getName())); c.instanceOperations().removeProperty("table.iterator.scan.sum"); c.instanceOperations().setProperty("table.constraint.42", NumericValueConstraint.class.getName()); assertTrue(c.instanceOperations().getSystemConfiguration().containsValue(NumericValueConstraint.class.getName())); assertTrue(checkNamespaceHasProp(c, Constants.DEFAULT_NAMESPACE, "table.constraint.42", NumericValueConstraint.class.getName())); - assertTrue(!checkNamespaceHasProp(c, Constants.SYSTEM_NAMESPACE, "table.constraint.42", NumericValueConstraint.class.getName())); + assertTrue(!checkNamespaceHasProp(c, Constants.ACCUMULO_NAMESPACE, "table.constraint.42", NumericValueConstraint.class.getName())); c.instanceOperations().removeProperty("table.constraint.42"); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 7951c80..4f0c14c 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -295,14 +295,14 @@ public class ShellServerIT extends SimpleMacIT { exec("createuser xyzzy", true); exec("users", true, "xyzzy", true); String perms = exec("userpermissions -u xyzzy", true); - assertTrue(perms.contains("Table permissions (!METADATA): Table.READ")); + assertTrue(perms.contains("Table permissions (" + MetadataTable.NAME + "): Table.READ")); exec("grant -u xyzzy -s System.CREATE_TABLE", true); perms = exec("userpermissions -u xyzzy", true); assertTrue(perms.contains("")); - exec("grant -u root -t !METADATA Table.WRITE", true); - exec("grant -u root -t !METADATA Table.GOOFY", false); + exec("grant -u root -t " + MetadataTable.NAME + " Table.WRITE", true); + exec("grant -u root -t " + MetadataTable.NAME + " Table.GOOFY", false); exec("grant -u root -s foo", false); - exec("grant -u xyzzy -t !METADATA foo", false); + exec("grant -u xyzzy -t " + MetadataTable.NAME + " foo", false); input.set("secret\nsecret\n"); exec("user xyzzy", true); exec("createtable t", true, "xyzzy@", true); @@ -315,9 +315,9 @@ public class ShellServerIT extends SimpleMacIT { exec("revoke -u xyzzy -s System.CREATE_TABLE", true); exec("revoke -u xyzzy -s System.GOOFY", false); exec("revoke -u xyzzy -s foo", false); - exec("revoke -u xyzzy -t !METADATA Table.WRITE", true); - exec("revoke -u xyzzy -t !METADATA Table.GOOFY", false); - exec("revoke -u xyzzy -t !METADATA foo", false); + exec("revoke -u xyzzy -t " + MetadataTable.NAME + " Table.WRITE", true); + exec("revoke -u xyzzy -t " + MetadataTable.NAME + " Table.GOOFY", false); + exec("revoke -u xyzzy -t " + MetadataTable.NAME + " foo", false); exec("deleteuser xyzzy", true); exec("users", true, "xyzzy", false); } @@ -486,7 +486,7 @@ public class ShellServerIT extends SimpleMacIT { @Test(timeout = 30 * 1000) public void constraint() throws Exception { // constraint - exec("constraint -l -t !METADATA", true, "MetadataConstraints=1", true); + exec("constraint -l -t " + MetadataTable.NAME + "", true, "MetadataConstraints=1", true); exec("createtable c -evc"); exec("constraint -l -t c", true, "VisibilityConstraint=2", true); exec("constraint -t c -d 2", true, "Removed constraint 2 from table c"); @@ -672,12 +672,12 @@ public class ShellServerIT extends SimpleMacIT { exec("merge --all", true); exec("getsplits", true, "z", false); exec("deletetable -f t"); - exec("getsplits -t !METADATA", true); + exec("getsplits -t " + MetadataTable.NAME + "", true); assertEquals(2, output.get().split("\n").length); - exec("getsplits -t !!ROOT", true); + exec("getsplits -t accumulo.root", true); assertEquals(1, output.get().split("\n").length); - exec("merge --all -t !METADATA"); - exec("getsplits -t !METADATA", true); + exec("merge --all -t " + MetadataTable.NAME + ""); + exec("getsplits -t " + MetadataTable.NAME + "", true); assertEquals(1, output.get().split("\n").length); } @@ -949,7 +949,7 @@ public class ShellServerIT extends SimpleMacIT { } private int countFiles() throws IOException { - exec("scan -t !METADATA -np -c file"); + exec("scan -t " + MetadataTable.NAME + " -np -c file"); return output.get().split("\n").length - 1; } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java index 3482a1d..b53a724 100644 --- a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java @@ -80,7 +80,7 @@ public class SplitRecoveryIT extends SimpleMacIT { while (!isOffline(tableName, connector)) UtilWaitThread.sleep(200); - // poke a partial split into the !METADATA table + // poke a partial split into the metadata table connector.securityOperations().grantTablePermission("root", MetadataTable.NAME, TablePermission.WRITE); String tableId = connector.tableOperations().tableIdMap().get(tableName); http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 02f294f..df1a3f1 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -92,7 +92,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT { @Test(timeout = 4 * 60 * 1000) public void gcLotsOfCandidatesIT() throws Exception { - log.info("Filling !METADATA table with bogus delete flags"); + log.info("Filling metadata table with bogus delete flags"); Connector c = getConnector(); addEntries(c, new BatchWriterOpts()); cluster.getConfig().setDefaultMemory(10, MemoryUnit.MEGABYTE); @@ -105,7 +105,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT { @Test(timeout = 20 * 60 * 1000) public void dontGCRootLog() throws Exception { - // dirty !METADATA + // dirty metadata Connector c = getConnector(); String table = getTableNames(1)[0]; c.tableOperations().create(table); http://git-wip-us.apache.org/repos/asf/accumulo/blob/8b54ced2/test/system/bench/cloudstone1/cloudstone1.py ---------------------------------------------------------------------- diff --git a/test/system/bench/cloudstone1/cloudstone1.py b/test/system/bench/cloudstone1/cloudstone1.py index cfd8f61..349bbdb 100755 --- a/test/system/bench/cloudstone1/cloudstone1.py +++ b/test/system/bench/cloudstone1/cloudstone1.py @@ -29,8 +29,8 @@ class CloudStone1(Benchmark): 'and we can reach all the slaves. Lower is better.' def runTest(self): - code, out, err = cloudshell.run(self.username, self.password, 'table !METADATA\nscan\n') - self.assertEqual(code, 0, "Could not scan the !METADATA table. %s %s" % (out, err)) + code, out, err = cloudshell.run(self.username, self.password, 'table accumulo.metadata\nscan\n') + self.assertEqual(code, 0, "Could not scan the metadata table. %s %s" % (out, err)) results = runAll('echo help | %s shell' % accumulo('bin', 'accumulo'))