date:20130410

svn commit: r1466582 - in /accumulo/branches/1.5/server/src: main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java test/java/org/apache/accumulo/server/constraints/MetadataConstrai

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 17:37:58 2013
New Revision: 1466582

URL: http://svn.apache.org/r1466582
Log:
ACCUMULO-1044 fixed some issues w/ metadata constraint bulk flag check, made 
the check more strict, and added a lot test for it

Modified:

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java

accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java?rev=1466582r1=1466581r2=1466582view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
 Wed Apr 10 17:37:58 2013
@@ -31,6 +31,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.MetadataTable.DataFileValue;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 import org.apache.accumulo.server.zookeeper.ZooCache;
@@ -139,6 +140,8 @@ public class MetadataConstraints impleme
   violations = addViolation(violations, 5);
 }
 
+boolean checkedBulk = false;
+
 for (ColumnUpdate columnUpdate : colUpdates) {
   Text columnFamily = new Text(columnUpdate.getColumnFamily());
   
@@ -168,7 +171,7 @@ public class MetadataConstraints impleme
   } else if 
(columnFamily.equals(Constants.METADATA_SCANFILE_COLUMN_FAMILY)) {
 
   } else if 
(columnFamily.equals(Constants.METADATA_BULKFILE_COLUMN_FAMILY)) {
-if (!columnUpdate.isDeleted()) {
+if (!columnUpdate.isDeleted()  !checkedBulk) {
   // splits, which also write the time reference, are allowed to write 
this reference even when
   // the transaction is not running because the other half of the 
tablet is holding a reference
   // to the file.
@@ -177,26 +180,42 @@ public class MetadataConstraints impleme
   // but it writes everything.  We allow it to re-write the bulk 
information if it is setting the location. 
   // See ACCUMULO-1230. 
   boolean isLocationMutation = false;
+  
+  HashSetText dataFiles = new HashSetText();
+  HashSetText loadedFiles = new HashSetText();
+
+  String tidString = new String(columnUpdate.getValue());
+  int otherTidCount = 0;
+
   for (ColumnUpdate update : mutation.getUpdates()) {
 if (new 
ColumnFQ(update).equals(Constants.METADATA_DIRECTORY_COLUMN)) {
   isSplitMutation = true;
-}
-if 
(update.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY))
 {
+} else if (new 
Text(update.getColumnFamily()).equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY))
 {
   isLocationMutation = true;
+} else if (new 
Text(update.getColumnFamily()).equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY))
 {
+  dataFiles.add(new Text(update.getColumnQualifier()));
+} else if (new 
Text(update.getColumnFamily()).equals(Constants.METADATA_BULKFILE_COLUMN_FAMILY))
 {
+  loadedFiles.add(new Text(update.getColumnQualifier()));
+  
+  if (!new String(update.getValue()).equals(tidString)) {
+otherTidCount++;
+  }
 }
   }
   
   if (!isSplitMutation  !isLocationMutation) {
-String tidString = new String(columnUpdate.getValue());
 long tid = Long.parseLong(tidString);
+
 try {
-  if (!new 
ZooArbitrator().transactionAlive(Constants.BULK_ARBITRATOR_TYPE, tid)) {
+  if (otherTidCount  0 || !dataFiles.equals(loadedFiles) || 
!getArbitrator().transactionAlive(Constants.BULK_ARBITRATOR_TYPE, tid)) {
 violations = addViolation(violations, 8);
   }
 } catch (Exception ex) {
   violations = addViolation(violations, 8);
 }
   }
+  
+  checkedBulk = true;
 }
   } else {
 if (!isValidColumn(columnUpdate)) {
@@ -248,6 +267,10 @@ public class MetadataConstraints impleme
 return violations;
   }
   
+  protected Arbitrator getArbitrator() {
+return new ZooArbitrator();
+  }
+
   public String getViolationDescription(short violationCode) {

svn commit: r1466589 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 17:45:58 2013
New Revision: 1466589

URL: http://svn.apache.org/r1466589
Log:
ACCUMULO-1044 fixed some issues w/ metadata constraint bulk flag check, made 
the check more strict, and added a lot test for it

Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java

accumulo/trunk/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.5:r1466582

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.5/assemble:r1466582

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1466582

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.5/examples:r1466582

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466582

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466582

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.5/server:r1466582

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java?rev=1466589r1=1466588r2=1466589view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
 Wed Apr 10 17:45:58 2013
@@ -31,6 +31,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.MetadataTable.DataFileValue;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.client.HdfsZooInstance;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 import org.apache.accumulo.server.zookeeper.ZooCache;
@@ -139,6 +140,8 @@ public class MetadataConstraints impleme
   violations = addViolation(violations, 5);
 }
 
+boolean checkedBulk = false;
+
 for (ColumnUpdate columnUpdate : colUpdates) {
   Text columnFamily = new Text(columnUpdate.getColumnFamily());
   
@@ -168,7 +171,7 @@ public class MetadataConstraints impleme
   } else if 
(columnFamily.equals(Constants.METADATA_SCANFILE_COLUMN_FAMILY)) {
 
   } else if 
(columnFamily.equals(Constants.METADATA_BULKFILE_COLUMN_FAMILY)) {
-if (!columnUpdate.isDeleted()) {
+if (!columnUpdate.isDeleted()  !checkedBulk) {
   // splits, which also write the time reference, are allowed to write 
this reference even when
   // the transaction is not running because the other half of the 
tablet is holding a reference
   // to the file.
@@ -177,26 +180,42 @@ public class MetadataConstraints impleme
   // but it writes everything.  We allow it to re-write the bulk 
information if it is setting the location. 
   // See ACCUMULO-1230. 
   boolean isLocationMutation = false;
+  
+  HashSetText dataFiles = new HashSetText();
+  HashSetText loadedFiles = new HashSetText();
+
+  String tidString = new String(columnUpdate.getValue());
+  int otherTidCount = 0;
+
   for (ColumnUpdate update : mutation.getUpdates()) {
 if (new 
ColumnFQ(update).equals(Constants.METADATA_DIRECTORY_COLUMN)) {
   isSplitMutation = true;
-}
-if

svn commit: r1466594 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/resources/org/apache/accumulo/core/conf/ docs/ examples/ fate/src/main/jav

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 17:51:24 2013
New Revision: 1466594

URL: http://svn.apache.org/r1466594
Log:
ACCUMULO-1253 Fix build of docs/config.html; strike-through deprecated 
properties

Removed:
accumulo/trunk/assemble/docgen.sh
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/assemble/build.sh
accumulo/trunk/assemble/pom.xml
accumulo/trunk/core/   (props changed)

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java

accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java

accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
accumulo/trunk/docs/documentation.css
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged 
/accumulo/branches/1.5:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591

Propchange: accumulo/trunk/assemble/
--
  Merged 
/accumulo/branches/1.5/assemble:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591

Modified: accumulo/trunk/assemble/build.sh
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/build.sh?rev=1466594r1=1466593r2=1466594view=diff
==
--- accumulo/trunk/assemble/build.sh (original)
+++ accumulo/trunk/assemble/build.sh Wed Apr 10 17:51:24 2013
@@ -46,7 +46,5 @@ if [ $COUNT -ne $EXPECTED ]
 then
fail expected $EXPECTED files missing licenses, but saw $COUNT
 fi
-#need to run mvn package twice to properly build docs/config.html
-run mvn package
 run mvn package javadoc:aggregate javadoc:jar source:jar -Pdist
 run mvn -P assemble

Modified: accumulo/trunk/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1466594r1=1466593r2=1466594view=diff
==
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Wed Apr 10 17:51:24 2013
@@ -73,13 +73,15 @@
   execution
 idconfig-webpage/id
 goals
-  goalexec/goal
+  goaljava/goal
 /goals
-phasepackage/phase
+phaseprepare-package/phase
 configuration
-  executablebash/executable
+  
mainClassorg.apache.accumulo.core.conf.DefaultConfiguration/mainClass
+  classpathScopecompile/classpathScope
   arguments
-argumentdocgen.sh/argument
+argument--generate-doc/argument
+
argument${project.build.directory}/../../docs/config.html/argument
   /arguments
 /configuration
   /execution

Propchange: accumulo/trunk/core/
--
  Merged 
/accumulo/branches/1.5/core:r1465156-1465624,1465626,1465628-1465687,1465689-1466176,1466178-1466200,1466202,1466204-1466210,1466212-1466242,1466244-1466260,1466262-1466268,1466270-1466581,1466583-1466591

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1466594r1=1466593r2=1466594view=diff
==
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
 Wed Apr 10 17:51:24 2013
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.conf;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -55,7 +56,7 @@ public class DefaultConfiguration extend
   
   private static void generateDocumentation(PrintStream doc) {
 // read static content from resources and output
-InputStream data = 
DefaultConfiguration.class.getClassLoader().getResourceAsStream(config.html);
+InputStream data =

svn commit: r1466627 - in /accumulo/branches/1.4/src/server/src: main/java/org/apache/accumulo/server/iterators/ test/java/org/apache/accumulo/server/iterators/

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 19:06:07 2013
New Revision: 1466627

URL: http://svn.apache.org/r1466627
Log:
ACCUMULO-1044 added unit test for metdata bulk load filter

Added:

accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/

accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
Modified:

accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java

Modified: 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java?rev=1466627r1=1466626r2=1466627view=diff
==
--- 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 Wed Apr 10 19:06:07 2013
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.server.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 
 /**
@@ -40,7 +41,7 @@ public class MetadataBulkLoadFilter exte
   }
   
   MapLong,Status bulkTxStatusCache;
-  ZooArbitrator arbitrator;
+  Arbitrator arbitrator;
   
   @Override
   public boolean accept(Key k, Value v) {
@@ -78,6 +79,10 @@ public class MetadataBulkLoadFilter exte
 }
 
 bulkTxStatusCache = new HashMapLong,MetadataBulkLoadFilter.Status();
-arbitrator = new ZooArbitrator();
+arbitrator = getArbitrator();
+  }
+  
+  protected Arbitrator getArbitrator() {
+return new ZooArbitrator();
   }
 }

Added: 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java?rev=1466627view=auto
==
--- 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
 (added)
+++ 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
 Wed Apr 10 19:06:07 2013
@@ -0,0 +1,148 @@
+/*
+ * 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.server.iterators;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.TreeMap;
+
+import junit.framework.Assert;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.IteratorEnvironment;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.iterators.SortedMapIterator;
+import org.apache.accumulo.core.util.ColumnFQ;
+import org.apache.accumulo.server.zookeeper.TransactionWatcher.Arbitrator;
+import org.apache.hadoop.io.Text;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class MetadataBulkLoadFilterTest {
+  static class TestArbitrator implements Arbitrator {
+@Override
+public boolean transactionAlive(String type, long tid) throws Exception {
+  return tid == 5;
+}
+
+@Override
+public boolean transactionComplete(String type, long tid) throws Exception 
{
+  if (tid == 9)
+throw new RuntimeException();
+  return tid != 5  tid != 7;
+}
+

svn commit: r1466664 - in /accumulo/branches/1.5: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/ma

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 20:57:24 2013
New Revision: 144

URL: http://svn.apache.org/r144
Log:
ACCUMULO-1044 added unit test for metdata bulk load filter

Added:

accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/
  - copied from r1466627, 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/

accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
  - copied, changed from r1466627, 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
Modified:
accumulo/branches/1.5/   (props changed)
accumulo/branches/1.5/assemble/   (props changed)
accumulo/branches/1.5/core/   (props changed)
accumulo/branches/1.5/examples/   (props changed)

accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java 
  (props changed)

accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/branches/1.5/server/   (props changed)

accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
accumulo/branches/1.5/src/   (props changed)

Propchange: accumulo/branches/1.5/
--
  Merged /accumulo/branches/1.4/src:r1466627
  Merged /accumulo/branches/1.4:r1466627

Propchange: accumulo/branches/1.5/assemble/
--
  Merged /accumulo/branches/1.4/src/assemble:r1466627
  Merged /accumulo/branches/1.4/assemble:r1466627

Propchange: accumulo/branches/1.5/core/
--
  Merged /accumulo/branches/1.4/core:r1466627
  Merged /accumulo/branches/1.4/src/core:r1466627

Propchange: accumulo/branches/1.5/examples/
--
  Merged /accumulo/branches/1.4/src/examples:r1466627

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627

Propchange: accumulo/branches/1.5/server/
--
  Merged /accumulo/branches/1.4/server:r1466627
  Merged /accumulo/branches/1.4/src/server:r1466627

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java?rev=144r1=143r2=144view=diff
==
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 Wed Apr 10 20:57:24 2013
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 
 /**
@@ -40,7 +41,7 @@ public class MetadataBulkLoadFilter exte
   }
   
   MapLong,Status bulkTxStatusCache;
-  ZooArbitrator arbitrator;
+  Arbitrator arbitrator;
   
   @Override
   public boolean accept(Key k, Value v) {
@@ -78,6 +79,10 @@ public class MetadataBulkLoadFilter exte
 }
 
 bulkTxStatusCache = new HashMapLong,MetadataBulkLoadFilter.Status();
-arbitrator = new ZooArbitrator();
+arbitrator = getArbitrator();
+  }
+  
+  protected Arbitrator getArbitrator() {
+return new ZooArbitrator();
   }
 }

Copied: 
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
 (from r1466627, 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java)
URL:

svn commit: r1466667 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

2013-04-10 Thread kturner

Author: kturner
Date: Wed Apr 10 21:00:00 2013
New Revision: 147

URL: http://svn.apache.org/r147
Log:
ACCUMULO-1044 added unit test for metdata bulk load filter

Added:
accumulo/trunk/server/src/test/java/org/apache/accumulo/server/iterators/
  - copied from r144, 
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/

accumulo/trunk/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
  - copied unchanged from r144, 
accumulo/branches/1.5/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
Modified:
accumulo/trunk/   (props changed)
accumulo/trunk/assemble/   (props changed)
accumulo/trunk/core/   (props changed)
accumulo/trunk/examples/   (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   
(props changed)

accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
accumulo/trunk/server/   (props changed)

accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
--
  Merged /accumulo/branches/1.4/src:r1466627
  Merged /accumulo/branches/1.5:r1466592-144
  Merged /accumulo/branches/1.4:r1466627

Propchange: accumulo/trunk/assemble/
--
  Merged /accumulo/branches/1.4/src/assemble:r1466627
  Merged /accumulo/branches/1.4/assemble:r1466627
  Merged /accumulo/branches/1.5/assemble:r1466592-144

Propchange: accumulo/trunk/core/
--
  Merged /accumulo/branches/1.5/core:r1466592-144
  Merged /accumulo/branches/1.4/core:r1466627
  Merged /accumulo/branches/1.4/src/core:r1466627

Propchange: accumulo/trunk/examples/
--
  Merged /accumulo/branches/1.4/src/examples:r1466627
  Merged /accumulo/branches/1.5/examples:r1466592-144

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
--
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466592-144
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1466627

Propchange: 
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
  Merged 
/accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627
  Merged 
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466592-144
  Merged 
/accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1466627

Propchange: accumulo/trunk/server/
--
  Merged /accumulo/branches/1.4/server:r1466627
  Merged /accumulo/branches/1.5/server:r1466592-144
  Merged /accumulo/branches/1.4/src/server:r1466627

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java?rev=147r1=146r2=147view=diff
==
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
 Wed Apr 10 21:00:00 2013
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.fate.zookeeper.TransactionWatcher.Arbitrator;
 import org.apache.accumulo.server.zookeeper.TransactionWatcher.ZooArbitrator;
 
 /**
@@ -40,7 +41,7 @@ public class MetadataBulkLoadFilter exte
   }
   
   MapLong,Status bulkTxStatusCache;
-  ZooArbitrator arbitrator;
+  Arbitrator arbitrator;
   
   @Override
   public boolean accept(Key k, Value v) {
@@ -78,6 +79,10 @@ public class MetadataBulkLoadFilter exte
 }
 
 bulkTxStatusCache = new HashMapLong,MetadataBulkLoadFilter.Status();
-arbitrator = new ZooArbitrator();
+arbitrator = getArbitrator();
+  }
+  
+

svn commit: r1466685 - in /accumulo/branches/1.5: assemble/pom.xml bin/accumulo bin/bootstrap_hdfs.sh core/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.x

2013-04-10 Thread ctubbsii

Author: ctubbsii
Date: Wed Apr 10 21:13:04 2013
New Revision: 1466685

URL: http://svn.apache.org/r1466685
Log:
ACCUMULO-1244 Make more libraries provided, because they must be. So, we'll 
depend on the version given by Hadoop. Remove all provided jars and source jars 
from lib directory.

Modified:
accumulo/branches/1.5/assemble/pom.xml
accumulo/branches/1.5/bin/accumulo
accumulo/branches/1.5/bin/bootstrap_hdfs.sh
accumulo/branches/1.5/core/pom.xml
accumulo/branches/1.5/examples/simple/pom.xml
accumulo/branches/1.5/fate/pom.xml
accumulo/branches/1.5/pom.xml
accumulo/branches/1.5/proxy/pom.xml
accumulo/branches/1.5/server/pom.xml
accumulo/branches/1.5/start/pom.xml
accumulo/branches/1.5/test/pom.xml
accumulo/branches/1.5/trace/pom.xml

Modified: accumulo/branches/1.5/assemble/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/assemble/pom.xml (original)
+++ accumulo/branches/1.5/assemble/pom.xml Wed Apr 10 21:13:04 2013
@@ -34,6 +34,11 @@
 modules in our assembly, we only need to ensure this distribution project 
builds AFTER those... --
   dependencies
 dependency
+  groupIdlog4j/groupId
+  artifactIdlog4j/artifactId
+  scopeprovided/scope
+/dependency
+dependency
   groupIdorg.apache.accumulo/groupId
   artifactIdaccumulo-core/artifactId
   scopeprovided/scope

Modified: accumulo/branches/1.5/bin/accumulo
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/accumulo?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/bin/accumulo (original)
+++ accumulo/branches/1.5/bin/accumulo Wed Apr 10 21:13:04 2013
@@ -28,7 +28,7 @@ script=$( basename $SOURCE )
 
 . $bin/config.sh
 
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar:$ACCUMULO_HOME/lib/log4j-1.2.16.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
 
 #
 # Resolve a program to its installation directory
@@ -81,7 +81,8 @@ logger)  export ACCUMULO_OPTS=${ACCUMUL
 esac
 
 XML_FILES=${ACCUMULO_HOME}/conf
-CLASSPATH=${XML_FILES}:${START_JAR}
+LOG4J_JAR=$(ls $HADOOP_PREFIX/lib/log4j-*.jar | head -1)
+CLASSPATH=${XML_FILES}:${START_JAR}:${LOG4J_JAR}
 
 if [ -z $JAVA_HOME -o ! -d $JAVA_HOME ]; then
echo JAVA_HOME is not set or is not a directory.  Please make sure it's 
set globally or in conf/accumulo-env.sh

Modified: accumulo/branches/1.5/bin/bootstrap_hdfs.sh
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/bootstrap_hdfs.sh?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/bin/bootstrap_hdfs.sh (original)
+++ accumulo/branches/1.5/bin/bootstrap_hdfs.sh Wed Apr 10 21:13:04 2013
@@ -74,8 +74,6 @@ fi
 #
 # We need two of the jars in lib, copy them back out and remove them from the 
system context dir
 #
-$HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar $ACCUMULO_HOME/lib/.   /dev/null
-$HADOOP_PREFIX/bin/hadoop fs -rmr 
$SYSTEM_CONTEXT_HDFS_DIR/log4j-1.2.16.jar   /dev/null
 $HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar $ACCUMULO_HOME/lib/.   
/dev/null
 $HADOOP_PREFIX/bin/hadoop fs -rmr 
$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar   /dev/null
 $HADOOP_PREFIX/bin/hadoop fs -copyToLocal 
$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar 
$ACCUMULO_HOME/lib/.   /dev/null

Modified: accumulo/branches/1.5/core/pom.xml
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1466685r1=1466684r2=1466685view=diff
==
--- accumulo/branches/1.5/core/pom.xml (original)
+++ accumulo/branches/1.5/core/pom.xml Wed Apr 10 21:13:04 2013
@@ -30,66 +30,74 @@
   artifactIdjcommander/artifactId
 /dependency
 dependency
+  groupIdjline/groupId
+  artifactIdjline/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-fate/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-start/artifactId
+/dependency
+dependency
+  groupIdorg.apache.accumulo/groupId
+  artifactIdaccumulo-trace/artifactId
+/dependency
+dependency
+  groupIdorg.apache.thrift/groupId
+  artifactIdlibthrift/artifactId
+/dependency
+dependency
   groupIdcommons-cli/groupId
   artifactIdcommons-cli/artifactId
+  scopeprovided/scope
 /dependency
 dependency
   groupIdcommons-codec/groupId
   artifactIdcommons-codec/artifactId
+  scopeprovided/scope
 /dependency
 dependency
   groupIdcommons-collections/groupId

svn commit: r1466582 - in /accumulo/branches/1.5/server/src: main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java test/java/org/apache/accumulo/server/constraints/MetadataConstrai

svn commit: r1466589 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

svn commit: r1466594 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/resources/org/apache/accumulo/core/conf/ docs/ examples/ fate/src/main/jav

svn commit: r1466627 - in /accumulo/branches/1.4/src/server/src: main/java/org/apache/accumulo/server/iterators/ test/java/org/apache/accumulo/server/iterators/

svn commit: r1466664 - in /accumulo/branches/1.5: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/ma

svn commit: r1466667 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java

svn commit: r1466685 - in /accumulo/branches/1.5: assemble/pom.xml bin/accumulo bin/bootstrap_hdfs.sh core/pom.xml examples/simple/pom.xml fate/pom.xml pom.xml proxy/pom.xml server/pom.xml start/pom.x

7 matches

Site Navigation

Mail list logo

Footer information