EP / schemaless / changeset / 8b1b7e934784

Up to file-list src/main/java/schemaless/EntityStore.java:

@@ -12,6 +12,5 @@ public interface EntityStore {
 	byte[] find(UUID id);
 	void scanAll(EntityScanner scanner);
 	void scanRecentlyUpdated(EntityScanner scanner, int n);
 	void scanUpdatedSince(EntityScanner scanner, Date basis);
+}

Up to file-list src/main/java/schemaless/gardener/IndexGardener.java:

@@ -37,10 +37,10 @@ public class IndexGardener implements Ru
 		MultipleIndexGardening gardening = new MultipleIndexGardening(this.indexStores);
 		while (running) {
 			gardening.reset();
-			entityStore.scanRecentlyUpdated(gardening, 10);
+			entityStore.scanUpdatedSince(gardening, gardening.getCursor());
 			if (gardening.getInconsistentCount() == 0) {
 				try {
-					wait(1000);
+					wait(200);
 				} catch (InterruptedException e) {
 					e.printStackTrace(System.err);
+				}

Up to file-list src/main/java/schemaless/gardener/IndexGardening.java:


	}
	
	public void inspect(EntityRow entityRow) {
		System.out.println(System.currentTimeMillis());
		UUID id = entityRow.id;
		System.out.println("Check " + indexDefinition.name() + " index of " + entityDefinition.name() + " entity " + id);
		try {

				listener.fixedOutdated(entityRow);
			}
		} catch (Exception e) {
			listener.failed(entityRow);
			System.err.println("Error while checking " + indexDefinition.name() + " index of " + entityDefinition.name() + " entity " + id);
			e.printStackTrace(System.err);
		}
		System.out.println(System.currentTimeMillis());
	}

	protected boolean isMissing(IndexRow indexRow) {

	
	public static interface Listener {
		void foundMissing(EntityRow entityRow);
		void fixedMissing(EntityRow entityRow);
		void foundOutdated(EntityRow entityRow);
		void fixedMissing(EntityRow entityRow);
		void fixedOutdated(EntityRow entityRow);
		void failed(EntityRow entityRow);
	}
	
	public static class NullListener implements Listener {


		public void foundOutdated(EntityRow entityRow) {
		}

		public void failed(EntityRow entityRow) {
		}
	}
}

