Permalink
Commits on Feb 27, 2013
  1. @edwardcapriolo

    Merge branch 'master' of https://github.com/zznate/intravert-ug into …

    …consistency_again
    
    Conflicts:
    	src/main/java/org/usergrid/vx/server/IntravertCassandraServer.java
    edwardcapriolo committed Feb 27, 2013
  2. @edwardcapriolo

    Merge pull request #117 from zznate/counter-handler

    added counterhandler and coverage for such. closes #114
    edwardcapriolo committed Feb 27, 2013
Commits on Feb 26, 2013
  1. @edwardcapriolo
  2. @edwardcapriolo
  3. Merge pull request #116 from jsanda/refactor-readCf

    make HandlerUtils.readCf create and return a JsonArray of columns
    committed Feb 26, 2013
  4. @jsanda

    make HandlerUtils.readCf create and return a JsonArray of columns

    While I was looking at something else, I noticed that the callers of
    HandlerUtils.readCf both take the list of maps that gets populated, iterates
    through the list, converts each map to a JsonObject, and then adds that object
    to a JsonArray that is sent back in the response to the reply handler.
    
    This commit removes that duplicate work and also eliminates the extra work of
    looping over all of the columns again.
    jsanda committed Feb 26, 2013
  5. @edwardcapriolo

    Merge pull request #113 from zznate/handler-utils

    initial replace of some common operations with HandlerUtils. Closes #112
    edwardcapriolo committed Feb 26, 2013
Commits on Feb 25, 2013
  1. @edwardcapriolo
Commits on Feb 24, 2013
  1. @edwardcapriolo

    Remove dead code

    edwardcapriolo committed Feb 24, 2013
  2. @edwardcapriolo

    Dead code

    edwardcapriolo committed Feb 24, 2013
  3. @edwardcapriolo

    Merge pull request #110 from zznate/edasync

    Edasync
    edwardcapriolo committed Feb 24, 2013
  4. @edwardcapriolo
  5. @edwardcapriolo

    Merge branch 'master' into async-requests

    Conflicts:
    	src/main/java/org/usergrid/vx/server/IntravertCassandraServer.java
    	src/test/java/org/usergrid/vx/experimental/CassandraRunner.java
    edwardcapriolo committed Feb 24, 2013
  6. @edwardcapriolo

    Follow up on xml removal

    edwardcapriolo committed Feb 24, 2013
  7. @edwardcapriolo

    No one is using this.

    edwardcapriolo committed Feb 24, 2013
  8. @edwardcapriolo
Commits on Feb 23, 2013
  1. @jsanda

    Adding support in IntraHandler for errors

    IntraHandlerJson now checks the response from the operation handler to see if
    it contains the exception or exceptionId fields. If so no further operations
    are executed. A couple tests have been added to RawJsonITest to go through
    some of the error handling scenarios.
    jsanda committed Feb 23, 2013
  2. @edwardcapriolo

    Merge pull request #108 from zznate/small-interop-cleanup

    small cleanup on interop for ks, cf name deduction, remove trace on log ...
    edwardcapriolo committed Feb 23, 2013
  3. small cleanup on interop for ks, cf name deduction, remove trace on l…

    …og props, comment out failing test for scanner
    committed Feb 23, 2013
Commits on Feb 22, 2013
  1. @jsanda
  2. @jsanda

    updating CQL support and test coverage

    Adding a more comprehensive CQL test in RawJsonITest that creates a table,
    inserts data, and then queries for it. The query results getting returned
    looked like,
    
    {
      "name":"username",
      "value":"jsmith"
    },
    {
      "name":"age",
      "value":"\u0000\u0000\u0000\u001E"
    },
    {
      "name":"fname",
      "value":"John"
    },
    {
      "name":"lname",
      "value":"Smith"
    }
    
    There are two problems with this. The first is that the value for the age
    column was not properly converted. The second issue is that we are not
    tranposing the results as you would expect with other CQL clients like cqlsh.
    The above results in cqlsh would look something like,
    
    username | fname | lname | age
    ------------------------------
    jsmith     John    Smith   30
    
    This commit returns the transposed results that look like,
    
    {
      "lname":"Smith",
      "username":"jsmith",
      "age":30,
      "fname":"John"
    }
    
    Instead of returning 3 JSON objects, we return just the one. And also note that
    the type conversion for the age column is handled. I really think this is the
    way to go for the CQL query operation. If the client does not work the
    transposed results then he can use a GET or SLICE operation.
    jsanda committed Feb 22, 2013
  3. @jsanda

    Merge branch 'master' into async-requests

    Conflicts:
    	src/main/java/org/usergrid/vx/experimental/IntraOp.java
    	src/main/java/org/usergrid/vx/experimental/IntraReq.java
    	src/main/java/org/usergrid/vx/experimental/IntraRes.java
    	src/main/java/org/usergrid/vx/experimental/TypeHelper.java
    jsanda committed Feb 22, 2013
  4. @edwardcapriolo

    Merge pull request #107 from zznate/ic2smile

    IC2 does smile.yea....
    edwardcapriolo committed Feb 22, 2013
  5. @edwardcapriolo

    Merge pull request #106 from zznate/counter-verb

    Counter verb
    edwardcapriolo committed Feb 22, 2013
Commits on Feb 21, 2013
  1. @edwardcapriolo

    IC2 does smile.yea....

    edwardcapriolo committed Feb 21, 2013
  2. @edwardcapriolo

    These are failing tests

    edwardcapriolo committed Feb 21, 2013
  3. merged in TypeHelper changes

    committed Feb 21, 2013
  4. Merge pull request #105 from jsanda/typehelper

    Updating TypeHelper to support all C* types
    committed Feb 21, 2013
  5. @jsanda
  6. @jsanda
Commits on Feb 20, 2013
  1. added initial counter support. Failing test on concurrentTimeoutExcep…

    …tion, not sure why yet. addresses issue #44
    committed Feb 20, 2013