[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6776377 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6776377 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6776377 Branch: refs/heads/master Commit: e6776377355b0d313524a6d1c7f42135f7afff33 Parents: 240436e edae90f Author: Eric Newton eric.new...@gmail.com Authored: Wed Nov 27 09:48:09 2013 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Wed Nov 27 09:48:09 2013 -0500 -- .../main/java/org/apache/accumulo/tserver/TabletServer.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) --
git commit: ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded
Updated Branches:
refs/heads/1.6.0-SNAPSHOT c70d14e2b - edae90f59
ACCUMULO-1937 decrease log severity for expected case of a tablet no longer
being in the unopened set at the moment it is being loaded
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edae90f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edae90f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edae90f5
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: edae90f593da385e3a6d58063a2d41fbdbb543aa
Parents: c70d14e
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Nov 27 09:47:44 2013 -0500
--
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/edae90f5/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 1b4ccaf..fa29135 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
@@ -2819,8 +2819,13 @@ public class TabletServer extends AbstractMetricsImpl
implements org.apache.accu
if (openingOverlapping.contains(extent) ||
onlineOverlapping.contains(extent))
return;
+
+if (!unopenedOverlapping.contains(extent)) {
+ log.info(assignment + extent + no longer in the unopened
set);
+ return;
+}
-if (!unopenedTablets.contains(extent) ||
unopenedOverlapping.size() != 1 || openingOverlapping.size() 0 ||
onlineOverlapping.size() 0) {
+if (unopenedOverlapping.size() != 1 || openingOverlapping.size()
0 || onlineOverlapping.size() 0) {
throw new IllegalStateException(overlaps assigned + extent +
+ !unopenedTablets.contains(extent) + + unopenedOverlapping +
+ openingOverlapping + + onlineOverlapping);
}
[1/2] git commit: ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded
Updated Branches:
refs/heads/master 240436e6a - e67763773
ACCUMULO-1937 decrease log severity for expected case of a tablet no longer
being in the unopened set at the moment it is being loaded
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edae90f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edae90f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edae90f5
Branch: refs/heads/master
Commit: edae90f593da385e3a6d58063a2d41fbdbb543aa
Parents: c70d14e
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Wed Nov 27 09:47:44 2013 -0500
--
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/edae90f5/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 1b4ccaf..fa29135 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
@@ -2819,8 +2819,13 @@ public class TabletServer extends AbstractMetricsImpl
implements org.apache.accu
if (openingOverlapping.contains(extent) ||
onlineOverlapping.contains(extent))
return;
+
+if (!unopenedOverlapping.contains(extent)) {
+ log.info(assignment + extent + no longer in the unopened
set);
+ return;
+}
-if (!unopenedTablets.contains(extent) ||
unopenedOverlapping.size() != 1 || openingOverlapping.size() 0 ||
onlineOverlapping.size() 0) {
+if (unopenedOverlapping.size() != 1 || openingOverlapping.size()
0 || onlineOverlapping.size() 0) {
throw new IllegalStateException(overlaps assigned + extent +
+ !unopenedTablets.contains(extent) + + unopenedOverlapping +
+ openingOverlapping + + onlineOverlapping);
}
git commit: ACCUMULO-1941 Fix TabletIT test
Updated Branches:
refs/heads/1.6.0-SNAPSHOT edae90f59 - 40a007a2d
ACCUMULO-1941 Fix TabletIT test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40a007a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40a007a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40a007a2
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 40a007a2d57f53f4430164eda95f513444ac2897
Parents: edae90f
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Nov 27 13:30:52 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Nov 27 13:30:52 2013 -0500
--
.../apache/accumulo/test/CreateTestTable.java | 90
.../accumulo/test/functional/TabletIT.java | 63 --
2 files changed, 55 insertions(+), 98 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40a007a2/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
--
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
b/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
deleted file mode 100644
index 14c5cef..000
--- a/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test;
-
-import java.util.Map.Entry;
-import java.util.TreeSet;
-
-import org.apache.accumulo.server.cli.ClientOnDefaultTable;
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.cli.ScannerOpts;
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
-import org.apache.hadoop.io.Text;
-
-import com.beust.jcommander.Parameter;
-
-public class CreateTestTable {
-
- static class Opts extends ClientOnDefaultTable {
-@Parameter(names={-readonly, --readonly}, description=read only)
-boolean readOnly = false;
-@Parameter(names={-count, --count}, description=count, required =
true)
-int count = 1;
-Opts() { super(mrtest1); }
- }
-
- private static void readBack(Connector conn, Opts opts, ScannerOpts
scanOpts) throws Exception {
-Scanner scanner = conn.createScanner(mrtest1, opts.auths);
-scanner.setBatchSize(scanOpts.scanBatchSize);
-int count = 0;
-for (EntryKey,Value elt : scanner) {
- String expected = String.format(%05d, count);
- assert (elt.getKey().getRow().toString().equals(expected));
- count++;
-}
-assert (opts.count == count);
- }
-
- public static void main(String[] args) throws Exception {
-String program = CreateTestTable.class.getName();
-Opts opts = new Opts();
-BatchWriterOpts bwOpts = new BatchWriterOpts();
-ScannerOpts scanOpts = new ScannerOpts();
-opts.parseArgs(program, args, bwOpts, scanOpts);
-
-// create the test table within accumulo
-Connector connector = opts.getConnector();
-
-if (!opts.readOnly) {
- TreeSetText keys = new TreeSetText();
- for (int i = 0; i opts.count / 100; i++) {
-keys.add(new Text(String.format(%05d, i * 100)));
- }
-
- // presplit
- connector.tableOperations().create(opts.getTableName());
- connector.tableOperations().addSplits(opts.getTableName(), keys);
- BatchWriter b = connector.createBatchWriter(opts.getTableName(),
bwOpts.getBatchWriterConfig());
-
- // populate
- for (int i = 0; i opts.count; i++) {
-Mutation m = new Mutation(new Text(String.format(%05d, i)));
-m.put(new Text(col + Integer.toString((i % 3) + 1)), new
Text(qual), new Value(junk.getBytes()));
-b.addMutation(m);
- }
- b.close();
-}
-
-readBack(connector, opts, scanOpts);
-opts.stopTracing();
- }
-}
git commit: ACCUMULO-1943 Replace module.xsd in the test jar so randomwalk has access to it.
Updated Branches: refs/heads/1.5.1-SNAPSHOT 4be3d6625 - 7d886974d ACCUMULO-1943 Replace module.xsd in the test jar so randomwalk has access to it. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d886974 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d886974 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d886974 Branch: refs/heads/1.5.1-SNAPSHOT Commit: 7d886974d066a65830e4203cddc91f973da75725 Parents: 4be3d66 Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:37:12 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:37:12 2013 -0500 -- test/src/main/resources/randomwalk/module.xsd | 69 ++ test/src/test/resources/randomwalk/module.xsd | 69 -- 2 files changed, 69 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/main/resources/randomwalk/module.xsd -- diff --git a/test/src/main/resources/randomwalk/module.xsd b/test/src/main/resources/randomwalk/module.xsd new file mode 100644 index 000..bcdaaae0 --- /dev/null +++ b/test/src/main/resources/randomwalk/module.xsd @@ -0,0 +1,69 @@ +xsd:schema xmlns:xsd=http://www.w3.org/2001/XMLSchema; +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + + xsd:element name=module type=ModuleType/ + + xsd:complexType name=ModuleType +xsd:sequence + xsd:element name=package type=PrefixType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=fixture type=InitType minOccurs=0 maxOccurs=1/ + xsd:element name=init type=InitType/ + xsd:element name=node type=NodeType minOccurs=1 maxOccurs=unbounded/ + /xsd:sequence + /xsd:complexType + + xsd:complexType name=PrefixType +xsd:attribute name=prefix type=xsd:string/ +xsd:attribute name=value type=xsd:string/ + /xsd:complexType + + xsd:complexType name=InitType +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=maxHops type=xsd:nonNegativeInteger/ +xsd:attribute name=maxSec type=xsd:nonNegativeInteger/ +xsd:attribute name=teardown type=xsd:boolean/ + /xsd:complexType + + xsd:complexType name=NodeType +xsd:sequence + xsd:element name=alias type=AliasType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=property type=PropertyType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=edge type=EdgeType minOccurs=1 maxOccurs=unbounded/ +/xsd:sequence +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=src type=xsd:string/ +xsd:attribute name=maxHops type=xsd:nonNegativeInteger/ +xsd:attribute name=maxSec type=xsd:nonNegativeInteger/ +xsd:attribute name=teardown type=xsd:boolean/ + /xsd:complexType + + xsd:complexType name=EdgeType +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=weight type=xsd:positiveInteger/ + /xsd:complexType + + xsd:complexType name=AliasType +xsd:attribute name=name type=xsd:string/ + /xsd:complexType + + xsd:complexType name=PropertyType +xsd:attribute name=key type=xsd:string/ +xsd:attribute name=value type=xsd:string/ + /xsd:complexType + +/xsd:schema http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/test/resources/randomwalk/module.xsd -- diff --git a/test/src/test/resources/randomwalk/module.xsd b/test/src/test/resources/randomwalk/module.xsd deleted file mode 100644 index bcdaaae0..000 --- a/test/src/test/resources/randomwalk/module.xsd +++ /dev/null @@ -1,69 +0,0 @@ -xsd:schema xmlns:xsd=http://www.w3.org/2001/XMLSchema; -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with -
[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/387fcfbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/387fcfbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/387fcfbe Branch: refs/heads/1.6.0-SNAPSHOT Commit: 387fcfbe8766877056fceecc201ad6f3c87653ea Parents: 40a007a 7d88697 Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:38:05 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:38:05 2013 -0500 -- --
[3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/387fcfbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/387fcfbe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/387fcfbe Branch: refs/heads/master Commit: 387fcfbe8766877056fceecc201ad6f3c87653ea Parents: 40a007a 7d88697 Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:38:05 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:38:05 2013 -0500 -- --
[1/4] git commit: ACCUMULO-1941 Fix TabletIT test
Updated Branches:
refs/heads/master e67763773 - 378a9f1d6
ACCUMULO-1941 Fix TabletIT test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40a007a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40a007a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40a007a2
Branch: refs/heads/master
Commit: 40a007a2d57f53f4430164eda95f513444ac2897
Parents: edae90f
Author: Christopher Tubbs ctubb...@apache.org
Authored: Wed Nov 27 13:30:52 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Wed Nov 27 13:30:52 2013 -0500
--
.../apache/accumulo/test/CreateTestTable.java | 90
.../accumulo/test/functional/TabletIT.java | 63 --
2 files changed, 55 insertions(+), 98 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40a007a2/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
--
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
b/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
deleted file mode 100644
index 14c5cef..000
--- a/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test;
-
-import java.util.Map.Entry;
-import java.util.TreeSet;
-
-import org.apache.accumulo.server.cli.ClientOnDefaultTable;
-import org.apache.accumulo.core.cli.BatchWriterOpts;
-import org.apache.accumulo.core.cli.ScannerOpts;
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
-import org.apache.hadoop.io.Text;
-
-import com.beust.jcommander.Parameter;
-
-public class CreateTestTable {
-
- static class Opts extends ClientOnDefaultTable {
-@Parameter(names={-readonly, --readonly}, description=read only)
-boolean readOnly = false;
-@Parameter(names={-count, --count}, description=count, required =
true)
-int count = 1;
-Opts() { super(mrtest1); }
- }
-
- private static void readBack(Connector conn, Opts opts, ScannerOpts
scanOpts) throws Exception {
-Scanner scanner = conn.createScanner(mrtest1, opts.auths);
-scanner.setBatchSize(scanOpts.scanBatchSize);
-int count = 0;
-for (EntryKey,Value elt : scanner) {
- String expected = String.format(%05d, count);
- assert (elt.getKey().getRow().toString().equals(expected));
- count++;
-}
-assert (opts.count == count);
- }
-
- public static void main(String[] args) throws Exception {
-String program = CreateTestTable.class.getName();
-Opts opts = new Opts();
-BatchWriterOpts bwOpts = new BatchWriterOpts();
-ScannerOpts scanOpts = new ScannerOpts();
-opts.parseArgs(program, args, bwOpts, scanOpts);
-
-// create the test table within accumulo
-Connector connector = opts.getConnector();
-
-if (!opts.readOnly) {
- TreeSetText keys = new TreeSetText();
- for (int i = 0; i opts.count / 100; i++) {
-keys.add(new Text(String.format(%05d, i * 100)));
- }
-
- // presplit
- connector.tableOperations().create(opts.getTableName());
- connector.tableOperations().addSplits(opts.getTableName(), keys);
- BatchWriter b = connector.createBatchWriter(opts.getTableName(),
bwOpts.getBatchWriterConfig());
-
- // populate
- for (int i = 0; i opts.count; i++) {
-Mutation m = new Mutation(new Text(String.format(%05d, i)));
-m.put(new Text(col + Integer.toString((i % 3) + 1)), new
Text(qual), new Value(junk.getBytes()));
-b.addMutation(m);
- }
- b.close();
-}
-
-readBack(connector, opts, scanOpts);
-opts.stopTracing();
- }
-}
[2/4] git commit: ACCUMULO-1943 Replace module.xsd in the test jar so randomwalk has access to it.
ACCUMULO-1943 Replace module.xsd in the test jar so randomwalk has access to it. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d886974 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d886974 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d886974 Branch: refs/heads/master Commit: 7d886974d066a65830e4203cddc91f973da75725 Parents: 4be3d66 Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:37:12 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:37:12 2013 -0500 -- test/src/main/resources/randomwalk/module.xsd | 69 ++ test/src/test/resources/randomwalk/module.xsd | 69 -- 2 files changed, 69 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/main/resources/randomwalk/module.xsd -- diff --git a/test/src/main/resources/randomwalk/module.xsd b/test/src/main/resources/randomwalk/module.xsd new file mode 100644 index 000..bcdaaae0 --- /dev/null +++ b/test/src/main/resources/randomwalk/module.xsd @@ -0,0 +1,69 @@ +xsd:schema xmlns:xsd=http://www.w3.org/2001/XMLSchema; +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- + + xsd:element name=module type=ModuleType/ + + xsd:complexType name=ModuleType +xsd:sequence + xsd:element name=package type=PrefixType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=fixture type=InitType minOccurs=0 maxOccurs=1/ + xsd:element name=init type=InitType/ + xsd:element name=node type=NodeType minOccurs=1 maxOccurs=unbounded/ + /xsd:sequence + /xsd:complexType + + xsd:complexType name=PrefixType +xsd:attribute name=prefix type=xsd:string/ +xsd:attribute name=value type=xsd:string/ + /xsd:complexType + + xsd:complexType name=InitType +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=maxHops type=xsd:nonNegativeInteger/ +xsd:attribute name=maxSec type=xsd:nonNegativeInteger/ +xsd:attribute name=teardown type=xsd:boolean/ + /xsd:complexType + + xsd:complexType name=NodeType +xsd:sequence + xsd:element name=alias type=AliasType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=property type=PropertyType minOccurs=0 maxOccurs=unbounded/ + xsd:element name=edge type=EdgeType minOccurs=1 maxOccurs=unbounded/ +/xsd:sequence +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=src type=xsd:string/ +xsd:attribute name=maxHops type=xsd:nonNegativeInteger/ +xsd:attribute name=maxSec type=xsd:nonNegativeInteger/ +xsd:attribute name=teardown type=xsd:boolean/ + /xsd:complexType + + xsd:complexType name=EdgeType +xsd:attribute name=id type=xsd:string/ +xsd:attribute name=weight type=xsd:positiveInteger/ + /xsd:complexType + + xsd:complexType name=AliasType +xsd:attribute name=name type=xsd:string/ + /xsd:complexType + + xsd:complexType name=PropertyType +xsd:attribute name=key type=xsd:string/ +xsd:attribute name=value type=xsd:string/ + /xsd:complexType + +/xsd:schema http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d886974/test/src/test/resources/randomwalk/module.xsd -- diff --git a/test/src/test/resources/randomwalk/module.xsd b/test/src/test/resources/randomwalk/module.xsd deleted file mode 100644 index bcdaaae0..000 --- a/test/src/test/resources/randomwalk/module.xsd +++ /dev/null @@ -1,69 +0,0 @@ -xsd:schema xmlns:xsd=http://www.w3.org/2001/XMLSchema; -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - -
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/378a9f1d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/378a9f1d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/378a9f1d Branch: refs/heads/master Commit: 378a9f1d696b5456b4255bd23b7f601eed78d720 Parents: e677637 387fcfb Author: Josh Elser els...@apache.org Authored: Wed Nov 27 18:38:32 2013 -0500 Committer: Josh Elser els...@apache.org Committed: Wed Nov 27 18:38:32 2013 -0500 -- .../apache/accumulo/test/CreateTestTable.java | 90 .../accumulo/test/functional/TabletIT.java | 63 -- 2 files changed, 55 insertions(+), 98 deletions(-) --