Up to file-list src/main/java/schemaless/gardener/MultipleIndexGardening.java:

 package schemaless.gardener;
 import java.util.Date;
 import schemaless.EntityRow;
 import schemaless.EntityScanner;
 import schemaless.IndexStore;
 class MultipleIndexGardening implements EntityScanner, IndexGardening.Listener {
 	private IndexGardening[] gardenings;
 	private Date cursor;
 	private int missingCount;
 	private int outdatedCount;
@@ -14,16 +17,30 @@ class MultipleIndexGardening implements
 		for (int i = 0; i < indexStores.length; i++) {
 			gardenings[i] = new IndexGardening(indexStores[i], this);
+		}
 		cursor = new Date();
 		reset();
+	}
 	public void inspect(EntityRow entityRow) {
 		for (IndexGardening each : gardenings) {
 			each.inspect(entityRow);
+		}
 		if (entityRow.updated.after(cursor)) {
 			cursor = entityRow.updated;
+		}
+	}
 	public void reset() {
 		missingCount = 0;
 		outdatedCount = 0;
+	}
 	public int getInconsistentCount() {
 		return missingCount + outdatedCount;
+	}
 	public void inspect(EntityRow entityRow) {
 		for (IndexGardening each : gardenings) {
 			each.inspect(entityRow);
+		}
 	public Date getCursor() {
 		return cursor;
+	}
 	public void foundMissing(EntityRow entityRow) {
@@ -39,9 +56,7 @@ class MultipleIndexGardening implements
 	public void fixedOutdated(EntityRow entityRow) {
+	}
 	public void reset() {
 		missingCount = 0;
 		outdatedCount = 0;
 	public void failed(EntityRow entityRow) {
+	}
+}

Up to file-list src/main/java/schemaless/store/MySqlEntityStore.java:

@@ -225,7 +225,7 @@ public class MySqlEntityStore implements
 			rs = statement.executeQuery();
 			while (rs.next()) {
 				UUID id = jdbcAdapter.getColumnAsUuid(rs, 1);
-				Date updated = rs.getTimestamp(2);
+				Date updated = new Date(rs.getTimestamp(2).getTime());
 				byte[] body = rs.getBytes(3);
 				scanner.inspect(new EntityRow(id, body, updated));
+			}
@@ -238,42 +238,18 @@ public class MySqlEntityStore implements
+		}
+	}
 	public void scanRecentlyUpdated(EntityScanner scanner, int n) {
 		Connection connection = null;
 		PreparedStatement statement = null;
 		ResultSet rs = null;
 		try {
 			connection = dataSource.getConnection();
 			statement = connection.prepareStatement("SELECT id, updated, body FROM " + tableName + " ORDER BY updated DESC LIMIT ?");
 			statement.setInt(1, n);
 			rs = statement.executeQuery();
 			while (rs.next()) {
 				UUID id = jdbcAdapter.getColumnAsUuid(rs, 1);
 				Date updated = rs.getTimestamp(2);
 				byte[] body = rs.getBytes(3);
 				scanner.inspect(new EntityRow(id, body, updated));
+			}
 		} catch (SQLException e) {
 			throw new DataAccessException("Cannot scan entities on the table " + tableName, e);
 		} finally {
 			closeQuietly(rs);
 			closeQuietly(statement);
 			closeQuietly(connection);
+		}
+	}
 	public void scanUpdatedSince(EntityScanner scanner, Date basis) {
 		Connection connection = null;
 		PreparedStatement statement = null;
 		ResultSet rs = null;
 		try {
 			connection = dataSource.getConnection();
-			statement = connection.prepareStatement("SELECT id, updated, body FROM " + tableName + " WHERE updated > ? ORDER BY updated");
+			statement = connection.prepareStatement("SELECT id, updated, body FROM " + tableName + " WHERE updated>=? ORDER BY updated");
 			statement.setTimestamp(1, new java.sql.Timestamp(basis.getTime()));
 			rs = statement.executeQuery();
 			while (rs.next()) {
 				UUID id = jdbcAdapter.getColumnAsUuid(rs, 1);
-				Date updated = rs.getTimestamp(2);
+				Date updated = new Date(rs.getTimestamp(2).getTime());
 				byte[] body = rs.getBytes(3);
 				scanner.inspect(new EntityRow(id, body, updated));
+			}

Up to file-list src/test/java/schemaless/examples/FeedExample.java:

@@ -17,13 +17,15 @@ public class FeedExample {
 		DataSource dataSource = JdbcTestHelper.dataSource();
 		MySqlStoreFactory factory = new MySqlStoreFactory(dataSource);
 		EntityDefinition entityDefinition = new EntityDefinition("feed", Feed.class);
 		IndexDefinition indexDefinition = new IndexDefinition(entityDefinition, "user_id", new String[] { "userId" });
 		IndexGardener gardener = new IndexGardener(new DataStore(factory, entityDefinition, indexDefinition));
 		gardener.start();
 		DataStore dataStore = new DataStore(factory, entityDefinition);
-		dataStore.insert(new Feed(UUID.randomUUID(), "someone"));
+		Feed entity = new Feed(UUID.randomUUID(), "someone");
 		dataStore.insert(entity);
 		IndexDefinition indexDefinition = new IndexDefinition(entityDefinition, "user_id", new String[] { "userId" });
 		dataStore = new DataStore(factory, entityDefinition, indexDefinition);
 		IndexGardener gardener = new IndexGardener(dataStore);
 		gardener.start();
 		Thread.sleep(10 * 1000);
 		gardener.stop();
+	}

Up to file-list src/test/java/schemaless/gardener/IndexGardeningTest.java:

@@ -17,12 +17,13 @@ import schemaless.Feed;
 import schemaless.IndexDefinition;
 import schemaless.IndexRow;
 import schemaless.IndexStore;
-import schemaless.gardener.IndexGardening;
+import schemaless.gardener.IndexGardening.Listener;
 @RunWith(JMock.class)
 public class IndexGardeningTest {
 	private Mockery mockery = new JUnit4Mockery();
 	private IndexGardening dut;
 	private Listener listener;
 	private IndexStore indexStore;
 	private EntityDefinition entityDefinition;
 	private IndexDefinition indexDefinition;
@@ -36,15 +37,17 @@ public class IndexGardeningTest {
 		mockery.checking(new Expectations() {{
 			allowing(indexStore).definition(); will(returnValue(indexDefinition));
 		}});
 		dut = new IndexGardening(indexStore);
 		listener = mockery.mock(IndexGardening.Listener.class);
 		dut = new IndexGardening(indexStore, listener);
 		entity = new Feed(UUID.randomUUID(), "someone");
 		entityRow = new EntityRow(entity.getId(), entityDefinition.serializer().serialize(entity), new Date());
+	}
-	@Test public void shouldNotThrowException() {
+	@Test public void indexInspectionFailed() {
 		mockery.checking(new Expectations() {{
 			one(indexStore).find(entity.getId()); will(throwException(new Exception("BLAH")));
 			one(listener).failed(entityRow);
 		}});
 		dut.inspect(entityRow);
+	}
@@ -63,7 +66,9 @@ public class IndexGardeningTest {
 	@Test public void indexIsMissing() {
 		mockery.checking(new Expectations() {{
 			one(indexStore).find(entity.getId()); will(returnValue(null));
 			one(listener).foundMissing(entityRow);
 			one(indexStore).insert(entity);
 			one(listener).fixedMissing(entityRow);
 		}});
 		dut.inspect(entityRow);
@@ -75,7 +80,9 @@ public class IndexGardeningTest {
 		mockery.checking(new Expectations() {{
 			one(indexStore).find(entity.getId()); will(returnValue(indexRow));
 			one(listener).foundOutdated(entityRow);
 			one(indexStore).update(entity);
 			one(listener).fixedOutdated(entityRow);
 		}});
 		dut.inspect(entityRow);

Up to file-list src/test/java/schemaless/store/MySql.sql:

 DROP TABLE IF EXISTS feed;
 CREATE TABLE feed (
     added_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id CHAR(36) NOT NULL,
     updated TIMESTAMP NOT NULL,
     body MEDIUMBLOB,
     UNIQUE KEY (id),
     KEY (updated)
 ) ENGINE=InnoDB;
 DROP TABLE IF EXISTS feed_index_user_id;
 CREATE TABLE feed_index_user_id (
     user_id VARCHAR(36) NOT NULL,
     entity_id CHAR(36) NOT NULL UNIQUE,
     PRIMARY KEY (user_id, entity_id)
 ) ENGINE=InnoDB;

Up to file-list src/test/java/schemaless/store/MySqlEntityStoreTest.java:

@@ -15,48 +15,49 @@ import schemaless.Feed;
 public class MySqlEntityStoreTest {
 	private BasicDataSource dataSource;
-	private MySqlEntityStore store;
+	private MySqlEntityStore dut;
 	private UUID id;
 	@Before public void beforeEach() {
 		dataSource = JdbcTestHelper.dataSource();
 		EntityDefinition entityDefinition = new EntityDefinition("feed", Feed.class);
 		dataSource = JdbcTestHelper.dataSource();
 		store = new MySqlEntityStore(entityDefinition, dataSource);
-		store.deleteAll();
+		dut = new MySqlEntityStore(entityDefinition, dataSource);
 		dut.deleteAll();
 		id = UUID.randomUUID();
+	}
 	@After public void afterEach() throws SQLException {
-		store.deleteAll();
+		dut.deleteAll();
 		dataSource.close();
+	}
 	@Test public void insert() {
-		store.insert(id, new byte[0]);
+		dut.insert(id, new byte[0]);
+	}
 	@Test public void update() {
 		store.insert(id, new byte[0]);
 		store.update(id, new byte[] { 1, 2, 3 });
-		assertArrayEquals(new byte[] { 1, 2, 3 }, store.find(id));
+		dut.insert(id, new byte[0]);
 		dut.update(id, new byte[] { 1, 2, 3 });
 		assertArrayEquals(new byte[] { 1, 2, 3 }, dut.find(id));
+	}
 	@Test public void delete() {
 		store.insert(id, new byte[0]);
 		store.delete(id);
-		assertNull(store.find(id));
+		dut.insert(id, new byte[0]);
 		dut.delete(id);
 		assertNull(dut.find(id));
+	}
 	@Test public void isExist() {
 		assertFalse(store.isExist(id));
 		store.insert(id, new byte[0]);
-		assertTrue(store.isExist(id));
+		assertFalse(dut.isExist(id));
 		dut.insert(id, new byte[0]);
 		assertTrue(dut.isExist(id));
+	}
 	@Test public void find() {
-		assertNull(store.find(id));
+		assertNull(dut.find(id));
 		store.insert(id, new byte[] { 1, 2, 3 });
 		assertArrayEquals(new byte[] { 1, 2, 3 }, store.find(id));
 		dut.insert(id, new byte[] { 1, 2, 3 });
 		assertArrayEquals(new byte[] { 1, 2, 3 }, dut.find(id));
+	}
+}

Up to file-list src/test/java/schemaless/store/MySqlIndexStoreTest.java:

@@ -25,9 +25,10 @@ public class MySqlIndexStoreTest {
 	private Feed entity = new Feed(UUID.randomUUID(), "someone");
 	@Before public void beforeEach() {
 		dataSource = JdbcTestHelper.dataSource();
 		EntityDefinition entityDefinition = new EntityDefinition("feed", Feed.class);
 		IndexDefinition index = new IndexDefinition(entityDefinition, "user_id", new String[] { "userId" });
 		dataSource = JdbcTestHelper.dataSource();
 		dut = new MySqlIndexStore(index, dataSource);
 		dut.deleteAll();
+	}

commit 23:	8b1b7e934784
parent 22:	4ba06c6f16b3
branch:	default

…	…	@@ -30,7 +30,6 @@ public class IndexGardening implements E
30	30	}
31	31
32	32	public void inspect(EntityRow entityRow) {
33		System.out.println(System.currentTimeMillis());
34	33	UUID id = entityRow.id;
35	34	System.out.println("Check " + indexDefinition.name() + " index of " + entityDefinition.name() + " entity " + id);
36	35	try {
…	…	@@ -50,10 +49,10 @@ public class IndexGardening implements E
50	49	listener.fixedOutdated(entityRow);
51	50	}
52	51	} catch (Exception e) {
	52	listener.failed(entityRow);
53	53	System.err.println("Error while checking " + indexDefinition.name() + " index of " + entityDefinition.name() + " entity " + id);
54	54	e.printStackTrace(System.err);
55	55	}
56		System.out.println(System.currentTimeMillis());
57	56	}
58	57
59	58	protected boolean isMissing(IndexRow indexRow) {
…	…	@@ -81,9 +80,10 @@ public class IndexGardening implements E
81	80
82	81	public static interface Listener {
83	82	void foundMissing(EntityRow entityRow);
	83	void fixedMissing(EntityRow entityRow);
84	84	void foundOutdated(EntityRow entityRow);
85		void fixedMissing(EntityRow entityRow);
86	85	void fixedOutdated(EntityRow entityRow);
	86	void failed(EntityRow entityRow);
87	87	}
88	88
89	89	public static class NullListener implements Listener {
…	…	@@ -98,5 +98,8 @@ public class IndexGardening implements E
98	98
99	99	public void foundOutdated(EntityRow entityRow) {
100	100	}
	101
	102	public void failed(EntityRow entityRow) {
	103	}
101	104	}
102	105	}