accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1440568 [3/3] - in /accumulo/trunk: 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/apache/accu...
Date Wed, 30 Jan 2013 18:07:37 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=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/thrift/proxy.thrift (original)
+++ accumulo/trunk/proxy/src/main/thrift/proxy.thrift Wed Jan 30 18:07:36 2013
@@ -230,103 +230,104 @@ exception TableExistsException {
 
 service AccumuloProxy
 {
-  bool ping (1:UserPass userpass);
+  // get an identity token
+  binary login(1:UserPass login);
 
   // table operations
-  i32 addConstraint (1:UserPass userpass, 2:string tableName, 3:string constraintClassName)
                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void addSplits (1:UserPass userpass, 2:string tableName, 3:set<binary> splits)  
                         throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2,
3:AccumuloSecurityException ouch3);
-  void attachIterator (1:UserPass userpass, 2:string tableName, 3:IteratorSetting setting,

+  i32 addConstraint (1:binary login, 2:string tableName, 3:string constraintClassName)  
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void addSplits (1:binary login, 2:string tableName, 3:set<binary> splits)       
                    throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  void attachIterator (1:binary login, 2:string tableName, 3:IteratorSetting setting, 
                        4:set<IteratorScope> scopes) 
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void checkIteratorConflicts (1:UserPass userpass, 2:string tableName, 3:IteratorSetting
setting, 
+                                                                                        
              throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  void checkIteratorConflicts (1:binary login, 2:string tableName, 3:IteratorSetting setting,

                                4:set<IteratorScope> scopes) 
-                                                                                        
                   throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
-  void clearLocatorCache (1:UserPass userpass, 2:string tableName)                      
                   throws (1:TableNotFoundException ouch1);
-  void cloneTable (1:UserPass userpass, 2:string tableName, 3:string newTableName, 4:bool
flush, 
+                                                                                        
              throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  void clearLocatorCache (1:binary login, 2:string tableName)                           
              throws (1:TableNotFoundException ouch1);
+  void cloneTable (1:binary login, 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:UserPass userpass, 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:UserPass userpass, 2:string tableName)                        
                   throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3);
+                                                                                        
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3, 4:TableExistsException ouch4);
+  void compactTable (1:binary login, 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:binary login, 2:string tableName)                             
              throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException
ouch3);
                                                                                         
                   
-  void createTable (1:UserPass userpass, 2:string tableName, 3:bool versioningIter, 4:TimeType
type)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableExistsException
ouch3);
-  void deleteTable (1:UserPass userpass, 2:string tableName)                            
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void deleteRows (1:UserPass userpass, 2:string tableName, 3:binary startRow, 4:binary endRow)
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void exportTable (1:UserPass userpass, 2:string tableName, 3:string exportDir)        
                   throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
-  void flushTable (1:UserPass userpass, 2:string tableName, 3:binary startRow, 4:binary endRow,

+  void createTable (1:binary login, 2:string tableName, 3:bool versioningIter, 4:TimeType
type)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableExistsException
ouch3);
+  void deleteTable (1:binary login, 2:string tableName)                                 
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void deleteRows (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow)
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void exportTable (1:binary login, 2:string tableName, 3:string exportDir)             
              throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  void flushTable (1:binary login, 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:UserPass userpass, 2:string tableName)
                      throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
