accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1442310 [3/3] - in /accumulo/trunk: proxy/ proxy/examples/python/ proxy/examples/ruby/ proxy/src/main/java/org/apache/accumulo/proxy/ proxy/src/main/java/org/apache/accumulo/proxy/thrift/ proxy/src/main/thrift/ proxy/src/test/java/org/apac...
Date Mon, 04 Feb 2013 19:40:10 GMT
Modified: accumulo/trunk/proxy/src/main/thrift/proxy.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/thrift/proxy.thrift?rev=1442310&r1=1442309&r2=1442310&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/thrift/proxy.thrift (original)
+++ accumulo/trunk/proxy/src/main/thrift/proxy.thrift Mon Feb  4 19:40:09 2013
@@ -230,103 +230,95 @@ exception TableExistsException {
 
 service AccumuloProxy
 {
-  bool ping (1:PrincipalToken PrincipalToken);
+  bool ping (1:PrincipalToken principalToken);
 
   // table operations
-  i32 addConstraint (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string constraintClassName)
                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void addSplits (1:PrincipalToken PrincipalToken, 2:string tableName, 3:set<binary>
splits)                            throws (1:TableNotFoundException ouch1, 2:AccumuloException
ouch2, 3:AccumuloSecurityException ouch3);
-  void attachIterator (1:PrincipalToken PrincipalToken, 2:string tableName, 3:IteratorSetting
setting, 
-                       4:set<IteratorScope> scopes) 
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void checkIteratorConflicts (1:PrincipalToken PrincipalToken, 2:string tableName, 3:IteratorSetting
setting, 
-                               4:set<IteratorScope> scopes) 
-                                                                                        
                   throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
-  void clearLocatorCache (1:PrincipalToken PrincipalToken, 2:string tableName)          
                               throws (1:TableNotFoundException ouch1);
-  void cloneTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string newTableName,
4:bool flush, 
-                   5:map<string,string> propertiesToSet, 6:set<string> propertiesToExclude)

-                                                                                        
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3, 4:TableExistsException ouch4);
-  void compactTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:binary startRow,
4:binary endRow, 
-		     5:list<IteratorSetting> iterators, 6:bool flush, 7:bool wait)              
                   throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3);
-  void cancelCompaction(1:PrincipalToken PrincipalToken, 2:string tableName)            
                               throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException
ouch2, 3:AccumuloException ouch3);
+  i32 addConstraint (1:PrincipalToken principalToken, 2:string tableName, 3:string constraintClassName)
     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void addSplits (1:PrincipalToken principalToken, 2:string tableName, 3:set<binary>
splits)                 throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2,
3:AccumuloSecurityException ouch3);
+  void attachIterator (1:PrincipalToken principalToken, 2:string tableName, 3:IteratorSetting
setting, 
+                       4:set<IteratorScope> scopes)                               
                          throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2,
3:TableNotFoundException ouch3);
+  void checkIteratorConflicts (1:PrincipalToken principalToken, 2:string tableName, 
+                               3:IteratorSetting setting, 4:set<IteratorScope> scopes)
                      throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  void clearLocatorCache (1:PrincipalToken principalToken, 2:string tableName)          
                    throws (1:TableNotFoundException ouch1);
+  void cloneTable (1:PrincipalToken principalToken, 2:string tableName, 3:string newTableName,
4:bool flush, 
+                   5:map<string,string> propertiesToSet, 6:set<string> propertiesToExclude)
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3, 4:TableExistsException ouch4);
+  void compactTable (1:PrincipalToken principalToken, 2:string tableName, 3:binary startRow,
4:binary endRow, 
+		     5:list<IteratorSetting> iterators, 6:bool flush, 7:bool wait)              
            throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException
ouch3);
+  void cancelCompaction(1:PrincipalToken principalToken, 2:string tableName)            
                    throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3);
                                                                                         
                   
-  void createTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:bool versioningIter,
4:TimeType type)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2,
3:TableExistsException ouch3);
-  void deleteTable (1:PrincipalToken PrincipalToken, 2:string tableName)                
                               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2, 3:TableNotFoundException ouch3);
-  void deleteRows (1:PrincipalToken PrincipalToken, 2:string tableName, 3:binary startRow,
4:binary endRow)             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2, 3:TableNotFoundException ouch3);
-  void exportTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string exportDir)
                           throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2,
