Skip to content

Commit

Permalink
Merge pull request #1 from FalkorDB/jfalkordb
Browse files Browse the repository at this point in the history
Jfalkordb
  • Loading branch information
gkorland authored Nov 27, 2023
2 parents 2d09d3f + 267e6d0 commit 7fdd4b0
Show file tree
Hide file tree
Showing 47 changed files with 373 additions and 377 deletions.
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"cSpell.words": [
"CYPHER",
"falkordb",
"jedis"
]
}
36 changes: 13 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,31 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.redislabs</groupId>
<artifactId>jredisgraph</artifactId>
<version>2.6.0-SNAPSHOT</version>
<groupId>com.falkordb</groupId>
<artifactId>jfalkordb</artifactId>
<version>0.0.1-SNAPSHOT</version>

<name>JRedisGraph</name>
<description>Official client for Redis-Graph</description>
<url>https://redisgraph.io</url>
<name>JFalkorDB</name>
<description>Official client for falkordb</description>
<url>https://www.falkordb.com</url>

<organization>
<name>RedisLabs</name>
<url>www.redislabs.com</url>
<name>FalkorBD</name>
<url>www.falkordb.com</url>
</organization>
<ciManagement>
<system>CircleCI</system>
<url>https://circleci.com/gh/RedisGraph/JRedisGraph</url>
<url>https://circleci.com/gh/FalkorDB/JFalkorDB</url>
</ciManagement>
<issueManagement>
<url>https://github.com/RedisGraph/JRedisGraph/issues</url>
<url>https://github.com/FalkorDB/JFalkorDB/issues</url>
<system>Github</system>
</issueManagement>
<scm>
<url>https://github.com/RedisGraph/JRedisGraph</url>
<connection>scm:git:git://github.com/RedisGraph/JRedisGraph.git</connection>
<developerConnection>scm:git:[email protected]:RedisGraph/JRedisGraph.git</developerConnection>
<url>https://github.com/FalkorDB/JFalkorDB</url>
<connection>scm:git:git://github.com/FalkorDB/JFalkorDB.git</connection>
<developerConnection>scm:git:[email protected]:FalkorDB/JFalkorDB.git</developerConnection>
</scm>
<developers>
<developer>
<name>Roi Lipman</name>
<organization>Redis Labs, Inc.</organization>
</developer>
<developer>
<name>Guy Korland</name>
<organization>Redis Labs, Inc.</organization>
</developer>
</developers>
<licenses>
<license>
<name>BSD 3 Clause</name>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.redislabs.redisgraph;
package com.falkordb;

import java.io.Closeable;
import java.util.List;
import java.util.Map;

import redis.clients.jedis.Jedis;

public interface RedisGraph extends Closeable {
public interface Graph extends Closeable {

public static RedisGraph with(Jedis jedis) {
return new com.redislabs.redisgraph.impl.api.RedisGraph(jedis);
public static Graph with(Jedis jedis) {
return new com.falkordb.impl.api.Graph(jedis);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.redislabs.redisgraph;
package com.falkordb;

import redis.clients.jedis.Jedis;

public interface RedisGraphContext extends RedisGraph {
public interface GraphContext extends Graph {


/**
Expand All @@ -15,13 +15,13 @@ public interface RedisGraphContext extends RedisGraph {
* Returns a Redis transactional object, over the connection context, with graph API capabilities
* @return Redis transactional object, over the connection context, with graph API capabilities
*/
RedisGraphTransaction multi();
GraphTransaction multi();

/**
* Returns a Redis pipeline object, over the connection context, with graph API capabilities
* @return Redis pipeline object, over the connection context, with graph API capabilities
*/
RedisGraphPipeline pipelined();
GraphPipeline pipelined();

/**
* Perform watch over given Redis keys
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/falkordb/GraphContextGenerator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.falkordb;

public interface GraphContextGenerator extends Graph {

/**
* Generate a connection bounded api
* @return a connection bounded api
*/
GraphContext getContext();

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph;
package com.falkordb;

import redis.clients.jedis.Response;
import redis.clients.jedis.commands.BasicRedisPipeline;
Expand All @@ -17,7 +17,7 @@
/**
* An interface which aligned to Jedis Pipeline interface
*/
public interface RedisGraphPipeline extends
public interface GraphPipeline extends
MultiKeyBinaryRedisPipeline,
MultiKeyCommandsPipeline, ClusterPipeline,
BinaryScriptingCommandsPipeline, ScriptingCommandsPipeline,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph;
package com.falkordb;

import redis.clients.jedis.Response;
import redis.clients.jedis.commands.BasicRedisPipeline;
Expand All @@ -17,7 +17,7 @@
/**
* An interface which aligned to Jedis transactional interface
*/
public interface RedisGraphTransaction extends
public interface GraphTransaction extends
MultiKeyBinaryRedisPipeline,
MultiKeyCommandsPipeline, ClusterPipeline,
BinaryScriptingCommandsPipeline, ScriptingCommandsPipeline,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph;
package com.falkordb;

import java.util.List;

Expand All @@ -7,16 +7,13 @@
*/
public interface Header {


enum ResultSetColumnTypes {
COLUMN_UNKNOWN,
COLUMN_SCALAR,
COLUMN_NODE,
COLUMN_RELATION

}


List<String> getSchemaNames();

List<ResultSetColumnTypes> getSchemaTypes();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.redislabs.redisgraph;
package com.falkordb;

import java.util.List;

/**
* Container for RedisGraph result values.
* Container for Graph result values.
*
* List records are returned from RedisGraph statement execution, contained within a ResultSet.
* List records are returned from Graph statement execution, contained within a ResultSet.
*/
public interface Record {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph;
package com.falkordb;

import java.util.Iterator;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph;
package com.falkordb;


public interface Statistics {
Expand Down
23 changes: 23 additions & 0 deletions src/main/java/com/falkordb/exceptions/GraphException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.falkordb.exceptions;

import redis.clients.jedis.exceptions.JedisDataException;

/**
* Graph query evaluation exception. An instance of GraphException is
* thrown when Graph encounters an error during query evaluation.
*/
public class GraphException extends JedisDataException {
private static final long serialVersionUID = -476099681322055468L;

public GraphException(String message) {
super(message);
}

public GraphException(Throwable cause) {
super(cause);
}

public GraphException(String message, Throwable cause) {
super(message, cause);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.List;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.List;
import java.util.Objects;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.graph_entities;
package com.falkordb.graph_entities;

import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.redislabs.redisgraph.impl;
package com.falkordb.impl;

import org.apache.commons.text.translate.AggregateTranslator;
import org.apache.commons.text.translate.CharSequenceTranslator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.redislabs.redisgraph.impl.api;
package com.falkordb.impl.api;

import com.redislabs.redisgraph.RedisGraph;
import com.redislabs.redisgraph.ResultSet;
import com.redislabs.redisgraph.impl.Utils;
import com.falkordb.Graph;
import com.falkordb.ResultSet;
import com.falkordb.impl.Utils;
import redis.clients.jedis.Jedis;

import java.util.List;
Expand All @@ -11,7 +11,7 @@
/**
* An abstract class to handle non implementation specific user requests
*/
public abstract class AbstractRedisGraph implements RedisGraph {
public abstract class AbstractGraph implements Graph {

/**
* Inherited classes should return a Jedis connection, with respect to their context
Expand Down
Loading

0 comments on commit 7fdd4b0

Please sign in to comment.