-  IteratorSetting getIteratorSetting (1:UserPass userpass, 2:string tableName, 
+                                                                                        
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  map<string,set<string>> getLocalityGroups (1:binary login, 2:string tableName)
                      throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  IteratorSetting getIteratorSetting (1:binary login, 2:string tableName, 
                                       3:string iteratorName, 4:IteratorScope scope) 
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  binary getMaxRow (1:UserPass userpass, 2:string tableName, 3:set<binary> auths, 4:binary
startRow, 
+                                                                                        
              throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  binary getMaxRow (1:binary login, 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:UserPass userpass, 2:string tableName) 
                         throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
-  list<binary> getSplits (1:UserPass userpass, 2:string tableName, 3:i32 maxSplits)
                        throws (1:TableNotFoundException ouch1);
-  void importDirectory (1:UserPass userpass, 2:string tableName, 3:string importDir, 
+                                                                                        
              throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  map<string,string> getTableProperties (1:binary login, 2:string tableName)      
                    throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  list<binary> getSplits (1:binary login, 2:string tableName, 3:i32 maxSplits)    
                    throws (1:TableNotFoundException ouch1);
+  void importDirectory (1:binary login, 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:UserPass userpass, 2:string tableName, 3:string importDir)        
                   throws (1:TableExistsException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
-  set<string> listTables (1:UserPass userpass);
-  map<string,set<IteratorScope>> listIterators (1:UserPass userpass, 2:string
tableName)                    throws (1:AccumuloSecurityException ouch1, 2:AccumuloException
ouch2, 3:TableNotFoundException ouch3);
-  map<string,i32> listConstraints (1:UserPass userpass, 2:string tableName)       
                         throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
-  void mergeTablets (1:UserPass userpass, 2:string tableName, 3:binary startRow, 4:binary
endRow)           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void offlineTable (1:UserPass userpass, 2:string tableName)                           
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void onlineTable (1:UserPass userpass, 2:string tableName)                            
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void removeConstraint (1:UserPass userpass, 2:string tableName, 3:i32 constraint)     
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void removeIterator (1:UserPass userpass, 2:string tableName, 3:string iterName, 
+                                                                                        
              throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch3, 3:AccumuloSecurityException
ouch4);
+  void importTable (1:binary login, 2:string tableName, 3:string importDir)             
              throws (1:TableExistsException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException
ouch3);
+  set<string> listTables (1:binary login);
+  map<string,set<IteratorScope>> listIterators (1:binary login, 2:string tableName)
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  map<string,i32> listConstraints (1:binary login, 2:string tableName)            
                    throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
+  void mergeTablets (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow)
          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void offlineTable (1:binary login, 2:string tableName)                                
              throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  void onlineTable (1:binary login, 2:string tableName)                                 
              throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  void removeConstraint (1:binary login, 2:string tableName, 3:i32 constraint)          
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void removeIterator (1:binary login, 2:string tableName, 3:string iterName, 
                        4:set<IteratorScope> scopes)
-                                                                                        
                   throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
-  void removeTableProperty (1:UserPass userpass, 2:string tableName, 3:string property) 
                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void renameTable (1:UserPass userpass, 2:string oldTableName, 3:string newTableName)  
                   throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2,
3:AccumuloException ouch3, 4:TableExistsException ouch4);
-  void setLocalityGroups (1:UserPass userpass, 2:string tableName, 3:map<string,set<string>>
groups)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
-  void setTableProperty (1:UserPass userpass, 2:string tableName, 3:string property, 4:string
value)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  set<Range> splitRangeByTablets (1:UserPass userpass, 2:string tableName, 3:Range
range, 4:i32 maxSplits)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2,
3:TableNotFoundException ouch3);
-  bool tableExists (1:UserPass userpass, 2:string tableName);
-  map<string,string> tableIdMap (1:UserPass userpass);
+                                                                                        
              throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException
ouch3);
+  void removeTableProperty (1:binary login, 2:string tableName, 3:string property)      
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void renameTable (1:binary login, 2:string oldTableName, 3:string newTableName)       
              throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException
ouch3, 4:TableExistsException ouch4);
+  void setLocalityGroups (1:binary login, 2:string tableName, 3:map<string,set<string>>
groups)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  void setTableProperty (1:binary login, 2:string tableName, 3:string property, 4:string
value)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  set<Range> splitRangeByTablets (1:binary login, 2:string tableName, 3:Range range,
4:i32 maxSplits)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException
ouch3);
+  bool tableExists (1:binary login, 2:string tableName);
+  map<string,string> tableIdMap (1:binary login);
 
   // instance operations
-  void pingTabletServer(1:UserPass userpass, 2:string tserver)                          
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<ActiveScan> getActiveScans (1:UserPass userpass, 2:string tserver)         
                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<ActiveCompaction> getActiveCompactions(1:UserPass userpass, 2:string tserver)
                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  map<string,string> getSiteConfiguration (1:UserPass userpass)                   
                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  map<string,string> getSystemConfiguration (1:UserPass userpass)                 
                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<string> getTabletServers (1:UserPass userpass);