3:AccumuloSecurityException ouch3);
-  void flushTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:binary startRow,
4:binary endRow, 
-                   5:bool wait)
-                                                                                        
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  map<string,set<string>> getLocalityGroups (1:PrincipalToken PrincipalToken,
2:string tableName)                       throws (1:AccumuloException ouch1, 2:TableNotFoundException
ouch2);
-  IteratorSetting getIteratorSetting (1:PrincipalToken PrincipalToken, 2:string tableName,

-                                      3:string iteratorName, 4:IteratorScope scope) 
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  binary getMaxRow (1:PrincipalToken PrincipalToken, 2:string tableName, 3:set<binary>
auths, 4:binary startRow, 
-                    5:bool startInclusive, 6:binary endRow, 7:bool endInclusive) 
-                                                                                        
                   throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
-  map<string,string> getTableProperties (1:PrincipalToken PrincipalToken, 2:string
tableName)                           throws (1:AccumuloException ouch1, 2:TableNotFoundException
ouch2);
-  list<binary> getSplits (1:PrincipalToken PrincipalToken, 2:string tableName, 3:i32
maxSplits)                         throws (1:TableNotFoundException ouch1);
-  void importDirectory (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string importDir,

-                        4:string failureDir, 5:bool setTime) 
-                                                                                        
                   throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch3, 3:AccumuloSecurityException
ouch4);
-  void importTable (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string importDir)
                           throws (1:TableExistsException ouch1, 2:AccumuloException ouch2,
3:AccumuloSecurityException ouch3);
-  set<string> listTables (1:PrincipalToken PrincipalToken);
-  map<string,set<IteratorScope>> listIterators (1:PrincipalToken PrincipalToken,
2:string tableName)                    throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
-  map<string,i32> listConstraints (1:PrincipalToken PrincipalToken, 2:string tableName)
                                throws (1:AccumuloException ouch1, 2:TableNotFoundException
ouch2);
-  void mergeTablets (1:PrincipalToken PrincipalToken, 2:string tableName, 3:binary startRow,
4:binary endRow)           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2, 3:TableNotFoundException ouch3);
-  void offlineTable (1:PrincipalToken PrincipalToken, 2:string tableName)               
                               throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
-  void onlineTable (1:PrincipalToken PrincipalToken, 2:string tableName)                
                               throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
-  void removeConstraint (1:PrincipalToken PrincipalToken, 2:string tableName, 3:i32 constraint)
                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void removeIterator (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string iterName,

-                       4:set<IteratorScope> scopes)
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void removeTableProperty (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string
property)                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void renameTable (1:PrincipalToken PrincipalToken, 2:string oldTableName, 3:string newTableName)
                     throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3, 4:TableExistsException ouch4);
-  void setLocalityGroups (1:PrincipalToken PrincipalToken, 2:string tableName, 3:map<string,set<string>>
groups)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void setTableProperty (1:PrincipalToken PrincipalToken, 2:string tableName, 3:string property,
4:string value)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  set<Range> splitRangeByTablets (1:PrincipalToken PrincipalToken, 2:string tableName,
3:Range range, 4:i32 maxSplits)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2, 3:TableNotFoundException ouch3);
-  bool tableExists (1:PrincipalToken PrincipalToken, 2:string tableName);
-  map<string,string> tableIdMap (1:PrincipalToken PrincipalToken);
+  void createTable (1:PrincipalToken principalToken, 2:string tableName, 3:bool versioningIter,
4:TimeType type) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableExistsException
ouch3);
+  void deleteTable (1:PrincipalToken principalToken, 2:string tableName)                
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2,
3:TableNotFoundException ouch3);
+  void deleteRows (1:PrincipalToken principalToken, 2:string tableName, 3:binary startRow,
4:binary endRow)   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void exportTable (1:PrincipalToken principalToken, 2:string tableName, 3:string exportDir)
                 throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  void flushTable (1:PrincipalToken principalToken, 2:string tableName, 3:binary startRow,
4:binary endRow, 
+                   5:bool wait)                                                         
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  map<string,set<string>> getLocalityGroups (1:PrincipalToken principalToken,
2:string tableName)             throws (1:AccumuloException ouch1, 2:TableNotFoundException
ouch2);
+  IteratorSetting getIteratorSetting (1:PrincipalToken principalToken, 2:string tableName,

+                                      3:string iteratorName, 4:IteratorScope scope)     
                     throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2,