-  void removeProperty (1:UserPass userpass, 2:string property)                          
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void setProperty (1:UserPass userpass, 2:string property, 3:string value)             
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool testClassLoad (1:UserPass userpass, 2:string className, 3:string asTypeName)     
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void pingTabletServer(1:binary login, 2:string tserver)                               
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<ActiveScan> getActiveScans (1:binary login, 2:string tserver)              
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<ActiveCompaction> getActiveCompactions(1:binary login, 2:string tserver)   
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  map<string,string> getSiteConfiguration (1:binary login)                        
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  map<string,string> getSystemConfiguration (1:binary login)                      
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<string> getTabletServers (1:binary login);
+  void removeProperty (1:binary login, 2:string property)                               
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void setProperty (1:binary login, 2:string property, 3:string value)                  
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool testClassLoad (1:binary login, 2:string className, 3:string asTypeName)          
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
 
   // security operations
-  bool authenticateUser (1:UserPass userpass, 2:string user, 3:binary password)         
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changeUserAuthorizations (1:UserPass userpass, 2:string user, 3:set<binary>
authorizations)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changeUserPassword (1:UserPass userpass, 2:string user, 3:binary password)       
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void createUser (1:UserPass userpass, 2:string user, 3:binary password)               
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void dropUser (1:UserPass userpass, 2:string user)                                    
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<binary> getUserAuthorizations (1:UserPass userpass, 2:string user)         
                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void grantSystemPermission (1:UserPass userpass, 2:string user, 3:SystemPermission perm)
               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void grantTablePermission (1:UserPass userpass, 2:string user, 3:string table, 4:TablePermission
perm)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool hasSystemPermission (1:UserPass userpass, 2:string user, 3:SystemPermission perm)
                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool hasTablePermission (1:UserPass userpass, 2:string user, 3:string table, 4:TablePermission
perm)    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  set<string> listUsers (1:UserPass userpass)                                     
                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void revokeSystemPermission (1:UserPass userpass, 2:string user, 3:SystemPermission perm)
              throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void revokeTablePermission (1:UserPass userpass, 2:string user, 3:string table, 4:TablePermission
perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool authenticateUser (1:binary login, 2:string user, 3:binary password)              
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void changeUserAuthorizations (1:binary login, 2:string user, 3:set<binary> authorizations)
       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void changeUserPassword (1:binary login, 2:string user, 3:binary password)            
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void createUser (1:binary login, 2:string user, 3:binary password)                    
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void dropUser (1:binary login, 2:string user)                                         
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  list<binary> getUserAuthorizations (1:binary login, 2:string user)              
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void grantSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)   
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void grantTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission
perm)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool hasSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)     
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool hasTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission
perm)    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  set<string> listUsers (1:binary login)                                          
                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void revokeSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)  
            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void revokeTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission
perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
 
 
   // scanning
-  string createBatchScanner(1:UserPass userpass, 2:string tableName, 3:BatchScanOptions options)
         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  string createScanner(1:UserPass userpass, 2:string tableName, 3:ScanOptions options)  
                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException
ouch2);
+  string createBatchScanner(1:binary login, 2:string tableName, 3:BatchScanOptions options)
         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  string createScanner(1:binary login, 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:UserPass userpass, 2:string tableName, 3:map<binary, list<ColumnUpdate>>
cells) throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2);
-  string createWriter(1:UserPass userpass, 2:string tableName, 3:WriterOptions opts)    
               throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2);