3:TableNotFoundException ouch3);
+  binary getMaxRow (1:PrincipalToken principalToken, 2:string tableName, 3:set<binary>
auths, 4:binary startRow, 
+                    5:bool startInclusive, 6:binary endRow, 7:bool endInclusive)        
                     throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  map<string,string> getTableProperties (1:PrincipalToken principalToken, 2:string
tableName)                 throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  list<binary> getSplits (1:PrincipalToken principalToken, 2:string tableName, 3:i32
maxSplits)               throws (1:TableNotFoundException ouch1);
+  void importDirectory (1:PrincipalToken principalToken, 2:string tableName, 3:string importDir,

+                        4:string failureDir, 5:bool setTime)                            
                     throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch3, 3:AccumuloSecurityException
ouch4);
+  void importTable (1:PrincipalToken principalToken, 2:string tableName, 3:string importDir)
                 throws (1:TableExistsException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  set<string> listTables (1:PrincipalToken principalToken);
+  map<string,set<IteratorScope>> listIterators (1:PrincipalToken principalToken,
2:string tableName)          throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
+  map<string,i32> listConstraints (1:PrincipalToken principalToken, 2:string tableName)
                      throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  void mergeTablets (1:PrincipalToken principalToken, 2:string tableName, 3:binary startRow,
4:binary endRow) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void offlineTable (1:PrincipalToken principalToken, 2:string tableName)               
                     throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2,
3:TableNotFoundException ouch3);
+  void onlineTable (1:PrincipalToken principalToken, 2:string tableName)                
                     throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2,
3:TableNotFoundException ouch3);
+  void removeConstraint (1:PrincipalToken principalToken, 2:string tableName, 3:i32 constraint)
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void removeIterator (1:PrincipalToken principalToken, 2:string tableName, 3:string iterName,

+                       4:set<IteratorScope> scopes)                               
                           throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
+  void removeTableProperty (1:PrincipalToken principalToken, 2:string tableName, 3:string
property)           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void renameTable (1:PrincipalToken principalToken, 2:string oldTableName, 3:string newTableName)
           throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException
ouch3, 4:TableExistsException ouch4);
+  void setLocalityGroups (1:PrincipalToken principalToken, 2:string tableName, 3:map<string,set<string>>
groups) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void setTableProperty (1:PrincipalToken principalToken, 2:string tableName, 3:string property,
4:string value) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  set<Range> splitRangeByTablets (1:PrincipalToken principalToken, 2:string tableName,
3:Range range, 4:i32 maxSplits)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2, 3:TableNotFoundException ouch3);
+  bool tableExists (1:PrincipalToken principalToken, 2:string tableName);
+  map<string,string> tableIdMap (1:PrincipalToken principalToken);
 
   // instance operations
-  void pingTabletServer(1:PrincipalToken PrincipalToken, 2:string tserver)              
                             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  list<ActiveScan> getActiveScans (1:PrincipalToken PrincipalToken, 2:string tserver)
                                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  list<ActiveCompaction> getActiveCompactions(1:PrincipalToken PrincipalToken, 2:string
tserver)                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  map<string,string> getSiteConfiguration (1:PrincipalToken PrincipalToken)       
                                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  map<string,string> getSystemConfiguration (1:PrincipalToken PrincipalToken)     
                                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  list<string> getTabletServers (1:PrincipalToken PrincipalToken);
-  void removeProperty (1:PrincipalToken PrincipalToken, 2:string property)              
                             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void setProperty (1:PrincipalToken PrincipalToken, 2:string property, 3:string value) 
                             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  bool testClassLoad (1:PrincipalToken PrincipalToken, 2:string className, 3:string asTypeName)
                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void pingTabletServer(1:PrincipalToken principalToken, 2:string tserver)              
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<ActiveScan> getActiveScans (1:PrincipalToken principalToken, 2:string tserver)
                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<ActiveCompaction> getActiveCompactions(1:PrincipalToken principalToken, 2:string
tserver)              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  map<string,string> getSiteConfiguration (1:PrincipalToken principalToken)       
                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  map<string,string> getSystemConfiguration (1:PrincipalToken principalToken)     
                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  list<string> getTabletServers (1:PrincipalToken principalToken);
+  void removeProperty (1:PrincipalToken principalToken, 2:string property)              
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void setProperty (1:PrincipalToken principalToken, 2:string property, 3:string value) 
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool testClassLoad (1:PrincipalToken principalToken, 2:string className, 3:string asTypeName)
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
 
   // security operations
-  bool authenticateUser (1:PrincipalToken PrincipalToken, 2:string principal, 3:binary token)
                          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changeUserAuthorizations (1:PrincipalToken PrincipalToken, 2:string principal, 3:set<binary>
authorizations)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changePrincipalTokenword (1:PrincipalToken PrincipalToken, 2:string principal, 3:binary
token)                         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void createUser (1:PrincipalToken PrincipalToken, 2:string principal, 3:binary token) 
                               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void dropUser (1:PrincipalToken PrincipalToken, 2:string principal)                   
                                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  list<binary> getUserAuthorizations (1:PrincipalToken PrincipalToken, 2:string principal)
                                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void grantSystemPermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:SystemPermission
perm)                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void grantTablePermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:string
table, 4:TablePermission perm)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  bool hasSystemPermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:SystemPermission
perm)                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool hasTablePermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:string
table, 4:TablePermission perm)    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  set<string> listUsers (1:PrincipalToken PrincipalToken)                         
                                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
-  void revokeSystemPermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:SystemPermission
perm)               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void revokeTablePermission (1:PrincipalToken PrincipalToken, 2:string principal, 3:string
table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  bool authenticateUser (1:PrincipalToken principalToken, 2:string principal, 3:binary token)
                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void changeUserAuthorizations (1:PrincipalToken principalToken, 2:string principal, 3:set<binary>
authorizations) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void changePrincipalTokenword (1:PrincipalToken principalToken, 2:string principal, 3:binary
token)         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void createUser (1:PrincipalToken principalToken, 2:string principal, 3:binary token) 
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void dropUser (1:PrincipalToken principalToken, 2:string principal)                   
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<binary> getUserAuthorizations (1:PrincipalToken principalToken, 2:string principal)
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void grantSystemPermission (1:PrincipalToken principalToken, 2:string principal, 3:SystemPermission
perm)   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void grantTablePermission (1:PrincipalToken principalToken, 2:string principal, 3:string
table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  bool hasSystemPermission (1:PrincipalToken principalToken, 2:string principal, 3:SystemPermission
perm)     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool hasTablePermission (1:PrincipalToken principalToken, 2:string principal, 3:string
table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  set<string> listUsers (1:PrincipalToken principalToken)                         
                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  void revokeSystemPermission (1:PrincipalToken principalToken, 2:string principal, 3:SystemPermission
perm)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void revokeTablePermission (1:PrincipalToken principalToken, 2:string principal, 3:string
table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
 
 
   // scanning
-  string createBatchScanner(1:PrincipalToken PrincipalToken, 2:string tableName, 3:BatchScanOptions
options)          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  string createScanner(1:PrincipalToken PrincipalToken, 2:string tableName, 3:ScanOptions
options)                                          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  string createBatchScanner(1:PrincipalToken principalToken, 2:string tableName, 3:BatchScanOptions
options)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  string createScanner(1:PrincipalToken principalToken, 2:string tableName, 3:ScanOptions
options)            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
 
   // use the scanner
-  bool hasNext(1:string scanner)                                                        
       throws(1:UnknownScanner ouch1);
-  KeyValueAndPeek nextEntry(1:string scanner)                                           
       throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException
ouch3);
-  ScanResult nextK(1:string scanner, 2:i32 k)                                           
       throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException
ouch3);
-  void closeScanner(1:string scanner)                                                   
       throws (1:UnknownScanner ouch1);
+  bool hasNext(1:string scanner)                                                        
                     throws(1:UnknownScanner ouch1);
+  KeyValueAndPeek nextEntry(1:string scanner)                                           
                     throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException
ouch3);
+  ScanResult nextK(1:string scanner, 2:i32 k)                                           
                     throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException
ouch3);
+  void closeScanner(1:string scanner)                                                   
                     throws(1:UnknownScanner ouch1);
 
   // writing