+  void updateAndFlush(1:binary login, 2:string tableName, 3:map<binary, list<ColumnUpdate>>
cells) throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2);
+  string createWriter(1:binary login, 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/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Wed Jan 30
18:07:36 2013
@@ -82,7 +82,8 @@ public class SimpleTest {
   private static Thread thread;
   private static int proxyPort;
   private static org.apache.accumulo.proxy.thrift.AccumuloProxy.Client client;
-  private static UserPass creds = new UserPass("root", ByteBuffer.wrap(secret.getBytes()));
+  private static UserPass userpass = new UserPass("root", ByteBuffer.wrap(secret.getBytes()));
+  private static ByteBuffer creds = null;
 
   @BeforeClass
   public static void setupMiniCluster() throws Exception {
@@ -107,14 +108,10 @@ public class SimpleTest {
     while (!proxyServer.isServing())
       UtilWaitThread.sleep(100);
     client = new TestProxyClient("localhost", proxyPort).proxy();
+    creds = client.login(userpass);
   }
 
   @Test(timeout = 10000)
-  public void testPing() throws Exception {
-    client.ping(creds);
-  }
-  
-  @Test(timeout = 10000)
   public void testInstanceOperations() throws Exception {
     int tservers = 0;
     for (String tserver : client.getTabletServers(creds)) {
@@ -249,7 +246,8 @@ public class SimpleTest {
     assertTrue(client.authenticateUser(creds, "stooge", s2bb("")));
     
     // check permission failure
-    UserPass stooge = new UserPass("stooge", s2bb(""));
+    ByteBuffer stooge = client.login(new UserPass("stooge", s2bb("")));
+    
     try {
       client.createTable(stooge, "fail", true, TimeType.MILLIS);
       fail("should not create the table");

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=1440568&r1=1440567&r2=1440568&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
Wed Jan 30 18:07:36 2013
@@ -36,7 +36,7 @@ public class TestProxyInstanceOperations
   protected static TServer proxy;
   protected static Thread thread;
   protected static TestProxyClient tpc;
-  protected static UserPass userpass;
+  protected static ByteBuffer userpass;
   protected static final int port = 10197;
   
   @BeforeClass
@@ -54,7 +54,7 @@ public class TestProxyInstanceOperations
     };
     thread.start();
     tpc = new TestProxyClient("localhost", port);
-    userpass = new UserPass("root", ByteBuffer.wrap("".getBytes()));
+    userpass = tpc.proxy.login(new UserPass("root", ByteBuffer.wrap("".getBytes())));
   }
   
   @AfterClass

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java?rev=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java (original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java Wed
Jan 30 18:07:36 2013
@@ -51,7 +51,7 @@ public class TestProxyReadWrite {
   protected static TServer proxy;
   protected static Thread thread;
   protected static TestProxyClient tpc;
-  protected static UserPass userpass;
+  protected static ByteBuffer userpass;
   protected static final int port = 10194;
   protected static final String testtable = "testtable";
   
@@ -70,7 +70,7 @@ public class TestProxyReadWrite {
     };
     thread.start();
     tpc = new TestProxyClient("localhost", port);
-    userpass = new UserPass("root", ByteBuffer.wrap("".getBytes()));
+    userpass = tpc.proxy().login(new UserPass("root", ByteBuffer.wrap("".getBytes())));
   }
   
   @AfterClass

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java?rev=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
(original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
Wed Jan 30 18:07:36 2013
@@ -43,7 +43,7 @@ public class TestProxySecurityOperations
   protected static TServer proxy;
   protected static Thread thread;
   protected static TestProxyClient tpc;
-  protected static UserPass userpass;
+  protected static ByteBuffer userpass;
   protected static final int port = 10196;
   protected static final String testtable = "testtable";
   protected static final String testuser = "VonJines";
@@ -65,7 +65,7 @@ public class TestProxySecurityOperations
     thread.start();
     
     tpc = new TestProxyClient("localhost", port);
-    userpass = new UserPass("root", ByteBuffer.wrap("".getBytes()));
+    userpass = tpc.proxy().login(new UserPass("root", ByteBuffer.wrap("".getBytes())));
   }
   
   @AfterClass

Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java?rev=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
(original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
Wed Jan 30 18:07:36 2013
@@ -48,7 +48,7 @@ public class TestProxyTableOperations {
   protected static TServer proxy;
   protected static Thread thread;
   protected static TestProxyClient tpc;
-  protected static UserPass userpass;
+  protected static ByteBuffer userpass;
   protected static final int port = 10195;
   protected static final String testtable = "testtable";
   
@@ -67,7 +67,7 @@ public class TestProxyTableOperations {
     };
     thread.start();
     tpc = new TestProxyClient("localhost", port);
-    userpass = new UserPass("root", ByteBuffer.wrap("".getBytes()));
+    userpass = tpc.proxy().login(new UserPass("root", ByteBuffer.wrap("".getBytes())));
   }
   
   @AfterClass
@@ -87,11 +87,6 @@ public class TestProxyTableOperations {
   }
   
   @Test
-  public void ping() throws Exception {
-    tpc.proxy().ping(userpass);
-  }
-  
-  @Test
   public void createExistsDelete() throws TException {
     assertFalse(tpc.proxy().tableExists(userpass, "testtable2"));
     tpc.proxy().createTable(userpass, "testtable2", true, TimeType.MILLIS);

Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java?rev=1440568&r1=1440567&r2=1440568&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
(original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
Wed Jan 30 18:07:36 2013
@@ -35,10 +35,6 @@ import org.apache.accumulo.core.data.Mut
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.fate.ZooStore;
-import org.apache.accumulo.server.master.Master;
-import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.io.Text;
 
 public class BloomFilterTest extends FunctionalTest {



Mime
View raw message