-  void updateAndFlush(1:PrincipalToken PrincipalToken, 2:string tableName, 3:map<binary,
list<ColumnUpdate>> cells) throws(1:AccumuloException outch1, 2:AccumuloSecurityException
ouch2);
-  string createWriter(1:PrincipalToken PrincipalToken, 2:string tableName, 3:WriterOptions
opts)                    throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2);
+  void updateAndFlush(1:PrincipalToken principalToken, 2:string tableName, 3:map<binary,
list<ColumnUpdate>> cells) throws(1:AccumuloException outch1, 2:AccumuloSecurityException
ouch2);
+  string createWriter(1:PrincipalToken principalToken, 2:string tableName, 3:WriterOptions
opts)              throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2);
 
   // use the writer
   oneway void update(1:string writer, 2:map<binary, list<ColumnUpdate>> cells);

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java?rev=1442310&r1=1442309&r2=1442310&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
(original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
Mon Feb  4 19:40:09 2013
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertNul
 import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
+import java.util.Collections;
 import java.util.Properties;
 
 import org.apache.accumulo.proxy.thrift.PrincipalToken;

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java?rev=1442310&r1=1442309&r2=1442310&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java Mon
Feb  4 19:40:09 2013
@@ -39,6 +39,7 @@ import org.apache.accumulo.server.master
 import org.apache.accumulo.server.tabletserver.TabletServer;
 import org.apache.accumulo.server.util.Initialize;
 import org.apache.accumulo.server.util.time.SimpleTimer;
+import org.apache.accumulo.start.Main;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
 
 /**
@@ -156,7 +157,8 @@ public class MiniAccumuloCluster {
     
     ArrayList<String> argList = new ArrayList<String>();
     
-    argList.addAll(Arrays.asList(javaBin, "-cp", classpath, "-Xmx128m", "-XX:+UseConcMarkSweepGC",
"-XX:CMSInitiatingOccupancyFraction=75", className));
+    argList.addAll(Arrays.asList(javaBin, "-cp", classpath, "-Xmx128m", "-XX:+UseConcMarkSweepGC",
"-XX:CMSInitiatingOccupancyFraction=75", Main.class.getName(), className));
+    
     argList.addAll(Arrays.asList(args));
     
     ProcessBuilder builder = new ProcessBuilder(argList);
@@ -164,6 +166,14 @@ public class MiniAccumuloCluster {
     builder.environment().put("ACCUMULO_HOME", config.getDir().getAbsolutePath());
     builder.environment().put("ACCUMULO_LOG_DIR", logDir.getAbsolutePath());
     
+    // if we're running under accumulo.start, we forward these env vars
+    String env = System.getenv("HADOOP_PREFIX");
+    if (env != null)
+      builder.environment().put("HADOOP_PREFIX", env);
+    env = System.getenv("ZOOKEEPER_HOME");
+    if (env != null)
+      builder.environment().put("ZOOKEEPER_HOME", env);
+    
     Process process = builder.start();
     
     LogWriter lw;
@@ -253,7 +263,8 @@ public class MiniAccumuloCluster {
     appendProp(fileWriter, Property.TSERV_NATIVEMAP_ENABLED, "false", siteConfig);
     // since there is a small amount of memory, check more frequently for majc... setting
may not be needed in 1.5
     appendProp(fileWriter, Property.TSERV_MAJC_DELAY, "3", siteConfig);
-    appendProp(fileWriter, Property.GENERAL_CLASSPATHS, libDir.getAbsolutePath(), siteConfig);
+    String cp = System.getenv("ACCUMULO_HOME")+"/lib/.*.jar,$ZOOKEEPER_HOME/zookeeper[^.].*.jar,$HADOOP_HOME/[^.].*.jar,$HADOOP_HOME/lib/[^.].*.jar";

+    appendProp(fileWriter, Property.GENERAL_CLASSPATHS, cp, siteConfig);
     appendProp(fileWriter, Property.GENERAL_DYNAMIC_CLASSPATHS, libDir.getAbsolutePath(),
siteConfig);
     
     for (Entry<String,String> entry : siteConfig.entrySet())
@@ -264,7 +275,7 @@ public class MiniAccumuloCluster {
     zooCfgFile = new File(confDir, "zoo.cfg");
     fileWriter = new FileWriter(zooCfgFile);
     
-    // zookeeper uses Properties to read its config, so use that to write inorder to properly
escape things like Windows paths
+    // zookeeper uses Properties to read its config, so use that to write in order to properly
escape things like Windows paths
     Properties zooCfg = new Properties();
     zooCfg.setProperty("tickTime", "1000");
     zooCfg.setProperty("initLimit", "10");
@@ -304,7 +315,7 @@ public class MiniAccumuloCluster {
       }
     });
     
-    zooKeeperProcess = exec(ZooKeeperServerMain.class, zooCfgFile.getAbsolutePath());
+    zooKeeperProcess = exec(Main.class, ZooKeeperServerMain.class.getName(), zooCfgFile.getAbsolutePath());
     
     // sleep a little bit to let zookeeper come up before calling init, seems to work better
     UtilWaitThread.sleep(250);



Mime
View raw message